Better logging from the new core runner

Including correctly reporting the number of tests run.

Author: shs96c

java/server/src/org/openqa/selenium/server/htmlrunner/Results.java

@@ -28,7 +28,6 @@
 public class Results {
 
   private final String suiteSource;
-  private final List results = new LinkedList<>();
   private final List<String> allTables = new LinkedList<>();
   private final StringBuilder log = new StringBuilder();
   private final long start = System.currentTimeMillis();
@@ -66,6 +65,7 @@ public void addTest(String rawSource, List<CoreTestCase.StepResult> stepResults)
     if (passed) {
       numberOfPasses++;
     }
+    succeeded &= passed;
   }
 
   public HTMLTestResults toSuiteResult() {
@@ -75,10 +75,10 @@ public HTMLTestResults toSuiteResult() {
       buildInfo.getReleaseLabel(),
       buildInfo.getBuildRevision(),
       isSuccessful() ? "PASS" : "FAIL",
-      String.valueOf(SECONDS.convert(System.currentTimeMillis() - start, MILLISECONDS)),
-      String.valueOf(results.size()),
+      String.valueOf(System.currentTimeMillis() - start),
+      String.valueOf(allTables.size()),
       String.valueOf(numberOfPasses),
-      String.valueOf(results.size() - numberOfPasses),
+      String.valueOf(allTables.size() - numberOfPasses),
       String.valueOf(commandPasses),
       String.valueOf(commandFailures),
       String.valueOf(commandErrors),

java/server/test/org/openqa/selenium/server/htmlrunner/CoreSelfTest.java

@@ -17,6 +17,7 @@
 
 package org.openqa.selenium.server.htmlrunner;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.collect.ImmutableSortedSet;
@@ -60,18 +61,22 @@ public static void stopTestServer() {
   @Test
   public void executeTests() throws IOException {
     String testBase = server.whereIs("/selenium-server/tests");
-    File outputFile = File.createTempFile("core-test-suite", browser.replace('*', '-') + ".txt");
+    File outputFile = File.createTempFile("core-test-suite", browser.replace('*', '-') + ".html");
     assertTrue(outputFile.delete());
 
-    new HTMLLauncher().runHTMLSuite(browser,
-                    // We need to do this because the path relativizing code in java.net.URL is
-                    // clearly having a bad day. "/selenium-server/tests" appended to "../tests/"
-                    // ends up as "/tests" rather than "/selenium-server/tests" as you'd expect.
-                    testBase + "/TestSuite.html",
-                    testBase + "/TestSuite.html",
-                    outputFile,
-                    TimeUnit.MINUTES.toMillis(5),
-                    true);
+    String result = new HTMLLauncher()
+      .runHTMLSuite(
+        browser,
+        // We need to do this because the path relativizing code in java.net.URL is
+        // clearly having a bad day. "/selenium-server/tests" appended to "../tests/"
+        // ends up as "/tests" rather than "/selenium-server/tests" as you'd expect.
+        testBase + "/TestSuite.html",
+        testBase + "/TestSuite.html",
+        outputFile,
+        TimeUnit.MINUTES.toMillis(5),
+        true);
+
+    assertEquals("PASSED", result);
   }
 
   @Parameterized.Parameters
@@ -96,7 +101,6 @@ public static Iterable<String> parameters() {
         break;
     }
 
-    System.out.println("browsers.build() = " + browsers.build());
     return browsers.build();
   }
 }