From 657127090d57059c0a640a3da8188e24ac68f7f6 Mon Sep 17 00:00:00 2001 From: Leonardo Bueno Postacchini Date: Mon, 28 Jan 2019 11:20:17 -0500 Subject: [PATCH 1/4] Add target folder to ignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d82a2d4..0370805 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ buildNumber.properties local.log settings.xml +/target/ From f433bca789de7baed15cc5d226c7f9ab988f4510 Mon Sep 17 00:00:00 2001 From: Leonardo Bueno Postacchini Date: Mon, 28 Jan 2019 11:20:35 -0500 Subject: [PATCH 2/4] Bump java version to 6 since for JDK11 5 is invalid. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4e2b302..f10e609 100644 --- a/pom.xml +++ b/pom.xml @@ -147,8 +147,8 @@ maven-compiler-plugin 2.3.2 - 1.5 - 1.5 + 6 + 6 From e073630c23b5b3ab2efd27c6e27b0d75047f81c6 Mon Sep 17 00:00:00 2001 From: Leonardo Bueno Postacchini Date: Mon, 28 Jan 2019 11:21:27 -0500 Subject: [PATCH 3/4] Fix the command flags mappings. --- .../java/com/browserstack/local/Local.java | 20 +++++++++---------- .../local/BrowserStackLocalTest.java | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/browserstack/local/Local.java b/src/main/java/com/browserstack/local/Local.java index d4f68dc..2b67dd6 100644 --- a/src/main/java/com/browserstack/local/Local.java +++ b/src/main/java/com/browserstack/local/Local.java @@ -28,19 +28,19 @@ public class Local { public Local() { avoidValueParameters = new HashMap(); avoidValueParameters.put("v", "-vvv"); - avoidValueParameters.put("force", "-force"); - avoidValueParameters.put("forcelocal", "-forcelocal"); - avoidValueParameters.put("onlyAutomate", "-onlyAutomate"); - avoidValueParameters.put("forceproxy", "-forceproxy"); + avoidValueParameters.put("force", "--force"); + avoidValueParameters.put("forcelocal", "--force-local"); + avoidValueParameters.put("onlyAutomate", "--only-automate"); + avoidValueParameters.put("forceproxy", "--force-proxy"); parameters = new HashMap(); parameters.put("f", "-f"); - parameters.put("only", "-only"); - parameters.put("localIdentifier", "-localIdentifier"); - parameters.put("proxyHost", "-proxyHost"); - parameters.put("proxyPort", "-proxyPort"); - parameters.put("proxyUser", "-proxyUser"); - parameters.put("proxyPass", "-proxyPass"); + parameters.put("only", "--only"); + parameters.put("localIdentifier", "--local-identifier"); + parameters.put("proxyHost", "--proxy-host"); + parameters.put("proxyPort", "--proxy-port"); + parameters.put("proxyUser", "--proxy-user"); + parameters.put("proxyPass", "--proxy-pass"); } /** diff --git a/src/test/java/com/browserstack/local/BrowserStackLocalTest.java b/src/test/java/com/browserstack/local/BrowserStackLocalTest.java index 31e4ff7..8637811 100644 --- a/src/test/java/com/browserstack/local/BrowserStackLocalTest.java +++ b/src/test/java/com/browserstack/local/BrowserStackLocalTest.java @@ -62,7 +62,7 @@ public void testEnableForce() throws Exception { options.put("force", "true"); options.put("onlyCommand", "true"); l.start(options); - assertTrue(l.command.contains("-force")); + assertTrue(l.command.contains("--force")); } @Test @@ -70,7 +70,7 @@ public void testEnableOnly() throws Exception { options.put("only", "true"); options.put("onlyCommand", "true"); l.start(options); - assertTrue(l.command.contains("-only")); + assertTrue(l.command.contains("--only")); } @Test @@ -78,7 +78,7 @@ public void testEnableOnlyAutomate() throws Exception { options.put("onlyAutomate", "true"); options.put("onlyCommand", "true"); l.start(options); - assertTrue(l.command.contains("-onlyAutomate")); + assertTrue(l.command.contains("--only-automate")); } @Test @@ -86,7 +86,7 @@ public void testEnableForceLocal() throws Exception { options.put("forcelocal", "true"); options.put("onlyCommand", "true"); l.start(options); - assertTrue(l.command.contains("-forcelocal")); + assertTrue(l.command.contains("--force-local")); } @Test @@ -94,7 +94,7 @@ public void testEnableForceProxy() throws Exception { options.put("forceproxy", "true"); options.put("onlyCommand", "true"); l.start(options); - assertTrue(l.command.contains("-forceproxy")); + assertTrue(l.command.contains("--force-proxy")); } @Test @@ -102,7 +102,7 @@ public void testSetLocalIdentifier() throws Exception { options.put("localIdentifier", "abcdef"); options.put("onlyCommand", "true"); l.start(options); - assertTrue(l.command.contains("-localIdentifier")); + assertTrue(l.command.contains("--local-identifier")); assertTrue(l.command.contains("abcdef")); } @@ -114,13 +114,13 @@ public void testSetProxy() throws Exception { options.put("proxyPass", "pass"); options.put("onlyCommand", "true"); l.start(options); - assertTrue(l.command.contains("-proxyHost")); + assertTrue(l.command.contains("--proxy-host")); assertTrue(l.command.contains("localhost")); - assertTrue(l.command.contains("-proxyPort")); + assertTrue(l.command.contains("--proxy-port")); assertTrue(l.command.contains("8080")); - assertTrue(l.command.contains("-proxyUser")); + assertTrue(l.command.contains("--proxy-user")); assertTrue(l.command.contains("user")); - assertTrue(l.command.contains("-proxyPass")); + assertTrue(l.command.contains("--proxy-pass")); assertTrue(l.command.contains("pass")); } From df62e0643da19cda1d867e071911bf690401b9bf Mon Sep 17 00:00:00 2001 From: Leonardo Bueno Postacchini Date: Mon, 28 Jan 2019 14:01:08 -0500 Subject: [PATCH 4/4] Add precondition to check for the key configuration. --- .../java/com/browserstack/local/BrowserStackLocalTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/java/com/browserstack/local/BrowserStackLocalTest.java b/src/test/java/com/browserstack/local/BrowserStackLocalTest.java index 8637811..91cad39 100644 --- a/src/test/java/com/browserstack/local/BrowserStackLocalTest.java +++ b/src/test/java/com/browserstack/local/BrowserStackLocalTest.java @@ -23,6 +23,7 @@ public void setUp() throws Exception { @Test public void testIsRunning() throws Exception { + preconditionKeyExists(); assertFalse(l.isRunning()); l.start(options); assertTrue(l.isRunning()); @@ -30,6 +31,7 @@ public void testIsRunning() throws Exception { @Test public void testMultipleBinary() throws Exception { + preconditionKeyExists(); l.start(options); assertTrue(l.isRunning()); Local l2 = new Local(); @@ -159,4 +161,8 @@ public void testCustomBoolArguments() throws Exception { public void tearDown() throws Exception { l.stop(); } + + private void preconditionKeyExists() { + assertTrue("The environment variable BROWSERSTACK_ACCESS_KEY must be set to run the tests.", System.getenv("BROWSERSTACK_ACCESS_KEY") != null ); + } }