Travis configuration

.travis.yml

@@ -17,10 +17,18 @@ env:
   - M3_HOME=/usr/local/maven
 
 before_install:
+  - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E084DAB9
+  - echo "deb https://cloud.r-project.org/bin/linux/ubuntu trusty/" | sudo tee -a /etc/apt/sources.list
+  - sudo apt-get update -qq
+  - sudo apt-get install r-base -y
+  - sudo chmod 277 /usr/local/lib/R/site-library
+  - Rscript -e 'install.packages(c("devtools","testthat"),repos="http://cran.us.r-project.org")'
+  - Rscript -e 'devtools::install_github("RTMC/tmc-r-tester/tmcRtestrunner")'
   - export PATH=$PATH:$PWD/bin
   - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
   - mkdir -p $HOME/bin && ln -s $(which python3.4) $HOME/bin/python3 && export PATH="$HOME/bin:$PATH"
   - mvn install -Dmaven.test.skip=true
+
 script:
   - mvn clean test -pl tmc-langs-r
   - mvn checkstyle:check
@@ -36,6 +44,7 @@ jdk:
   - oraclejdk7
   - openjdk7
 matrix:
+
   allow_failures:
   - os: osx
   - jdk: oraclejdk7

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);runTestsWithDefault(TRUE)"
+/usr/bin/Rscript -e "library(tmcRtestrunner);run_tests()"

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

@@ -149,7 +149,7 @@ public String[] getTestCommand() {
         String[] command;
         if (SystemUtils.IS_OS_WINDOWS) {
             rscr = new String[] {"Rscript", "-e"};
-            command = new String[] {"\"library('tmcRtestrunner');runTestsWithDefault(TRUE)\""};
+            command = new String[] {"\"library('tmcRtestrunner');run_tests_with_default(TRUE)\""};
         } else {
             rscr = new String[] {"bash"};
             command = new String[] {Paths.get("").toAbsolutePath().toString() + "/runTests.sh"};
@@ -163,7 +163,7 @@ public String[] getAvailablePointsCommand() {
         if (SystemUtils.IS_OS_WINDOWS) {
             rscr = new String[] {"Rscript", "-e"};
             command = new String[] {"\"library(tmcRtestrunner);"
-                                    + "get_available_points(\"$PWD\")\""};
+                                    + "run_available_points(\"$PWD\")\""};
         } else {
             rscr = new String[] {"bash"};
             command = new String[] {Paths.get("").toAbsolutePath().toString() 

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/RPluginTest.java

@@ -40,7 +40,7 @@ public void tearDown() {
     public void testGetTestCommand() {
         if (SystemUtils.IS_OS_WINDOWS) {
             String[] expectedCommand = new String[]{"Rscript", "-e",
-                    "\"library('tmcRtestrunner');runTestsWithDefault(TRUE)\""};
+                    "\"library('tmcRtestrunner');run_tests_with_default(TRUE)\""};
 
             Assert.assertArrayEquals(expectedCommand,plugin.getTestCommand());
         } else if (SystemUtils.IS_OS_LINUX) {
@@ -70,9 +70,7 @@ public void testGetAvailablePointsCommand() {
     public void testGetPluginName() {
         assertEquals("r", plugin.getLanguageName());
     }
-    /**
-     * Need to configure .travis.yml for these tests to work
-
+
     @Test
     public void testScanExercise() {
         Path testDir = TestUtils.getPath(getClass(), "passing");
@@ -87,7 +85,7 @@ public void testRunTests() {
 
         assertTrue(resultsJson.exists());
     }
-    */
+
     @Test
     public void excerciseIsCorrectTypeIfItContainsRFolder() {
         Path testCasesRoot = TestUtils.getPath(getClass(), "recognition_test_cases");

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"));
             }