Updated runTests to use function and RTestResultParser to use new json format.

Author: anttihaap

tmc-langs-r/runTests.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 #Currently this script needs to be run at project root!
-/usr/bin/Rscript -e "library(tmcRtestrunner);run_tests_with_default(TRUE)"
+/usr/bin/Rscript -e "library(tmcRtestrunner);run_tests()"

tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/RTestResultParser.java

@@ -48,7 +48,7 @@ private List<TestResult> getTestResults() throws IOException {
 
         List<TestResult> results = new ArrayList<>();
 
-        JsonNode tree = mapper.readTree(json);
+        JsonNode tree = mapper.readTree(json).get("testResults");
         for (JsonNode node : tree) {
             results.add(toTestResult(node));
         }

tmc-langs-r/src/test/java/fi/helsinki/cs/tmc/langs/r/RTestResultParserTest.java

@@ -34,7 +34,7 @@ public void testThatParseSeemsToWorkOnExampleJson() {
         for (TestResult tr : rr.testResults) {
             if (tr.getName().equals("Addition works")) {
                 assertTrue(tr.isSuccessful());
-                assertEquals(2, tr.points.size());
+                assertEquals(3, tr.points.size());
                 assertTrue(tr.points.contains("r1.1"));
                 assertTrue(tr.points.contains("r1.2"));
             }