Merge pull request #91 from RTMC/master

Added solution file support for R and made cheating harder.

Author: nygrenh

tmc-langs-framework/src/main/java/fi/helsinki/cs/tmc/langs/domain/MetaSyntaxGenerator.java

@@ -20,7 +20,7 @@ public static List<MetaSyntax> listSyntaxes(String fileType) {
             list.add(new MetaSyntax("\\/\\*+", "\\*+\\/")); /* */
         } else if (fileType.matches("xml|http|html")) {
             list.add(new MetaSyntax("<!--", "-->"));
-        } else if (fileType.matches("properties|py")) {
+        } else if (fileType.matches("properties|py|R")) {
             list.add(new MetaSyntax("#", ""));
         }
         cache.put(fileType, list);

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

@@ -121,6 +121,8 @@ public Optional<ExerciseDesc> scanExercise(Path path, String exerciseName) {
     @Override
     public RunResult runTests(Path path) {
         ProcessRunner runner = new ProcessRunner(getTestCommand(), path);
+
+        deleteResultsJson(path);
 
         try {
             ProcessResult result = runner.call();
@@ -189,6 +191,14 @@ public String[] getAvailablePointsCommand() {
         return ArrayUtils.addAll(command, args);
     }
 
+    public void deleteResultsJson(Path path) {
+        try {
+            Files.deleteIfExists(path.resolve(".results.json"));
+        } catch (Exception e) {
+            log.error("Could not delete .results.json", e);
+        }
+    }
+
     /**
      * No operation for now. To be possibly implemented later: remove .Rdata, .Rhistory etc
      */

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

@@ -120,7 +120,8 @@ public void runTestsReturnsStackTraceWhenPathDoesNotExist() {
         RunResult res = plugin.runTests(doesNotExist);
 
         String stackTrace = new String(res.logs.get(SpecialLogs.GENERIC_ERROR_MESSAGE));
-        assertEquals("java.lang.NullPointerException", stackTrace.split("\n")[0]);
+        assertEquals("java.lang.NullPointerException",
+                stackTrace.split(System.getProperty("line.separator"))[0]);
         assertTrue(stackTrace.split("\n").length > 1);
     }
 
@@ -155,4 +156,17 @@ public void getStudentFilePolicyReturnsRStudentFilePolicy() {
 
         assertTrue(policy instanceof RStudentFilePolicy);
     }
+
+    @Test
+    public void resultsJsonIsDeletedBeforeRunning() throws IOException {
+        Files.createFile(simpleAllTestsPassProject.resolve(".results.json"));
+        plugin.deleteResultsJson(simpleAllTestsPassProject);
+        assertTrue(!Files.exists(simpleAllTestsPassProject.resolve(".results.json")));
+    }
+
+    @Test
+    public void deleteResultsJsonWorksCorrectlyWhenNoJson() throws IOException {
+        plugin.deleteResultsJson(simpleAllTestsPassProject);
+        assertTrue(!Files.exists(simpleAllTestsPassProject.resolve(".results.json")));
+    }
 }