From 7e9fa271e6c706ce3228c7811cffc390fce37c26 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Tue, 3 Oct 2017 20:11:12 +0300 Subject: [PATCH 01/41] testing new travis settings --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 929a1e0fa..29d286eb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,9 @@ env: - M3_HOME=/usr/local/maven before_install: + - sudo apt-get update + - sudo apt-get install R + - R --vanilla -e "library('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" From cf9b09883d74f90dd7c4126a46c6de7c9a5b0a2e Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Tue, 3 Oct 2017 20:19:32 +0300 Subject: [PATCH 02/41] new try --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 29d286eb4..e424853e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ env: before_install: - sudo apt-get update - - sudo apt-get install R + - sudo apt-get install r-base - R --vanilla -e "library('devtools');install_github('RTMC/tmc-r-tester/tmcRtestrunner');" - export PATH=$PATH:$PWD/bin - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib From fe3464702c38da12e2e9a1b98a95b7138cfbef9e Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Tue, 3 Oct 2017 20:32:39 +0300 Subject: [PATCH 03/41] new try2 --- ..travis.yml.swp | Bin 0 -> 1024 bytes .travis.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 ..travis.yml.swp diff --git a/..travis.yml.swp b/..travis.yml.swp new file mode 100644 index 0000000000000000000000000000000000000000..f851b301074c21cf9a52058bb64d531778f765fc GIT binary patch literal 1024 zcmYc?$V<%2S1{5u)iY*50&O`A3|WbJd8tTZxR_vdx*h?#t~r?{sZRO%*}4`+2D cXd3iNiW18*i}fmVfrgKQ(GVC7fdLNz09VTrg8%>k literal 0 HcmV?d00001 diff --git a/.travis.yml b/.travis.yml index e424853e0..fc3e49009 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ env: before_install: - sudo apt-get update - sudo apt-get install r-base - - R --vanilla -e "library('devtools');install_github('RTMC/tmc-r-tester/tmcRtestrunner');" + - R --vanilla -e "install.packages('devtools',repos='https://mirrors.dotsrc.org/cran/');library('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" From dd51c179d5ca3653f8c7174b1b588b579ce76c34 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Tue, 3 Oct 2017 22:05:12 +0300 Subject: [PATCH 04/41] new try3 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fc3e49009..62efd0b3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: java -sudo: false +sudo: true cache: directories: - "$HOME/.m2" From 480ad0dcda8c89f94112d01f2b3f512cb944182a Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Tue, 3 Oct 2017 22:18:01 +0300 Subject: [PATCH 05/41] new try4 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 62efd0b3f..412fc3a1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: java -sudo: true +sudo: false cache: directories: - "$HOME/.m2" @@ -19,6 +19,7 @@ env: before_install: - sudo apt-get update - sudo apt-get install r-base + - udo chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library - R --vanilla -e "install.packages('devtools',repos='https://mirrors.dotsrc.org/cran/');library('devtools');install_github('RTMC/tmc-r-tester/tmcRtestrunner');" - export PATH=$PATH:$PWD/bin - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib From f786296747f34fc4575db9774c413a47504241a5 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Tue, 3 Oct 2017 22:24:43 +0300 Subject: [PATCH 06/41] new try5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 412fc3a1d..9d2fb53da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ env: before_install: - sudo apt-get update - sudo apt-get install r-base - - udo chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library + - sudo chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library - R --vanilla -e "install.packages('devtools',repos='https://mirrors.dotsrc.org/cran/');library('devtools');install_github('RTMC/tmc-r-tester/tmcRtestrunner');" - export PATH=$PATH:$PWD/bin - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib From 86325701d53569f747fb704195304c078f4e1fd5 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Tue, 3 Oct 2017 22:41:32 +0300 Subject: [PATCH 07/41] new try6 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9d2fb53da..18e61f9dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ env: before_install: - sudo apt-get update - sudo apt-get install r-base + - sudo apt-get upgrade r-base - sudo chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library - R --vanilla -e "install.packages('devtools',repos='https://mirrors.dotsrc.org/cran/');library('devtools');install_github('RTMC/tmc-r-tester/tmcRtestrunner');" - export PATH=$PATH:$PWD/bin From 0cc6d7df57510c0c964c2e8e26e30447541e5173 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Tue, 3 Oct 2017 22:49:30 +0300 Subject: [PATCH 08/41] new try7 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 18e61f9dc..73be091e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,7 @@ env: before_install: - sudo apt-get update - - sudo apt-get install r-base - - sudo apt-get upgrade r-base + - sudo apt-get install r-base r-base-dev - sudo chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library - R --vanilla -e "install.packages('devtools',repos='https://mirrors.dotsrc.org/cran/');library('devtools');install_github('RTMC/tmc-r-tester/tmcRtestrunner');" - export PATH=$PATH:$PWD/bin From 02e969199e6ad7c4ccf4b6b9c04cdd28a804c7d4 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Tue, 3 Oct 2017 22:56:13 +0300 Subject: [PATCH 09/41] new try8 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 73be091e6..2856f0e00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ env: - M3_HOME=/usr/local/maven before_install: + - deb https://cloud.r-project.org/bin/linux/debian stretch-cran34/ - sudo apt-get update - sudo apt-get install r-base r-base-dev - sudo chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library From f0dfc20f965fad3567ba38f125351ae153c9c115 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Tue, 3 Oct 2017 23:02:07 +0300 Subject: [PATCH 10/41] new try9 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2856f0e00..d9f263f40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ env: - M3_HOME=/usr/local/maven before_install: - - deb https://cloud.r-project.org/bin/linux/debian stretch-cran34/ + - sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/debian stretch-cran34/" - sudo apt-get update - sudo apt-get install r-base r-base-dev - sudo chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library From f42f898edc2464bd26454e0097df259071794b2a Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Tue, 3 Oct 2017 23:08:47 +0300 Subject: [PATCH 11/41] new try10 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d9f263f40..10c899fdf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ env: before_install: - sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/debian stretch-cran34/" - sudo apt-get update - - sudo apt-get install r-base r-base-dev + - sudo apt-get install r-base-core r-recommended r-base r-base-dev - sudo chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library - R --vanilla -e "install.packages('devtools',repos='https://mirrors.dotsrc.org/cran/');library('devtools');install_github('RTMC/tmc-r-tester/tmcRtestrunner');" - export PATH=$PATH:$PWD/bin From 319eb1a5716ed7184f01e696abcfc7c36a74b07c Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Tue, 3 Oct 2017 23:16:35 +0300 Subject: [PATCH 12/41] new try11 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 10c899fdf..b2cbc7594 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ env: before_install: - sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/debian stretch-cran34/" - sudo apt-get update - - sudo apt-get install r-base-core r-recommended r-base r-base-dev + - sudo apt-get install -f r-base-core r-recommended r-base r-base-dev - sudo chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library - R --vanilla -e "install.packages('devtools',repos='https://mirrors.dotsrc.org/cran/');library('devtools');install_github('RTMC/tmc-r-tester/tmcRtestrunner');" - export PATH=$PATH:$PWD/bin From 61c93a820983154ad066272b80195f35bed4e3b3 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Tue, 3 Oct 2017 23:25:38 +0300 Subject: [PATCH 13/41] new try12 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b2cbc7594..5f84f58f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ env: before_install: - sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/debian stretch-cran34/" - sudo apt-get update - - sudo apt-get install -f r-base-core r-recommended r-base r-base-dev + - sudo apt-get install libc6 libgomp1 libicu57 libjpeg62-turbo libpng16-16 libreadline7 r-base-core r-recommended r-base r-base-dev - sudo chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library - R --vanilla -e "install.packages('devtools',repos='https://mirrors.dotsrc.org/cran/');library('devtools');install_github('RTMC/tmc-r-tester/tmcRtestrunner');" - export PATH=$PATH:$PWD/bin From d4e57c499691883f5aef36c58d3de196ab6ef5cf Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Tue, 3 Oct 2017 23:53:10 +0300 Subject: [PATCH 14/41] new try13 --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f84f58f3..450d2b3e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,6 @@ env: - M3_HOME=/usr/local/maven before_install: - - sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/debian stretch-cran34/" - - sudo apt-get update - - sudo apt-get install libc6 libgomp1 libicu57 libjpeg62-turbo libpng16-16 libreadline7 r-base-core r-recommended r-base r-base-dev - sudo chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library - R --vanilla -e "install.packages('devtools',repos='https://mirrors.dotsrc.org/cran/');library('devtools');install_github('RTMC/tmc-r-tester/tmcRtestrunner');" - export PATH=$PATH:$PWD/bin @@ -41,6 +38,10 @@ jdk: - oraclejdk7 - openjdk7 matrix: + include: + language: r + r: + - release allow_failures: - os: osx - jdk: oraclejdk7 From ab7376637fa57c16a0466c23caa2358d143092be Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Tue, 3 Oct 2017 23:57:22 +0300 Subject: [PATCH 15/41] new try14 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 450d2b3e8..16de58ef0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,6 @@ env: - M3_HOME=/usr/local/maven before_install: - - sudo chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library - R --vanilla -e "install.packages('devtools',repos='https://mirrors.dotsrc.org/cran/');library('devtools');install_github('RTMC/tmc-r-tester/tmcRtestrunner');" - export PATH=$PATH:$PWD/bin - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib From 759fa7d4e80cfbe51b0a487e85f0cc6f5635421a Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 00:01:17 +0300 Subject: [PATCH 16/41] new try15 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 16de58ef0..429bdc93f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ env: - M3_HOME=/usr/local/maven before_install: + - sudo apt-get install r-base-core - R --vanilla -e "install.packages('devtools',repos='https://mirrors.dotsrc.org/cran/');library('devtools');install_github('RTMC/tmc-r-tester/tmcRtestrunner');" - export PATH=$PATH:$PWD/bin - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib From f957cda193cf7d4f87446877ba710148d8361e94 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 00:05:23 +0300 Subject: [PATCH 17/41] new try16 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 429bdc93f..f76e182ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ env: before_install: - sudo apt-get install r-base-core + - sudo chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library - R --vanilla -e "install.packages('devtools',repos='https://mirrors.dotsrc.org/cran/');library('devtools');install_github('RTMC/tmc-r-tester/tmcRtestrunner');" - export PATH=$PATH:$PWD/bin - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib From 547cf717941546120373799c54b8e593aff29c47 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 00:09:32 +0300 Subject: [PATCH 18/41] new try17 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f76e182ad..79c0baf7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ env: before_install: - sudo apt-get install r-base-core - sudo chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library - - R --vanilla -e "install.packages('devtools',repos='https://mirrors.dotsrc.org/cran/');library('devtools');install_github('RTMC/tmc-r-tester/tmcRtestrunner');" + - Rscript -e "install.packages('devtools',repos='https://mirrors.dotsrc.org/cran/');library('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" From ce4631cb9f75144f5b1623d756a9c92914b77773 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 00:22:41 +0300 Subject: [PATCH 19/41] new try18 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 79c0baf7a..9f5cf9f08 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,6 @@ env: - M3_HOME=/usr/local/maven before_install: - - sudo apt-get install r-base-core - sudo chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library - Rscript -e "install.packages('devtools',repos='https://mirrors.dotsrc.org/cran/');library('devtools');install_github('RTMC/tmc-r-tester/tmcRtestrunner');" - export PATH=$PATH:$PWD/bin From a01a35eb3f5a0bc51a516d38d960fca4d9a1e83c Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 00:29:41 +0300 Subject: [PATCH 20/41] new try19 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f5cf9f08..e145e9f94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,6 @@ env: - M3_HOME=/usr/local/maven before_install: - - sudo chmod 2777 /usr/local/lib/R /usr/local/lib/R/site-library - - Rscript -e "install.packages('devtools',repos='https://mirrors.dotsrc.org/cran/');library('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" @@ -42,6 +40,7 @@ matrix: language: r r: - release + r_github_packages: "RTMC/tmc-r-tester/tmcRtestrunner allow_failures: - os: osx - jdk: oraclejdk7 From 8bf59b7d491309b3754bdbe47784bd5a44d69682 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 00:47:31 +0300 Subject: [PATCH 21/41] puskii --- tmc-langs-r/runTests.sh | 2 +- .../src/main/java/fi/helsinki/cs/tmc/langs/r/RPlugin.java | 4 ++-- .../test/java/fi/helsinki/cs/tmc/langs/r/RPluginTest.java | 8 +++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tmc-langs-r/runTests.sh b/tmc-langs-r/runTests.sh index 4c98bc059..b5a9ef514 100755 --- a/tmc-langs-r/runTests.sh +++ b/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_with_default(TRUE)" diff --git a/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/RPlugin.java b/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/RPlugin.java index 504ab2c8f..f34d5ac88 100644 --- a/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/RPlugin.java +++ b/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() diff --git a/tmc-langs-r/src/test/java/fi/helsinki/cs/tmc/langs/r/RPluginTest.java b/tmc-langs-r/src/test/java/fi/helsinki/cs/tmc/langs/r/RPluginTest.java index 0ea7dc3be..71d91d84f 100644 --- a/tmc-langs-r/src/test/java/fi/helsinki/cs/tmc/langs/r/RPluginTest.java +++ b/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"); From 4a382aae31a1cfc942373b6a71eed946a21d4020 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 01:20:58 +0300 Subject: [PATCH 22/41] new try20 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e145e9f94..c82beeacb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ matrix: language: r r: - release - r_github_packages: "RTMC/tmc-r-tester/tmcRtestrunner + r_github_packages: "RTMC/tmc-r-tester/tmcRtestrunner" allow_failures: - os: osx - jdk: oraclejdk7 From e6f0b3bb68bfea7659e28f0a208d385bebba1def Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 01:36:44 +0300 Subject: [PATCH 23/41] zzz --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c82beeacb..ca45afb0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,9 +38,8 @@ jdk: matrix: include: language: r - r: - - release r_github_packages: "RTMC/tmc-r-tester/tmcRtestrunner" + allow_failures: - os: osx - jdk: oraclejdk7 From 9e0d8f2551ad25d0f90250262e511cab6e59b65f Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 01:44:12 +0300 Subject: [PATCH 24/41] zzzz --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ca45afb0a..5370091ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,8 @@ jdk: matrix: include: language: r - r_github_packages: "RTMC/tmc-r-tester/tmcRtestrunner" + r_github_packages: + - RTMC/tmc-r-tester/tmcRtestrunner allow_failures: - os: osx From 51a5fdfd4a8692f1d26a3b98a2a5382b909bf825 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 01:51:14 +0300 Subject: [PATCH 25/41] zzzzz --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5370091ec..95d4f4902 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,8 @@ jdk: matrix: include: language: r + r_packages: + - devtools r_github_packages: - RTMC/tmc-r-tester/tmcRtestrunner From 14fc5dab3ddb20a0c07dbadc75b61feca165a068 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 02:04:28 +0300 Subject: [PATCH 26/41] zzzzzz --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95d4f4902..4f646ddd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,12 +37,10 @@ jdk: - openjdk7 matrix: include: - language: r - r_packages: - - devtools - r_github_packages: - - RTMC/tmc-r-tester/tmcRtestrunner - + language: R + install: + - Rscript -e 'install.packages("devtools")' + - Rscript -e 'devtools::install_github("RTMC/tmc-r-tester/tmcRtestrunner' allow_failures: - os: osx - jdk: oraclejdk7 From 33b6c52add9fbb6f6c1731fcd12954c9037ff1c3 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 02:08:51 +0300 Subject: [PATCH 27/41] asd --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f646ddd0..bf91e9e90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,8 @@ env: - M3_HOME=/usr/local/maven before_install: + - Rscript -e 'install.packages("devtools")' + - 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" @@ -38,9 +40,7 @@ jdk: matrix: include: language: R - install: - - Rscript -e 'install.packages("devtools")' - - Rscript -e 'devtools::install_github("RTMC/tmc-r-tester/tmcRtestrunner' + allow_failures: - os: osx - jdk: oraclejdk7 From 727c4d02372f69043075bdba406dad5de10423e6 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 02:11:55 +0300 Subject: [PATCH 28/41] new try --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bf91e9e90..40f0297ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ addons: sources: - deadsnakes packages: + - r-base-core - valgrind - check env: From 124d6312a7a4cff44bcb46fbb5c7c0bcd9391255 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 02:15:07 +0300 Subject: [PATCH 29/41] new try2 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 40f0297ce..c14f1d7c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ env: - M3_HOME=/usr/local/maven before_install: + - sudo chmod 277 /usr/local/lib/R/site-library - Rscript -e 'install.packages("devtools")' - Rscript -e 'devtools::install_github("RTMC/tmc-r-tester/tmcRtestrunner' - export PATH=$PATH:$PWD/bin From 387d9bdfa7667a1f54ed5241e515b8453ce569f5 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 02:20:44 +0300 Subject: [PATCH 30/41] new try2 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c14f1d7c8..b42ea82f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ env: before_install: - sudo chmod 277 /usr/local/lib/R/site-library - - Rscript -e 'install.packages("devtools")' + - Rscript -e 'install.packages("devtools",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 From d5dfb39371b7122151ab50b8900d81ba166db20c Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 02:28:45 +0300 Subject: [PATCH 31/41] new try --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b42ea82f9..aca06075f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ env: before_install: - sudo chmod 277 /usr/local/lib/R/site-library - Rscript -e 'install.packages("devtools",repos="http://cran.us.r-project.org")' - - Rscript -e 'devtools::install_github("RTMC/tmc-r-tester/tmcRtestrunner' + - 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" From d9e3fb763b4a551a15ea7b4b5b948022d93c9a2b Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 02:33:18 +0300 Subject: [PATCH 32/41] new try --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aca06075f..e03664f0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ env: before_install: - sudo chmod 277 /usr/local/lib/R/site-library - - Rscript -e 'install.packages("devtools",repos="http://cran.us.r-project.org")' + - 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 From 708f7c51499c933a57998f9a9117bc3a2ec7a458 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 02:39:26 +0300 Subject: [PATCH 33/41] new try2 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e03664f0c..80e5a3ba6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ before_install: - 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 From 51232ebf6cafa941569aa5d96407d80742af6eb3 Mon Sep 17 00:00:00 2001 From: Janne Hyttinen Date: Wed, 4 Oct 2017 02:52:43 +0300 Subject: [PATCH 34/41] new try --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80e5a3ba6..c3edd74b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,9 +41,7 @@ jdk: - oraclejdk7 - openjdk7 matrix: - include: - language: R - + allow_failures: - os: osx - jdk: oraclejdk7 From f142f5d5a451ca1fdc84a4bf842e1bf27a9796b0 Mon Sep 17 00:00:00 2001 From: anttihaap Date: Wed, 4 Oct 2017 06:12:43 +0300 Subject: [PATCH 35/41] Trying to install newer R version on travis. --- ..travis.yml.swp | Bin 1024 -> 0 bytes .travis.yml | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 ..travis.yml.swp diff --git a/..travis.yml.swp b/..travis.yml.swp deleted file mode 100644 index f851b301074c21cf9a52058bb64d531778f765fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmYc?$V<%2S1{5u)iY*50&O`A3|WbJd8tTZxR_vdx*h?#t~r?{sZRO%*}4`+2D cXd3iNiW18*i}fmVfrgKQ(GVC7fdLNz09VTrg8%>k diff --git a/.travis.yml b/.travis.yml index c3edd74b4..72fb1cb25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ addons: sources: - deadsnakes packages: - - r-base-core - valgrind - check env: @@ -19,6 +18,10 @@ env: before_install: - sudo chmod 277 /usr/local/lib/R/site-library + - 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 - 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 From 82d3ab07b4c23d32d94c940d85bbfdf0a78fa1cd Mon Sep 17 00:00:00 2001 From: anttihaap Date: Wed, 4 Oct 2017 06:15:56 +0300 Subject: [PATCH 36/41] Travis fix: removed chmod from .travis.yml since file is not found. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 72fb1cb25..e66cf14d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,6 @@ env: - M3_HOME=/usr/local/maven before_install: - - sudo chmod 277 /usr/local/lib/R/site-library - 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 From e4fc8be606f7cecf67630429ee1b322eb6c3b22a Mon Sep 17 00:00:00 2001 From: anttihaap Date: Wed, 4 Oct 2017 06:22:31 +0300 Subject: [PATCH 37/41] Travis fix: changing permission for /usr/local/lib/R/site-library --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e66cf14d3..ac4d55d00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,7 @@ before_install: - sudo apt-get install r-base -y - Rscript -e 'install.packages(c("devtools","testthat"),repos="http://cran.us.r-project.org")' - Rscript -e 'devtools::install_github("RTMC/tmc-r-tester/tmcRtestrunner")' + - sudo chmod 277 /usr/local/lib/R/site-library - 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" From 3cbcdc0c0b39e7f26e89131327d87e9054db8605 Mon Sep 17 00:00:00 2001 From: anttihaap Date: Wed, 4 Oct 2017 06:24:55 +0300 Subject: [PATCH 38/41] Travis fix: changing permission for /usr/local/lib/R/site-library now on correct line. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ac4d55d00..257520786 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,9 +21,9 @@ before_install: - 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")' - - sudo chmod 277 /usr/local/lib/R/site-library - 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" From 9629e5e25cd79142d0ea5761ea9b0aa68892885b Mon Sep 17 00:00:00 2001 From: anttihaap Date: Wed, 4 Oct 2017 19:31:32 +0300 Subject: [PATCH 39/41] runTests.sh uses run_tests function runTests.sh uses run_tests function insted of old "with default" function. --- tmc-langs-r/runTests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmc-langs-r/runTests.sh b/tmc-langs-r/runTests.sh index b5a9ef514..039eb79fd 100755 --- a/tmc-langs-r/runTests.sh +++ b/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);run_tests_with_default(TRUE)" +/usr/bin/Rscript -e "library(tmcRtestrunner);run_tests()" From 4cba962e6f8d3e73ecf363ab74c74c04563d6b0a Mon Sep 17 00:00:00 2001 From: Antti Haapaniemi Date: Wed, 4 Oct 2017 20:40:40 +0300 Subject: [PATCH 40/41] Updated RTestResultParser to use new .results.json format. --- .../helsinki/cs/tmc/langs/r/RTestResultParser.java | 2 +- .../java/fi/helsinki/cs/tmc/langs/r/TestMain.java | 12 ++++++++---- .../cs/tmc/langs/r/RTestResultParserTest.java | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/RTestResultParser.java b/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/RTestResultParser.java index 0ab926fa3..9e158bc19 100644 --- a/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/RTestResultParser.java +++ b/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/RTestResultParser.java @@ -48,7 +48,7 @@ private List getTestResults() throws IOException { List results = new ArrayList<>(); - JsonNode tree = mapper.readTree(json); + JsonNode tree = mapper.readTree(json).get("testResults"); for (JsonNode node : tree) { results.add(toTestResult(node)); } diff --git a/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/TestMain.java b/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/TestMain.java index 134fc9ebb..3550bb9f6 100644 --- a/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/TestMain.java +++ b/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/TestMain.java @@ -2,7 +2,10 @@ import fi.helsinki.cs.tmc.langs.domain.RunResult; import fi.helsinki.cs.tmc.langs.domain.TestResult; +import fi.helsinki.cs.tmc.langs.utils.ProcessResult; +import fi.helsinki.cs.tmc.langs.utils.ProcessRunner; +import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; @@ -13,15 +16,16 @@ public class TestMain { * * @param args Nothing. */ - public static void main(String[] args) { + public static void main(String[] args) throws IOException, InterruptedException { //For now, add the path you want to test here fully, //for example: pathToGithubFolder/tmc-r/example_projects/example_project1 - /**String exampleProjectLocation = "/path/to/r-project" - + "/example_projects/example_project1"; + String exampleProjectLocation = "/home/antti/rtmc/tmc-r-tester/tmcRtestrunner/tests/testthat/resources/simple_all_tests_pass"; + + Path path = Paths.get(exampleProjectLocation); RPlugin rplugin = new RPlugin(); RunResult runRes = rplugin.runTests(path); - printTestResult(runRes);**/ + printTestResult(runRes); } public static void printTestResult(RunResult rr) { diff --git a/tmc-langs-r/src/test/java/fi/helsinki/cs/tmc/langs/r/RTestResultParserTest.java b/tmc-langs-r/src/test/java/fi/helsinki/cs/tmc/langs/r/RTestResultParserTest.java index 0ce59ca87..143627128 100644 --- a/tmc-langs-r/src/test/java/fi/helsinki/cs/tmc/langs/r/RTestResultParserTest.java +++ b/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")); } From e28e5c467a92f22ce4438b67e78cc432d612e87d Mon Sep 17 00:00:00 2001 From: Antti Haapaniemi Date: Wed, 4 Oct 2017 20:58:21 +0300 Subject: [PATCH 41/41] Added forgotten .results.json and changed TestMain to prev version. --- .../fi/helsinki/cs/tmc/langs/r/TestMain.java | 12 +- .../test/resources/example_json/.results.json | 477 ++++++++++-------- 2 files changed, 278 insertions(+), 211 deletions(-) diff --git a/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/TestMain.java b/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/TestMain.java index 3550bb9f6..134fc9ebb 100644 --- a/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/TestMain.java +++ b/tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/TestMain.java @@ -2,10 +2,7 @@ import fi.helsinki.cs.tmc.langs.domain.RunResult; import fi.helsinki.cs.tmc.langs.domain.TestResult; -import fi.helsinki.cs.tmc.langs.utils.ProcessResult; -import fi.helsinki.cs.tmc.langs.utils.ProcessRunner; -import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; @@ -16,16 +13,15 @@ public class TestMain { * * @param args Nothing. */ - public static void main(String[] args) throws IOException, InterruptedException { + 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 = "/home/antti/rtmc/tmc-r-tester/tmcRtestrunner/tests/testthat/resources/simple_all_tests_pass"; - - + /**String exampleProjectLocation = "/path/to/r-project" + + "/example_projects/example_project1"; Path path = Paths.get(exampleProjectLocation); RPlugin rplugin = new RPlugin(); RunResult runRes = rplugin.runTests(path); - printTestResult(runRes); + printTestResult(runRes);**/ } public static void printTestResult(RunResult rr) { diff --git a/tmc-langs-r/src/test/resources/example_json/.results.json b/tmc-langs-r/src/test/resources/example_json/.results.json index c35b74613..7c8a55800 100644 --- a/tmc-langs-r/src/test/resources/example_json/.results.json +++ b/tmc-langs-r/src/test/resources/example_json/.results.json @@ -1,203 +1,274 @@ -[ - { - "status": "pass", - "name": "Addition works", - "message": "", - "backtrace": "", - "points": [ - "r1.1", - "r1.2" - ] - }, - { - "status": "pass", - "name": "Multiplication works", - "message": "", - "backtrace": "", - "points": [ - "r1.3", - "r1.4" - ] - }, - { - "status": "pass", - "name": "Subtraction works", - "message": "", - "backtrace": "", - "points": [ - "r1.5" - ] - }, - { - "status": "pass", - "name": "Division works", - "message": "", - "backtrace": "", - "points": [ - "r1.6" - ] - }, - { - "status": "pass", - "name": "Test with no points", - "message": "", - "backtrace": "", - "points": [ - - ] - }, - { - "status": "fail", - "name": "Dummy test set to fail", - "message": "Failed with call: expect_true, FALSE\nFALSE isn't true.\nFailed with call: expect_equal, 1, 2\n1 not equal to 2.\n1/1 mismatches\n[1] 1 - 2 == -1\n", - "backtrace": "", - "points": [ - - ] - }, - { - "status": "pass", - "name": "Matrix transpose with [[1,2]] works", - "message": "", - "backtrace": "", - "points": [ - "r2.1" - ] - }, - { - "status": "pass", - "name": "Matrix transpose with [[1,2],[3,4]] works", - "message": "", - "backtrace": "", - "points": [ - "r2.2" - ] - }, - { - "status": "pass", - "name": "Constant string works", - "message": "", - "backtrace": "", - "points": [ - "r3.1" - ] - }, - { - "status": "pass", - "name": "Exercise 1 is correct", - "message": "", - "backtrace": "", - "points": [ - "r4.1" - ] - }, - { - "status": "pass", - "name": "Exercise 2 is correct", - "message": "", - "backtrace": "", - "points": [ - "r4.2" - ] - }, - { - "status": "pass", - "name": "Exercise 3 is correct", - "message": "", - "backtrace": "", - "points": [ - "r4.3", - "r4.4" - ] - }, - { - "status": "pass", - "name": "Exercise 4 is correct", - "message": "", - "backtrace": "", - "points": [ - "r4.5" - ] - }, - { - "status": "pass", - "name": "Exercise 5 is correct", - "message": "", - "backtrace": "", - "points": [ - "r4.6" - ] - }, - { - "status": "pass", - "name": "Exercise 6 is correct", - "message": "", - "backtrace": "", - "points": [ - "r4.7" - ] - }, - { - "status": "pass", - "name": "Exercise 7 is correct", - "message": "", - "backtrace": "", - "points": [ - "r4.8" - ] - }, - { - "status": "pass", - "name": "Exercise 8 is correct", - "message": "", - "backtrace": "", - "points": [ - "r4.9" - ] - }, - { - "status": "pass", - "name": "Exercise 9 is correct", - "message": "", - "backtrace": "", - "points": [ - "r4.10" - ] - }, - { - "status": "pass", - "name": "Exercise 10 is correct", - "message": "", - "backtrace": "", - "points": [ - "r4.11" - ] - }, - { - "status": "pass", - "name": "Exercise 11 is correct", - "message": "", - "backtrace": "", - "points": [ - "r4.12" - ] - }, - { - "status": "pass", - "name": "Exercise 12 is correct", - "message": "", - "backtrace": "", - "points": [ - "r4.13" - ] - }, - { - "status": "pass", - "name": "Exercise 13 is correct", - "message": "", - "backtrace": "", - "points": [ - "r4.14" - ] - } -] +{ + "runStatus": "success", + "backtrace": [ + + ], + "testResults": [ + { + "status": "pass", + "name": "Addition works", + "message": "", + "backtrace": [ + + ], + "points": [ + "r1", + "r1.1", + "r1.2" + ] + }, + { + "status": "pass", + "name": "Multiplication works", + "message": "", + "backtrace": [ + + ], + "points": [ + "r1", + "r1.3", + "r1.4" + ] + }, + { + "status": "pass", + "name": "Subtraction works", + "message": "", + "backtrace": [ + + ], + "points": [ + "r1", + "r1.5" + ] + }, + { + "status": "pass", + "name": "Division works", + "message": "", + "backtrace": [ + + ], + "points": [ + "r1", + "r1.6" + ] + }, + { + "status": "pass", + "name": "Test with no points", + "message": "", + "backtrace": [ + + ], + "points": [ + "r1" + ] + }, + { + "status": "fail", + "name": "Dummy test set to fail", + "message": "Failed with call: expect_true, FALSE\nFALSE isn't true.\nFailed with call: expect_equal, 1, 2\n1 not equal to 2.\n1/1 mismatches\n[1] 1 - 2 == -1\n", + "backtrace": [ + + ], + "points": [ + "r1" + ] + }, + { + "status": "pass", + "name": "Matrix transpose with [[1,2]] works", + "message": "", + "backtrace": [ + + ], + "points": [ + "r2", + "r2.1" + ] + }, + { + "status": "pass", + "name": "Matrix transpose with [[1,2],[3,4]] works", + "message": "", + "backtrace": [ + + ], + "points": [ + "r2", + "r2.2" + ] + }, + { + "status": "pass", + "name": "Constant string works", + "message": "", + "backtrace": [ + + ], + "points": [ + "r3", + "r3.1" + ] + }, + { + "status": "pass", + "name": "Exercise 1 is correct", + "message": "", + "backtrace": [ + + ], + "points": [ + "r4", + "r4.1" + ] + }, + { + "status": "pass", + "name": "Exercise 2 is correct", + "message": "", + "backtrace": [ + + ], + "points": [ + "r4", + "r4.2" + ] + }, + { + "status": "pass", + "name": "Exercise 3 is correct", + "message": "", + "backtrace": [ + + ], + "points": [ + "r4", + "r4.3", + "r4.4" + ] + }, + { + "status": "pass", + "name": "Exercise 4 is correct", + "message": "", + "backtrace": [ + + ], + "points": [ + "r4", + "r4.5" + ] + }, + { + "status": "pass", + "name": "Exercise 5 is correct", + "message": "", + "backtrace": [ + + ], + "points": [ + "r4", + "r4.6" + ] + }, + { + "status": "pass", + "name": "Exercise 6 is correct", + "message": "", + "backtrace": [ + + ], + "points": [ + "r4", + "r4.7" + ] + }, + { + "status": "pass", + "name": "Exercise 7 is correct", + "message": "", + "backtrace": [ + + ], + "points": [ + "r4", + "r4.8" + ] + }, + { + "status": "pass", + "name": "Exercise 8 is correct", + "message": "", + "backtrace": [ + + ], + "points": [ + "r4", + "r4.9" + ] + }, + { + "status": "pass", + "name": "Exercise 9 is correct", + "message": "", + "backtrace": [ + + ], + "points": [ + "r4", + "r4.10" + ] + }, + { + "status": "pass", + "name": "Exercise 10 is correct", + "message": "", + "backtrace": [ + + ], + "points": [ + "r4", + "r4.11" + ] + }, + { + "status": "pass", + "name": "Exercise 11 is correct", + "message": "", + "backtrace": [ + + ], + "points": [ + "r4", + "r4.12" + ] + }, + { + "status": "pass", + "name": "Exercise 12 is correct", + "message": "", + "backtrace": [ + + ], + "points": [ + "r4", + "r4.13" + ] + }, + { + "status": "pass", + "name": "Exercise 13 is correct", + "message": "", + "backtrace": [ + + ], + "points": [ + "r4", + "r4.14" + ] + } + ] +} +