Merge pull request #8 from CodinGame/pr/7

Do not generate json anymore, use new command API

Author: Sy1v4in

Diff for: pom.xml

@@ -10,11 +10,6 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.7</version>
-		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>

Diff for: src/main/java/com/codingame/codemachine/runner/junit/JUnitTest.java

@@ -1,150 +1,45 @@
 package com.codingame.codemachine.runner.junit;
 
-import com.codingame.codemachine.runner.junit.core.TestResultDto;
-import com.google.gson.Gson;
-import org.apache.commons.io.FileUtils;
-import org.junit.internal.runners.ErrorReportingRunner;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Request;
-import org.junit.runner.Runner;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 class JUnitTest {
-    private static final String DEFAULT_OUTPUT = "-";
     private static final Pattern COMMAND_PATTERN = Pattern.compile("(?<class>[^#]+)(?:#(?<method>[^#]+))?");
 
-    private final PrintStream realOut;
-    private final PrintStream realErr;
-    private final JUnitCore jUnitCore;
-    private TestResultDto result;
-    private boolean oneFailure;
-
-    JUnitTest() {
-        realOut = System.out;
-        realErr = System.err;
-        jUnitCore = new JUnitCore();
-        oneFailure = false;
-    }
-
-    private boolean isOneFailure() {
-        return this.oneFailure;
-    }
-
     int run(String testcaseSpecification) {
-        TestCase testCase = findRequest(testcaseSpecification);
-        runTestCase(testCase);
-
-        int statusCode = isOneFailure() ? 1 : 0;
-        statusCode = generateResult() ? statusCode : 3;
-
-        return statusCode;
+        Request request = findRequest(testcaseSpecification);
+        if (request == null) {
+            System.err.println(String.format("Testcase \"%s\" not found", testcaseSpecification));
+            return 2;
+        }
+        return runTestCase(request);
     }
 
-    TestCase findRequest(String testcaseSpecification) {
-        TestCase request = null;
+    Request findRequest(String testcaseSpecification) {
+        Request request = null;
         Matcher matcher = COMMAND_PATTERN.matcher(testcaseSpecification);
         if (matcher.matches()) {
             try {
                 Class<?> clazz = Class.forName(matcher.group("class"));
                 String method = matcher.group("method");
                 if (method != null) {
-                    request = TestCase.createTestCase(Request.method(clazz, method), testcaseSpecification);
+                    request = Request.method(clazz, method);
                 }
                 else {
-                    request = TestCase.createTestCase(Request.aClass(clazz), testcaseSpecification);
+                    request = Request.aClass(clazz);
                 }
             }
-            catch (ClassNotFoundException ignored) {
-                request = TestCase.createTestCase();
-            }
+            catch (ClassNotFoundException ignored) {}
         }
         return request;
     }
 
-    private void runTestCase(TestCase testCase) {
-        if (testCase.exists()) {
-            result = new TestResultDto();
-            jUnitCore.addListener(new TestResultProvider(result));
-            if (!testCase.run(jUnitCore)) {
-                oneFailure = true;
-            }
-        }
-        else {
-            result = createTestNotFoundResult();
-            oneFailure = true;
-        }
-    }
-
-    private TestResultDto createTestNotFoundResult() {
-        TestResultDto result = new TestResultDto();
-        result.setSuccess(false);
-        result.setNotFound(true);
-        return result;
-    }
-
-    private boolean generateResult() {
-        String resultOutput = System.getProperty("codingame.junit-runner.output", DEFAULT_OUTPUT);
-        String resultStr = new Gson().toJson(result);
-        if (DEFAULT_OUTPUT.equals(resultOutput)) {
-            realOut.println(resultStr);
-        }
-        else {
-            try {
-                FileUtils.writeStringToFile(new File(resultOutput), resultStr);
-            }
-            catch (IOException e) {
-                realErr.println(e.getMessage());
-                return false;
-            }
-        }
-        return true;
+    private int runTestCase(Request request) {
+        JUnitCore jUnitCore = new JUnitCore();
+        jUnitCore.addListener(new TestResultFormatter());
+        return jUnitCore.run(request).wasSuccessful() ? 0 : 1;
     }
-
-    static class TestCase {
-
-        static TestCase createTestCase() {
-            return new TestCase(null, null);
-        }
-
-        static TestCase createTestCase(Request request, String description) {
-            TestCase testCase = new TestCase(null, null);
-            if (request != null) {
-                Runner runner = request.getRunner();
-                if (!(runner instanceof ErrorReportingRunner)) {
-                    testCase = new TestCase(request, description);
-                }
-            }
-            return testCase;
-        }
-
-        private final Request request;
-        private final String description;
-
-        private TestCase(Request request, String description) {
-            this.request = request;
-            this.description = description;
-        }
-
-        Request request() {
-            return this.request;
-        }
-
-        String description() {
-            return this.description;
-        }
-
-        boolean exists() {
-            return request() != null;
-        }
-
-        boolean run(final JUnitCore jUnitCore) {
-            return jUnitCore.run(request).wasSuccessful();
-        }
-    }
-
 }

Diff for: src/main/java/com/codingame/codemachine/runner/junit/JUnitTestListRunner.java

@@ -2,8 +2,6 @@
 
 public class JUnitTestListRunner {
     public static void main(String... args) {
-        JUnitTest jUnitTest = new JUnitTest();
-        int statusCode = jUnitTest.run(args[0]);
-        System.exit(statusCode);
+        System.exit(new JUnitTest().run(args[0]));
     }
 }

Diff for: src/main/java/com/codingame/codemachine/runner/junit/TestResultDtoFactory.java

@@ -0,0 +1,11 @@
+package com.codingame.codemachine.runner.junit;
+
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+
+public class TestResultFormatter extends RunListener {
+    @Override
+    public void testFailure(Failure failure) {
+        failure.getException().printStackTrace();
+    }
+}