Fix StandaloneConfiguration#toString() (#2697)

The toString method was incorrectly processing Collections
and Maps. This change set adds considerations for them.
Also in this change set;
* Updated tests for GridHubConfigurationTest
* Trim the result of getting coreVersion in ConsoleServlet

Author: mach6

java/server/src/org/openqa/grid/internal/utils/configuration/StandaloneConfiguration.java

@@ -23,7 +23,9 @@
 import com.beust.jcommander.Parameter;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 public class StandaloneConfiguration {
 
@@ -135,8 +137,10 @@ public StringBuilder toString(String format, String name, Object value) {
       iterator = Arrays.asList(value);
     }
     for (Object v : iterator) {
-      if (value != null) {
-        sb.append(String.format(format, name, value));
+      if (v != null &&
+          !(v instanceof Map && ((Map) v).isEmpty()) &&
+          !(v instanceof Collection && ((Collection) v).isEmpty())) {
+        sb.append(String.format(format, name, v));
       }
     }
     return sb;

java/server/src/org/openqa/grid/web/servlet/beta/ConsoleServlet.java

@@ -261,7 +261,7 @@ private void getVersion() {
     }
     try {
       Manifest manifest = new Manifest(stream);
-      coreVersion = manifest.getEntries().get("Build-Info").getValue("Selenium-Version");
+      coreVersion = manifest.getEntries().get("Build-Info").getValue("Selenium-Version").trim();
     } catch (IOException e) {
       log.severe("Cannot load version from VERSION.txt" + e.getMessage());
     }

java/server/test/org/openqa/grid/internal/utils/GridHubConfigurationTest.java

@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
 
 import com.beust.jcommander.JCommander;
 
@@ -32,17 +33,15 @@
 public class GridHubConfigurationTest {
 
   @Test
-  public void testGetTimeout() throws Exception {
+  public void testSetTimeout() throws Exception {
     GridHubConfiguration gridHubConfiguration = new GridHubConfiguration();
-    assertEquals(1800, gridHubConfiguration.timeout.longValue()); // From the configuration default value
     gridHubConfiguration.timeout = 123;
     assertEquals(123, gridHubConfiguration.timeout.longValue());
   }
 
   @Test
-  public void testGetBrowserTimeout() throws Exception {
+  public void testSetBrowserTimeout() throws Exception {
     GridHubConfiguration gridHubConfiguration = new GridHubConfiguration();
-    assertEquals(0, gridHubConfiguration.browserTimeout.longValue());// From DefaultHub.json file
     gridHubConfiguration.browserTimeout = 1233;
     assertEquals(1233, gridHubConfiguration.browserTimeout.longValue());
   }
@@ -65,4 +64,50 @@ public void testWithOutServlets() {
     ghc.withoutServlets.add(ResourceServlet.class.getCanonicalName());
     assertTrue(ghc.isWithOutServlet(ResourceServlet.class));
   }
+
+  @Test
+  public void testDefaults() {
+    GridHubConfiguration ghc = new GridHubConfiguration();
+    assertEquals("standalone", ghc.role);
+    assertEquals(0L, ghc.browserTimeout.longValue());
+    assertEquals(false, ghc.debug);
+    assertEquals(false, ghc.help);
+    assertEquals(false, ghc.logLongForm);
+    assertEquals(1800L, ghc.timeout.longValue());
+    assertEquals(5000L, ghc.cleanUpCycle.longValue());
+    assertEquals(1L, ghc.maxSession.longValue());
+    assertEquals(-1L, ghc.jettyMaxThreads.longValue());
+    assertEquals("org.openqa.grid.internal.utils.DefaultCapabilityMatcher",
+                    ghc.capabilityMatcher.getClass().getCanonicalName());
+    assertEquals(-1L, ghc.newSessionWaitTimeout.longValue());
+    assertEquals(true, ghc.throwOnCapabilityNotPresent);
+    assertTrue(ghc.servlets.isEmpty());
+    assertTrue(ghc.custom.isEmpty());
+    assertNull(ghc.withoutServlets);
+    assertNull(ghc.hubConfig);
+    assertNull(ghc.log);
+    assertNull(ghc.prioritizer);
+    assertNull(ghc.host);
+    assertNull(ghc.port);
+  }
+
+  @Test
+  public void testToString() {
+    GridHubConfiguration ghc = new GridHubConfiguration();
+
+    assertTrue(ghc.toString().contains("-role standalone "));
+    assertFalse(ghc.toString().contains("-servlets"));
+    assertFalse(ghc.toString().contains("custom"));
+
+    ghc = new GridHubConfiguration();
+    String[] args = ("-servlet com.foo.bar.ServletA -servlet com.foo.bar.ServletB"
+                     + " -custom foo=bar,bar=baz").split(" ");
+    new JCommander(ghc, args);
+    
+    assertTrue(ghc.toString().contains("-servlets com.foo.bar.ServletA"
+                                       + " -servlets com.foo.bar.ServletB"));
+    assertTrue(ghc.toString().contains("custom {"));
+    assertTrue(ghc.toString().contains("bar=baz"));
+    assertTrue(ghc.toString().contains("foo=bar"));
+  }
 }