Updated RPlugin class

Author: hyttijan

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

@@ -156,7 +156,7 @@ private String[] getTestCommand() {
 
     private String[] getAvailablePointsCommand() {
         String[] rscr = new String[] {"Rscript", "-e"};
-        String[] command = new String[] {"\"library('tmcRtestrunner');"
+        String[] command = new String[] {"\"library(tmcRtestrunner);"
                                          + "getAvailablePoints(\"$PWD\")\""};
         return ArrayUtils.addAll(rscr, command);
     }

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

@@ -67,7 +67,7 @@ private TestResult toTestResult(JsonNode node) {
             backTrace.add(line.asText());
         }
 
-        boolean passed = node.get("status").asText().equals("passed");
+        boolean passed = node.get("status").asText().equals("pass");
 
         return new TestResult(
                 node.get("name").asText(),

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

@@ -23,16 +23,12 @@ public static void main(String[] args) {
 
         //For now, add the path you want to test here fully,
         //for example: pathToGithubFolder/tmc-r/example_projects/example_project1
-      
+        String exampleProjectLocation = "/example_projects/example_project1";
+        Path path = Paths.get(exampleProjectLocation);
+        RunResult runRes = runTests(path);
+        printTestResult(runRes);
+        RunResult rr;
 
-/*        try {
-            rr = new RTestResultParser(path).parse();
-            for (TestResult tr : rr.testResults) {
-                System.out.println(tr.toString());
-            }
-        } catch (IOException e) {
-            System.out.println("Something wrong: " + e.getMessage());
-        }*/
     }
 
     public static void printTestResult(RunResult rr) {

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

@@ -32,7 +32,6 @@ public void testThatParseSeemsToWorkOnExampleJson() {
         assertEquals(22, rr.testResults.size());
 
         for (TestResult tr : rr.testResults) {
-            System.out.println(tr);
             if (tr.getName().equals("Addition works")) {
                 assertTrue(tr.isSuccessful());
                 assertEquals(2, tr.points.size());