diff --git a/mac-only.xml b/mac-only.xml index d14828d..905f5e6 100644 --- a/mac-only.xml +++ b/mac-only.xml @@ -8,11 +8,11 @@ - - - - - + + + + + \ No newline at end of file diff --git a/src/test/java/LocalBrowsersSampleTest.java b/src/test/java/LocalBrowsersSampleTest.java deleted file mode 100644 index f00e875..0000000 --- a/src/test/java/LocalBrowsersSampleTest.java +++ /dev/null @@ -1,59 +0,0 @@ -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.chrome.ChromeDriver; -import org.openqa.selenium.chrome.ChromeDriverService; -import org.openqa.selenium.chrome.ChromeOptions; -import org.openqa.selenium.firefox.FirefoxBinary; -import org.openqa.selenium.firefox.FirefoxDriver; -import org.openqa.selenium.firefox.FirefoxProfile; -import org.openqa.selenium.remote.DesiredCapabilities; -import org.openqa.selenium.safari.SafariDriver; -import org.openqa.selenium.safari.SafariOptions; -import org.testng.Assert; -import org.testng.annotations.AfterTest; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; - -import java.io.File; - -/** - * Created by andrew on 12/3/16. - */ -public class LocalBrowsersSampleTest { - WebDriver driver; - - @BeforeTest(groups = "firefox") - public void firefoxSetup() { - DesiredCapabilities capabilities = DesiredCapabilities.firefox(); - capabilities.setCapability("marionette", true); - FirefoxBinary ff = new FirefoxBinary(new File("/Applications/Firefox.app/Contents/MacOS/firefox-bin")); - FirefoxProfile ffp = new FirefoxProfile(); - driver = new FirefoxDriver(ff, ffp, capabilities); - } - - @BeforeTest(groups = "chrome") - public void chromeSetup(){ - DesiredCapabilities capabilities = DesiredCapabilities.chrome(); - ChromeOptions options = new ChromeOptions(); - capabilities.setCapability(ChromeOptions.CAPABILITY, options); - driver = new ChromeDriver(capabilities); - } - - @BeforeTest(groups = "safari") - public void safariSetup(){ - DesiredCapabilities capabilities = DesiredCapabilities.safari(); - SafariOptions options = new SafariOptions(); - capabilities.setCapability(SafariOptions.CAPABILITY, options); - driver = new SafariDriver(capabilities); - } - - @Test(groups = {"firefox", "chrome", "safari"}) - public void test(){ - driver.get("http://lazycoder.io/about.html"); - Assert.assertEquals(driver.getTitle(), "About"); - } - - @AfterTest - public void testTeardown(){ - driver.quit(); - } -} diff --git a/src/test/java/LocalBrowsers/Chrome.java b/src/test/java/localbrowsers/Chrome.java similarity index 83% rename from src/test/java/LocalBrowsers/Chrome.java rename to src/test/java/localbrowsers/Chrome.java index ca3ebfd..162d344 100644 --- a/src/test/java/LocalBrowsers/Chrome.java +++ b/src/test/java/localbrowsers/Chrome.java @@ -1,18 +1,20 @@ -package LocalBrowsers; +package localbrowsers; import org.openqa.selenium.WebDriver; import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.chrome.ChromeOptions; import org.openqa.selenium.remote.DesiredCapabilities; import org.testng.Assert; -import org.testng.annotations.*; +import org.testng.annotations.AfterTest; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; /** * Created by andrew on 12/3/16. */ @Test(groups = {"mac", "windows"}) public class Chrome { - WebDriver driver; + private WebDriver driver; @BeforeTest public void chromeSetup(){ diff --git a/src/test/java/LocalBrowsers/Edge.java b/src/test/java/localbrowsers/Edge.java similarity index 83% rename from src/test/java/LocalBrowsers/Edge.java rename to src/test/java/localbrowsers/Edge.java index 4ec82f1..ebb0d23 100644 --- a/src/test/java/LocalBrowsers/Edge.java +++ b/src/test/java/localbrowsers/Edge.java @@ -1,19 +1,20 @@ -package LocalBrowsers; +package localbrowsers; import org.openqa.selenium.WebDriver; -import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.chrome.ChromeOptions; import org.openqa.selenium.edge.EdgeDriver; import org.openqa.selenium.edge.EdgeOptions; import org.openqa.selenium.remote.DesiredCapabilities; import org.testng.Assert; -import org.testng.annotations.*; +import org.testng.annotations.AfterTest; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; /** * Created by andrew on 12/3/16. */ public class Edge { - WebDriver driver; + private WebDriver driver; @BeforeClass public void edgeSetup(){ diff --git a/src/test/java/LocalBrowsers/Firefox.java b/src/test/java/localbrowsers/Firefox.java similarity index 85% rename from src/test/java/LocalBrowsers/Firefox.java rename to src/test/java/localbrowsers/Firefox.java index d76b24b..159019e 100644 --- a/src/test/java/LocalBrowsers/Firefox.java +++ b/src/test/java/localbrowsers/Firefox.java @@ -1,4 +1,4 @@ -package LocalBrowsers; +package localbrowsers; import org.openqa.selenium.WebDriver; import org.openqa.selenium.firefox.FirefoxBinary; @@ -6,7 +6,9 @@ import org.openqa.selenium.firefox.FirefoxProfile; import org.openqa.selenium.remote.DesiredCapabilities; import org.testng.Assert; -import org.testng.annotations.*; +import org.testng.annotations.AfterTest; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; import java.io.File; @@ -15,7 +17,7 @@ */ @Test(groups = {"mac", "windows"}) public class Firefox { - WebDriver driver; + private WebDriver driver; @BeforeTest public void firefoxSetup() { diff --git a/src/test/java/LocalBrowsers/PhantomJS.java b/src/test/java/localbrowsers/PhantomJS.java similarity index 78% rename from src/test/java/LocalBrowsers/PhantomJS.java rename to src/test/java/localbrowsers/PhantomJS.java index ee24894..a37953a 100644 --- a/src/test/java/LocalBrowsers/PhantomJS.java +++ b/src/test/java/localbrowsers/PhantomJS.java @@ -1,17 +1,18 @@ -package LocalBrowsers; +package localbrowsers; import org.openqa.selenium.WebDriver; import org.openqa.selenium.phantomjs.PhantomJSDriver; -import org.openqa.selenium.remote.DesiredCapabilities; import org.testng.Assert; -import org.testng.annotations.*; +import org.testng.annotations.AfterTest; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; /** * Created by andrew on 12/3/16. */ @Test(groups = {"mac", "windows"}) public class PhantomJS { - WebDriver driver; + private WebDriver driver; @BeforeTest public void phantomJSSetup(){ diff --git a/src/test/java/LocalBrowsers/Safari.java b/src/test/java/localbrowsers/Safari.java similarity index 82% rename from src/test/java/LocalBrowsers/Safari.java rename to src/test/java/localbrowsers/Safari.java index 7effa84..3dd80ac 100644 --- a/src/test/java/LocalBrowsers/Safari.java +++ b/src/test/java/localbrowsers/Safari.java @@ -1,18 +1,20 @@ -package LocalBrowsers; +package localbrowsers; import org.openqa.selenium.WebDriver; import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.safari.SafariDriver; import org.openqa.selenium.safari.SafariOptions; import org.testng.Assert; -import org.testng.annotations.*; +import org.testng.annotations.AfterTest; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; /** * Created by andrew on 12/3/16. */ @Test//(groups = {"mac"}) public class Safari { - WebDriver driver; + private WebDriver driver; @BeforeTest public void safariSetup(){ diff --git a/windows-only.xml b/windows-only.xml index fcf7ceb..458bf97 100644 --- a/windows-only.xml +++ b/windows-only.xml @@ -8,11 +8,11 @@ - - - - - + + + + + \ No newline at end of file