add tests that actually return the correct values from the DriverFactory

Author: nikolay-advolodkin

common/src/main/java/com/saucelabs/common/SauceSession.java

@@ -1,11 +1,16 @@
 package com.saucelabs.common;
 
 import com.saucelabs.remotedriver.DriverFactory;
+import com.saucelabs.remotedriver.RemoteDriverInterface;
+import com.saucelabs.remotedriver.SauceOptions;
 import org.openqa.selenium.WebDriver;
 
 import java.net.MalformedURLException;
 
 public class SauceSession {
+    private DriverFactory driverFactory;
+    private RemoteDriverInterface remoteDriverManager;
+    private SauceOptions sauceOptions;
     private WebDriver webDriver;
 
     public SauceSession(WebDriver driver)
@@ -15,6 +20,23 @@ public SauceSession(WebDriver driver)
 
     public SauceSession()
     {
+        driverFactory = new DriverFactory();
+    }
+
+    public SauceSession(SauceOptions options) {
+        this.sauceOptions = options;
+        driverFactory = new DriverFactory();
+    }
+
+    public SauceSession(SauceOptions options, RemoteDriverInterface remoteDriverManager) {
+        this.sauceOptions = options;
+        this.remoteDriverManager = remoteDriverManager;
+        this.driverFactory = new DriverFactory(remoteDriverManager);
+    }
+
+    public SauceSession(RemoteDriverInterface stubRemoteDriver) {
+        this.remoteDriverManager = stubRemoteDriver;
+        this.driverFactory = new DriverFactory(remoteDriverManager);
     }
 
     public WebDriver getDriver() {
@@ -27,15 +49,15 @@ public String getBrowser() {
     }
 
     public String getOs() {
-        return "Linux";
+        return driverFactory.capabilities.getPlatform().name();
     }
 
     public String getBrowserVersion() {
         return "latest";
     }
 
     public SauceSession start() throws MalformedURLException {
-        this.webDriver = new DriverFactory().getInstance();
+        this.webDriver = driverFactory.getInstance();
         return this;
     }
 }

common/src/main/java/com/saucelabs/remotedriver/SauceOptions.java

@@ -5,11 +5,25 @@
 public class SauceOptions extends MutableCapabilities
 {
 
-	public SauceOptions(String username, String accessKey)
+    private String browser;
+    private String browserVersion;
+    private String os;
+
+    public SauceOptions(String username, String accessKey)
 	{
 		setCapability("username", username);
 		setCapability("accessKey", accessKey);
 
 		setCapability("name", "mytest");
 	}
+
+    public SauceOptions() {
+        browser = "Chrome";
+        os = "windows 10";
+        browserVersion = "latest";
+    }
+
+    public void setOs(String operatingSystem) {
+	    this.os = operatingSystem;
+    }
 }

common/src/test/java/com/saucelabs/common/unit/SauceSessionTest.java

@@ -1,12 +1,14 @@
 package com.saucelabs.common.unit;
 
 import com.saucelabs.common.SauceSession;
+import com.saucelabs.remotedriver.RemoteDriverInterface;
 import com.saucelabs.remotedriver.SauceOptions;
 import org.hamcrest.text.IsEqualIgnoringCase;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.openqa.selenium.WebDriver;
 
+import java.net.MalformedURLException;
+
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
 
@@ -33,11 +35,12 @@ public void noSauceOptionsSet_whenCreated_defaultChrome()
         assertThat(actualBrowser, IsEqualIgnoringCase.equalToIgnoringCase("Chrome"));
     }
     @Test
-    public void noSauceOptionsSet_instantiated_defaultLinux()
-    {
-        SauceSession session = new SauceSession();
+    public void noSauceOptionsSet_instantiated_defaultOsWindows10() throws MalformedURLException {
+        RemoteDriverInterface stubRemoteDriver = mock(RemoteDriverInterface.class);
+        SauceSession session = new SauceSession(stubRemoteDriver);
+        session.start();
         String actualOperatingSystem = session.getOs();
-        assertThat(actualOperatingSystem, IsEqualIgnoringCase.equalToIgnoringCase("Linux"));
+        assertThat(actualOperatingSystem, IsEqualIgnoringCase.equalToIgnoringCase("win10"));
     }
     @Test
     public void noSauceOptionsSet_instantiated_latestBrowserVersion()
@@ -47,12 +50,14 @@ public void noSauceOptionsSet_instantiated_latestBrowserVersion()
         assertThat(actualOperatingSystem, IsEqualIgnoringCase.equalToIgnoringCase("latest"));
     }
     @Test
-    @Ignore("need to implement")
-    public void sauceOptionsSet_withOnlyWindows10_returnsWindows10()
-    {
-        SauceOptions options = new SauceOptions("","");
-        SauceSession session = new SauceSession();
-        String actualOperatingSystem = session.getBrowserVersion();
-        assertThat(actualOperatingSystem, IsEqualIgnoringCase.equalToIgnoringCase("latest"));
+    public void sauceOptionsSet_withOnlyWindows10_returnsWindows10() throws MalformedURLException {
+        SauceOptions options = new SauceOptions();
+        options.setOs("Windows 10");
+
+        RemoteDriverInterface stubRemoteDriver = mock(RemoteDriverInterface.class);
+        SauceSession session = new SauceSession(options, stubRemoteDriver);
+        session.start();
+        String actualOperatingSystem = session.getOs();
+        assertThat(actualOperatingSystem, IsEqualIgnoringCase.equalToIgnoringCase("win10"));
     }
 }

common/src/test/java/com/saucelabs/remotedriver/DriverFactoryTest.java

@@ -64,7 +64,7 @@ public void getInstance_default_setsCapabilityToLinux() throws MalformedURLExcep
         factory.getInstance();
 
         String actualBrowser = factory.capabilities.getPlatform().name();
-        assertThat(actualBrowser, IsEqualIgnoringCase.equalToIgnoringCase("windows 10"));
+        assertThat(actualBrowser, IsEqualIgnoringCase.equalToIgnoringCase("win10"));
     }
 
     private DriverFactory getFactoryWithStubRemoteManager() {