From 0f0c7565b5e86032d21f9d20b0938e01c8ff2491 Mon Sep 17 00:00:00 2001 From: Andrew Krug Date: Sun, 4 Dec 2016 20:44:20 -0500 Subject: [PATCH 1/3] cleaning up for codacy --- src/test/java/LocalBrowsersSampleTest.java | 59 ------------------- .../Chrome.java | 8 ++- .../Edge.java | 9 +-- .../Firefox.java | 8 ++- .../PhantomJS.java | 9 +-- .../Safari.java | 8 ++- 6 files changed, 25 insertions(+), 76 deletions(-) delete mode 100644 src/test/java/LocalBrowsersSampleTest.java rename src/test/java/{LocalBrowsers => localbrowsers}/Chrome.java (83%) rename src/test/java/{LocalBrowsers => localbrowsers}/Edge.java (83%) rename src/test/java/{LocalBrowsers => localbrowsers}/Firefox.java (85%) rename src/test/java/{LocalBrowsers => localbrowsers}/PhantomJS.java (78%) rename src/test/java/{LocalBrowsers => localbrowsers}/Safari.java (82%) 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(){ From e13e59d96d7d139655a084f04742467460f4ddfb Mon Sep 17 00:00:00 2001 From: Andrew Krug Date: Sun, 4 Dec 2016 21:01:17 -0500 Subject: [PATCH 2/3] adding debug option to figure out why travis is failing --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8ce0700..7c0d747 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ addons: script: script: - ./mac_install_browsers.sh -- mvn clean test -Dsurefire.suiteXmlFiles=mac-only.xml +- mvn clean test -Dsurefire.suiteXmlFiles=mac-only.xml -X cache: directories: From 1469d90d5715852f92e1ce74e03fff6e7c74f091 Mon Sep 17 00:00:00 2001 From: Andrew Krug Date: Sun, 4 Dec 2016 21:07:14 -0500 Subject: [PATCH 3/3] removing debug and updating TestNG XML files --- .travis.yml | 2 +- mac-only.xml | 10 +++++----- windows-only.xml | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7c0d747..8ce0700 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ addons: script: script: - ./mac_install_browsers.sh -- mvn clean test -Dsurefire.suiteXmlFiles=mac-only.xml -X +- mvn clean test -Dsurefire.suiteXmlFiles=mac-only.xml cache: directories: 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/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