Add json output to Junit tests.

testing/android/junit/java/src/org/chromium/testing/local/JunitListener.java

Index: testing/android/junit/java/src/org/chromium/testing/local/JunitListener.java
diff --git a/testing/android/junit/java/src/org/chromium/testing/local/GtestListener.java b/testing/android/junit/java/src/org/chromium/testing/local/JunitListener.java
similarity index 70%
rename from testing/android/junit/java/src/org/chromium/testing/local/GtestListener.java
rename to testing/android/junit/java/src/org/chromium/testing/local/JunitListener.java
index 122d1355c021c128143c1dd0921397626b49e6f7..3dd570571a8574b53688400a7d3b099a9b2ef5ad 100644
--- a/testing/android/junit/java/src/org/chromium/testing/local/GtestListener.java
+++ b/testing/android/junit/java/src/org/chromium/testing/local/JunitListener.java
@@ -12,26 +12,28 @@ import org.junit.runner.notification.RunListener;
 import java.util.HashSet;
 import java.util.Set;
 
-/** A JUnit RunListener that emulates GTest output to the extent that it can.
+/** A JUnit RunListener that emulates GTest output and creates a Json output file.
  */
-public class GtestListener extends RunListener {
+public class JunitListener extends RunListener {

[jbudorick, 2015/03/12 19:41:49]

Don't add the Json listening logic into the GtestListener and rename it -- just
create another listener for Json.

[mikecase (-- gone --), 2015/03/13 01:07:23]

Yeah, I kinda figured I should do this. Its just the two listeners are basically
the same. But, added a JsonListener and brought back GtestListener.

 
     private Set<Description> mFailedTests;
-    private final GtestLogger mLogger;
+    private final GtestLogger mGtestLogger;
+    private final JsonLogger mJsonLogger;
     private long mRunStartTimeMillis;
     private long mTestStartTimeMillis;
     private int mTestsPassed;
     private boolean mCurrentTestPassed;
 
-    public GtestListener(GtestLogger logger) {
-        mLogger = logger;
+    public JunitListener(GtestLogger gtestLogger, JsonLogger jsonLogger) {
+        mGtestLogger = gtestLogger;
+        mJsonLogger = jsonLogger;
     }
 
     /** Called before any tests run.
      */
     @Override
     public void testRunStarted(Description d) throws Exception {
-        mLogger.testRunStarted(d.testCount());
+        mGtestLogger.testRunStarted(d.testCount());
         mRunStartTimeMillis = System.currentTimeMillis();
         mTestsPassed = 0;
         mFailedTests = new HashSet<Description>();
@@ -43,7 +45,8 @@ public class GtestListener extends RunListener {
     @Override
     public void testRunFinished(Result r) throws Exception {
         long elapsedTimeMillis = System.currentTimeMillis() - mRunStartTimeMillis;
-        mLogger.testRunFinished(mTestsPassed, mFailedTests, elapsedTimeMillis);
+        mGtestLogger.testRunFinished(mTestsPassed, mFailedTests, elapsedTimeMillis);
+        mJsonLogger.writeJsonToFile();
     }
 
     /** Called when a test is about to start.
@@ -51,7 +54,7 @@ public class GtestListener extends RunListener {
     @Override
     public void testStarted(Description d) throws Exception {
         mCurrentTestPassed = true;
-        mLogger.testStarted(d);
+        mGtestLogger.testStarted(d);
         mTestStartTimeMillis = System.currentTimeMillis();
     }
 
@@ -60,7 +63,8 @@ public class GtestListener extends RunListener {
     @Override
     public void testFinished(Description d) throws Exception {
         long testElapsedTimeMillis = System.currentTimeMillis() - mTestStartTimeMillis;
-        mLogger.testFinished(d, mCurrentTestPassed, testElapsedTimeMillis);
+        mGtestLogger.testFinished(d, mCurrentTestPassed, testElapsedTimeMillis);
+        mJsonLogger.addTestResultInfo(d, mCurrentTestPassed, testElapsedTimeMillis);
         if (mCurrentTestPassed) {
             ++mTestsPassed;
         } else {
@@ -73,7 +77,7 @@ public class GtestListener extends RunListener {
     @Override
     public void testFailure(Failure f) throws Exception {
         mCurrentTestPassed = false;
-        mLogger.testFailed(f);
+        mGtestLogger.testFailed(f);
     }
 
 }