Merge pull request #9 from CodinGame/runner-builder

Prepare for new builder-runner api

Author: Sy1v4in

Dockerfile

@@ -1,8 +1,10 @@
-FROM codingame/java-compiler
+FROM codingame/maven3-builder:1.0
 
 # Copy files
-COPY target/junit-runner-0.0.1-SNAPSHOT-jar-with-dependencies.jar /usr/src/codingame/junit-runner/junit-runner.jar
-COPY src/main/resources/junit-runner /usr/src/codingame/junit-runner/
+COPY target/java-maven3-junit4-runner-0.0.1-SNAPSHOT-jar-with-dependencies.jar /usr/src/codingame/junit-runner/junit-runner.jar
+COPY docker/junit-runner /usr/src/codingame/junit-runner/
 
+ENV CG_RUN_DIR /project/answer
 
 ENTRYPOINT ["/usr/src/codingame/junit-runner/junit-runner"]
+

README.md

@@ -1,2 +1,71 @@
-# junit4-runner
-A junit version 4 tests runner which provides the expected json file.
+# java-maven3-junit4-runner
+
+First, this runner compiles the project and generate all jars (project + dependencies).
+
+At each play, it compiles user's answer using `javac` and run the specified testcase using junit4. 
+
+
+# How to Use
+
+To use this runner for your project, edit the `codingame.yml` file and add the following lines to your project:
+
+    runner:
+      name: codingame/java-maven3-junit4-runner
+      version: 1.1.0-java-8
+
+## Example
+
+**A Git repository example**
+
+```
+.
+├── about.md
+├── codingame.yml
+├── markdowns
+│   └── <YOUR_LESSONS>.md
+└── projects
+    └── example                    #Your project root
+        ├── src/main/java
+        │   └── Example.java       #The stub provided to the user
+        └── src/test/java
+            └── ExampleTest.java   #Your JUnitTest Class
+```
+
+**In your CS project:**
+
+*Example.java*
+```java
+public class Example
+{
+	/**
+	 * This method should return the sum between a and b
+	 **/
+	public void sum(int a, int b) {
+	    return 1;
+	}
+}
+```
+
+*ExampleTestTest.java*
+```java
+import static org.junit.Assert.assertEquals;
+public class ExampleTest {
+	private Example example;
+	@Before
+	public void init() {
+		example = new Example();
+	}
+
+	@Test
+	public void testSum(){
+		int a = 23487;
+		int b = 240587;
+		assertEquals(example.sum(a, b), a + b);
+	}
+}
+```
+
+**In your lesson:**
+```md
+@[Fix the following code so that the function DoSum returns a sum of integer]({"stubs": ["src/main/java/Example.java"],"command": "ExampleTest#testSum"})
+```

docker/junit-runner

@@ -0,0 +1,19 @@
+#!/bin/bash
+compilationExitCode=0
+executionExitCode=0
+
+JARS_DIR="/project/target/jars"
+WORKSPACE_DIR="/project/workspace"
+
+cd ${CG_RUN_DIR}
+
+classpath=$(echo ${JARS_DIR}/*.jar | tr ' ' ':')
+
+find * -name "*.java" -print0 | xargs -0 /usr/src/codingame/java-compiler/cgjavac -Xlint:all -cp "$classpath" -d "${WORKSPACE_DIR}"
+compilationExitCode=$?
+
+if [ $compilationExitCode -eq 0 ]; then
+	java -cp "${WORKSPACE_DIR}:$classpath:/usr/src/codingame/junit-runner/junit-runner.jar" com.codingame.codemachine.runner.junit.JUnitTestListRunner $*
+else
+	exit $compilationExitCode
+fi

hooks/pre_build

@@ -3,5 +3,5 @@ echo "=> Building the junit runner jar file"
 docker run \
     -v $(pwd):/usr/src/junit-runner \
     -w /usr/src/junit-runner \
-    maven:3 \
+    maven:3-alpine \
     mvn clean package

pom.xml

@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.codingame.codemachine</groupId>
-	<artifactId>junit-runner</artifactId>
+	<artifactId>java-maven3-junit4-runner</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 
 	<properties>