The additional commit to #147.

A bug was found and now it is fixed.
appium · Sep 13, 2015 · 86a3850 · 86a3850
1 parent 6b91363
commit 86a3850
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java b/src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java
@@ -231,11 +231,12 @@ protected ImmutableList<String> createArgs() {
             Map.Entry<String, String> entry = iterator.next();
             String argument = entry.getKey();
             String value = entry.getValue();
-            if (StringUtils.isBlank(argument) || StringUtils.isBlank(value))
+            if (StringUtils.isBlank(argument) || value == null)
                 continue;
 
             argList.add(argument);
-            argList.add(value);
+            if (!StringUtils.isBlank(value))
+                argList.add(value);
         }
 
         ImmutableList<String> result = new ImmutableList.Builder<String>().addAll(argList).build();

diff --git a/src/test/java/io/appium/java_client/localserver/ServerBuilderTest.java b/src/test/java/io/appium/java_client/localserver/ServerBuilderTest.java
@@ -47,7 +47,7 @@ public void checkAbilityToBuildServiceWithDefinedParametersAndNodeSetInPropertie
             String definedNode = findCustomNode().getAbsolutePath();
             System.setProperty(AppiumServiceBuilder.APPIUM_NODE_PROPERTY, definedNode);
             AppiumDriverLocalService.buildService(new AppiumServiceBuilder().withIPAddress("127.0.0.1").
-                    usingPort(4000).withArgument(GeneralServerFlag.LOG_TIMESTAMP,""));
+                    usingPort(4000).withArgument(GeneralServerFlag.SESSION_OVERRIDE,""));
         }
         finally {
             System.clearProperty(AppiumServiceBuilder.APPIUM_NODE_PROPERTY);
@@ -60,7 +60,7 @@ public void checkAbilityToStartServiceOnAFreePort(){
             String definedNode = findCustomNode().getAbsolutePath();
             System.setProperty(AppiumServiceBuilder.APPIUM_NODE_PROPERTY, definedNode);
             AppiumDriverLocalService service = AppiumDriverLocalService.buildService(new AppiumServiceBuilder().withIPAddress("127.0.0.1").
-                    usingAnyFreePort().withArgument(GeneralServerFlag.LOG_TIMESTAMP));
+                    usingAnyFreePort().withArgument(GeneralServerFlag.SESSION_OVERRIDE));
             service.start();
             assertEquals(true, service.isRunning());
             service.stop();
@@ -74,7 +74,7 @@ public void checkAbilityToStartServiceOnAFreePort(){
     public void checkAbilityToBuildServiceWithDefinedParametersAndExternallyDefinedNode(){
         File definedNode = findCustomNode();
         AppiumDriverLocalService.buildService(new AppiumServiceBuilder().withAppiumJS(definedNode).withIPAddress("127.0.0.1").
-                usingPort(4000).withArgument(GeneralServerFlag.LOG_TIMESTAMP,""));
+                usingPort(4000).withArgument(GeneralServerFlag.SESSION_OVERRIDE,""));
     }
 
     @Test
@@ -85,13 +85,22 @@ public void checkStartingOfDefaultService(){
         service.stop();
     }
 
+    @Test
+    public void checkStartingOfDefaultServiceWithNonDefaultArguments(){
+        AppiumDriverLocalService service = new AppiumServiceBuilder().
+                withArgument(GeneralServerFlag.LOG_NO_COLORS).withIPAddress("127.0.0.1").build();
+        service.start();
+        assertEquals(true, service.isRunning());
+        service.stop();
+    }
+
     @Test
     public void checkStartingOfTheServiceDefinedByProperty(){
         try {
             String definedNode = findCustomNode().getAbsolutePath();
             System.setProperty(AppiumServiceBuilder.APPIUM_NODE_PROPERTY, definedNode);
             AppiumDriverLocalService service = AppiumDriverLocalService.buildService(new AppiumServiceBuilder().withIPAddress("127.0.0.1").
-                    usingPort(4000).withArgument(GeneralServerFlag.LOG_TIMESTAMP));
+                    usingPort(4000).withArgument(GeneralServerFlag.SESSION_OVERRIDE));
             service.start();
             assertEquals(true, service.isRunning());
             service.stop();
@@ -105,7 +114,7 @@ public void checkStartingOfTheServiceDefinedByProperty(){
     public void checkStartingOfTheServiceDefinedExternally(){
         File definedNode = findCustomNode();
         AppiumDriverLocalService service = AppiumDriverLocalService.buildService(new AppiumServiceBuilder().withAppiumJS(definedNode).withIPAddress("127.0.0.1").
-                usingPort(4000).withArgument(GeneralServerFlag.LOG_TIMESTAMP,""));
+                usingPort(4000).withArgument(GeneralServerFlag.SESSION_OVERRIDE,""));
         service.start();
         assertEquals(true, service.isRunning());
         service.stop();