Modified source and tests to match the new R project folder structure in RExerciseDescParser

runTests works without scripts on linux

Author: aleksisv

tmc-langs-r/getAvailablePoints.sh

@@ -13,15 +13,14 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 
 
 class RExerciseDescParser {
 
     private static Path RESULT_FILE = Paths.get(".available_points.json");
-    private static final TypeReference<Map<String, List<String>>> MAP_TYPE_REFERENCE =
-            new TypeReference<Map<String, List<String>>>() {};
+    private static final TypeReference<List<RResult>> MAP_TYPE_REFERENCE =
+            new TypeReference<List<RResult>>() {};
     private Path path;
     private ObjectMapper mapper;
 
@@ -31,12 +30,13 @@ public RExerciseDescParser(Path path) {
     }
 
     public ImmutableList<TestDesc> parse() throws IOException {
+        
         List<TestDesc> testDescs = new ArrayList<>();
         byte[] json = Files.readAllBytes(path.resolve(RESULT_FILE));
-        Map<String, List<String>> parse = mapper.readValue(json, MAP_TYPE_REFERENCE);
-        for (String name : parse.keySet()) {
-            ImmutableList<String> points = ImmutableList.copyOf(parse.get(name));
-            testDescs.add(new TestDesc(name, points));
+        List<RResult> parse = mapper.readValue(json, MAP_TYPE_REFERENCE);
+        for (RResult result : parse) {
+            ImmutableList<String> points = ImmutableList.copyOf(result.getPoints());
+            testDescs.add(new TestDesc(result.getName(), points));
         }
         return ImmutableList.copyOf(testDescs);
     }

tmc-langs-r/runTests.sh

@@ -38,9 +38,8 @@ public class RPlugin extends AbstractLanguagePlugin{
     private static final Path R_FOLDER_PATH = Paths.get("R");
     private static final Path TEST_FOLDER_PATH = Paths.get("tests");
     private static final Path TESTTHAT_FOLDER_PATH = Paths.get("testthat");
-    private static final Path TMC_FOLDER_PATH = Paths.get("tmc");
+    private static final Path TESTTHAT_FILE_PATH = Paths.get("testthat.R");
     private static final Path DESCRIPTION_PATH = Paths.get("DESCRIPTION");
-    private static final Path RHISTORY_PATH = Paths.get(".Rhistory");
     private static final Path RESULT_R_PATH = Paths.get("result.R");
 
 
@@ -67,9 +66,8 @@ public RPlugin() {
     public boolean isExerciseTypeCorrect(Path path) {
         return Files.exists(path.resolve(R_FOLDER_PATH))
                 || Files.exists(path.resolve(TEST_FOLDER_PATH).resolve(TESTTHAT_FOLDER_PATH))
-                || Files.exists(path.resolve(DESCRIPTION_PATH))
-                || Files.exists(path.resolve(RHISTORY_PATH))
-                || Files.exists(path.resolve(TMC_FOLDER_PATH).resolve(RESULT_R_PATH));
+                || Files.exists(path.resolve(TEST_FOLDER_PATH).resolve(TESTTHAT_FILE_PATH))
+                || Files.exists(path.resolve(DESCRIPTION_PATH));
         /*
         R folder contains the actual R files used in the
         project/package. It is automatically included when creating a
@@ -146,32 +144,25 @@ public ValidationResult checkCodeStyle(Path path, Locale messageLocale) throws U
     }
 
     public String[] getTestCommand() {
-        
-        String[] rscr;
-        String[] command;
+        String[] command = new String[]{"Rscript"};
+        String[] args;
         if (SystemUtils.IS_OS_WINDOWS) {
-            rscr = new String[] {"Rscript", "-e"};
-            command = new String[] {"\"library('tmcRtestrunner');run_tests_with_default(TRUE)\""};
+            args = new String[]{"-e", "\"library('tmcRtestrunner');run_tests()\""};
         } else {
-            rscr = new String[] {"bash"};
-            command = new String[] {Paths.get("").toAbsolutePath().toString() + "/runTests.sh"};
+            args = new String[]{"-e", "library(tmcRtestrunner);run_tests()"};
         }
-        return ArrayUtils.addAll(rscr, command);
+        return ArrayUtils.addAll(command, args);
     }
-    
+
     public String[] getAvailablePointsCommand() {
-        String[] rscr;
-        String[] command;
+        String[] command = new String[]{"Rscript"};
+        String[] args;
         if (SystemUtils.IS_OS_WINDOWS) {
-            rscr = new String[] {"Rscript", "-e"};
-            command = new String[] {"\"library(tmcRtestrunner);"
-                                    + "run_available_points(\"$PWD\")\""};
+            args = new String[]{"-e", "\"library('tmcRtestrunner');run_available_points()\""};
         } else {
-            rscr = new String[] {"bash"};
-            command = new String[] {Paths.get("").toAbsolutePath().toString() 
-                    + "/getAvailablePoints.sh"};
+            args = new String[]{"-e", "library(tmcRtestrunner);run_available_points()"};
         }
-        return ArrayUtils.addAll(rscr, command);
+        return ArrayUtils.addAll(command, args);
     }
 
 

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

@@ -0,0 +1,33 @@
+
+package fi.helsinki.cs.tmc.langs.r;
+
+import java.util.List;
+
+
+public class RResult {
+    
+    private String name;
+    private List<String> points;
+    
+    public RResult(){
+      
+    }
+    
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<String> getPoints() {
+        return points;
+    }
+
+    public void setPoints(List<String> points) {
+        this.points = points;
+    }
+    
+    
+}

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

@@ -30,18 +30,32 @@ public RExerciseDescParserTest() {
 
     @Test
     public void testThatParseSeemsToWorkOnExampleJson() {
-        assertEquals(re.size(),6);
-        assertEquals(re.get(0).points.size(),2);
+        assertEquals(re.size(),22);
+        assertEquals(re.get(0).points.size(),3);
         assertEquals(re.get(0).name,"Addition works");
-        assertEquals(re.get(1).points.size(),2);
+        assertEquals(re.get(1).points.size(),3);
         assertEquals(re.get(1).name,"Multiplication works");
-        assertEquals(re.get(2).points.size(),1);
+        assertEquals(re.get(2).points.size(),2);
         assertEquals(re.get(2).name,"Subtraction works");
-        assertEquals(re.get(3).points.size(),1);
+        assertEquals(re.get(3).points.size(),2);
         assertEquals(re.get(3).name,"Division works");
-        assertEquals(re.get(4).points.size(),0);
+        assertEquals(re.get(4).points.size(),1);
         assertEquals(re.get(4).name, "Test with no points");
-        assertEquals(re.get(5).points.size(),0);
+        assertEquals(re.get(5).points.size(),1);
         assertEquals(re.get(5).name, "Dummy test set to fail");
+        assertEquals(re.get(6).points.size(),2);
+        assertEquals(re.get(6).name, "Matrix transpose with [[1,2]] works");
+        assertEquals(re.get(7).points.size(),2);
+        assertEquals(re.get(7).name, "Matrix transpose with [[1,2],[3,4]] works");
+        assertEquals(re.get(8).points.size(),2);
+        assertEquals(re.get(8).name, "Constant string works");
+        for (int i = 1;i <= 13;i++) {
+            assertEquals(re.get(8 + i).name, "Exercise " + i + " is correct"); 
+            if (i == 3) {
+                assertEquals(re.get(8 + i).points.size(),3); 
+            } else {
+                assertEquals(re.get(8 + i).points.size(),2);
+            }
+        }
     }
 }