Merge pull request #89 from RTMC/master

Added packaging configuration for RPlugin and improved error handling.

Author: nygrenh

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

@@ -6,6 +6,7 @@
 import fi.helsinki.cs.tmc.langs.abstraction.ValidationResult;
 import fi.helsinki.cs.tmc.langs.domain.ExerciseBuilder;
 import fi.helsinki.cs.tmc.langs.domain.ExerciseDesc;
+import fi.helsinki.cs.tmc.langs.domain.ExercisePackagingConfiguration;
 import fi.helsinki.cs.tmc.langs.domain.RunResult;
 import fi.helsinki.cs.tmc.langs.domain.SpecialLogs;
 import fi.helsinki.cs.tmc.langs.domain.TestDesc;
@@ -14,6 +15,7 @@
 import fi.helsinki.cs.tmc.langs.io.sandbox.StudentFileAwareSubmissionProcessor;
 import fi.helsinki.cs.tmc.langs.io.zip.StudentFileAwareUnzipper;
 import fi.helsinki.cs.tmc.langs.io.zip.StudentFileAwareZipper;
+import fi.helsinki.cs.tmc.langs.utils.ProcessResult;
 import fi.helsinki.cs.tmc.langs.utils.ProcessRunner;
 
 import com.google.common.base.Optional;
@@ -96,7 +98,11 @@ public Optional<ExerciseDesc> scanExercise(Path path, String exerciseName) {
         ProcessRunner runner = new ProcessRunner(this.getAvailablePointsCommand(), path);
 
         try {
-            runner.call();
+            ProcessResult result = runner.call();
+            if (result.statusCode != 0) {
+                log.error(CANNOT_SCAN_EXERCISE_MESSAGE);
+                return Optional.absent();
+            }
         } catch (Exception e) {
             log.error(CANNOT_SCAN_EXERCISE_MESSAGE, e);
             return Optional.absent();
@@ -117,7 +123,11 @@ public RunResult runTests(Path path) {
         ProcessRunner runner = new ProcessRunner(getTestCommand(), path);
 
         try {
-            runner.call();
+            ProcessResult result = runner.call();
+            if (result.statusCode != 0) {
+                log.error(CANNOT_RUN_TESTS_MESSAGE);
+                return getGenericErrorRunResult(new Exception(CANNOT_RUN_TESTS_MESSAGE));
+            }
         } catch (Exception e) {
             log.error(CANNOT_RUN_TESTS_MESSAGE, e);
             return getGenericErrorRunResult(e);
@@ -185,4 +195,10 @@ public String[] getAvailablePointsCommand() {
     @Override
     public void clean(Path path) {
     }
+
+    @Override
+    public ExercisePackagingConfiguration getExercisePackagingConfiguration(Path path) {
+        return new ExercisePackagingConfiguration(
+                ImmutableList.of("R"), ImmutableList.of("tests"));
+    }
 }

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

@@ -25,7 +25,8 @@ public class RPluginTest {
 
     private Path simpleAllTestsPassProject;
     private Path simpleSomeTestsFailProject;
-    private Path simpleSourceCodeErrorProject;
+    private Path simpleSourcingFailProject;
+    private Path simpleRunFailProject;
 
     @Rule
     public final ExpectedException exception = ExpectedException.none();
@@ -38,16 +39,18 @@ public void setUp() {
                 "simple_all_tests_pass");
         simpleSomeTestsFailProject = TestUtils.getPath(getClass(),
                 "simple_some_tests_fail");
-        simpleSourceCodeErrorProject = TestUtils.getPath(getClass(),
-                "simple_source_code_error");
+        simpleSourcingFailProject = TestUtils.getPath(getClass(),
+                "simple_sourcing_fail");
+        simpleRunFailProject = TestUtils.getPath(getClass(),
+                "simple_run_fail");
     }
 
     @After
     public void tearDown() throws IOException {
         removeAvailablePointsJson(simpleAllTestsPassProject);
         removeResultsJson(simpleAllTestsPassProject);
         removeResultsJson(simpleSomeTestsFailProject);
-        removeResultsJson(simpleSourceCodeErrorProject);
+        removeResultsJson(simpleSourcingFailProject);
     }
 
     private void removeResultsJson(Path projectPath) throws IOException {
@@ -88,8 +91,15 @@ public void runTestsRunResultWithCorrectStatusForSimpleSomeFail() {
     }
 
     @Test
-    public void runTestsCreatesRunResultWithCorrectStatusWhenSourceCodeHasError() {
-        RunResult res = plugin.runTests(simpleSourceCodeErrorProject);
+    public void runTestsCreatesRunResultWithCorrectStatusForSourcingFail() {
+        RunResult res = plugin.runTests(simpleSourcingFailProject);
+
+        assertEquals(RunResult.Status.COMPILE_FAILED, res.status);
+    }
+
+    @Test
+    public void runTestsCreatesRunResultWithCorrecStatusForRunFails() {
+        RunResult res = plugin.runTests(simpleRunFailProject);
 
         assertEquals(RunResult.Status.COMPILE_FAILED, res.status);
     }

tmc-langs-r/src/test/resources/simple_run_fail/R/main.R

@@ -0,0 +1,11 @@
+ret_true <- function() {
+  return(TRUE)
+}
+
+ret_one <- function() {
+  return(1)
+}
+
+add <- function(a, b) {
+  return(a + b)
+}

tmc-langs-r/src/test/resources/simple_source_code_error/simple_source_code_error.Rproj renamed to tmc-langs-r/src/test/resources/simple_run_fail/simple_run_fail.Rproj

@@ -0,0 +1,22 @@
+library('testthat')
+
+source("../../R/main.R")
+
+points_for_all_tests(c("r1"))
+
+test("RetTrue works.", c("r1.1"), {
+  #Produces run fail:
+  in error in
+  expect_true(ret_true())
+})
+
+test("RetOne works.", c("r1.2"), {
+  expect_equal(ret_one(), 1)
+})
+
+test("Add works.", c("r1.3", "r1.4"), {
+  expect_equal(add(1, 1), 2)
+  expect_equal(add(0, 1), 1)
+  expect_equal(add(0, 0), 0)
+  expect_equal(add(5, 5), 10)
+})

tmc-langs-r/src/test/resources/simple_run_fail/tests/testthat/testMain.R

@@ -1,12 +1,12 @@
-RetTrue <- function() {
+ret_true <- function() {
   return(TRUE)
 }
 
 #This function produces an error
-RetOne <- function() {
+ret_one <- function() {
   error in source code
 }
 
-Add <- function(a, b) {
+add <- function(a, b) {
   return(a + b)
 }

tmc-langs-r/src/test/resources/simple_source_code_error/tests/testthat/testMain.R

@@ -0,0 +1,13 @@
+Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: Sweave
+LaTeX: pdfLaTeX

tmc-langs-r/src/test/resources/simple_source_code_error/R/main.R renamed to tmc-langs-r/src/test/resources/simple_sourcing_fail/R/main.R

@@ -0,0 +1,20 @@
+library('testthat')
+
+source("../../R/main.R")
+
+points_for_all_tests(c("r1"))
+
+test("RetTrue works.", c("r1.1"), {
+  expect_true(ret_true())
+})
+
+test("RetOne works.", c("r1.2"), {
+  expect_equal(ret_one(), 1)
+})
+
+test("Add works.", c("r1.3", "r1.4"), {
+  expect_equal(add(1, 1), 2)
+  expect_equal(add(0, 1), 1)
+  expect_equal(add(0, 0), 0)
+  expect_equal(add(5, 5), 10)
+})