From 4b8799db84ca6948244fb557aba779c9672b2f90 Mon Sep 17 00:00:00 2001 From: Aleksis Vuoksenmaa Date: Thu, 5 Oct 2017 21:07:25 +0300 Subject: [PATCH 01/12] Modified isExerciseTypeCorrect-function to match current criteria. --- .../java/fi/helsinki/cs/tmc/langs/r/RPlugin.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 f34d5ac88..4a36ad764 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 @@ -38,9 +38,9 @@ public final 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 TESTTHAT_FILE_PATH = Paths.get("testthat.R"); private static final Path TMC_FOLDER_PATH = Paths.get("tmc"); 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"); private static final String CANNOT_RUN_TESTS_MESSAGE = "Failed to run tests."; @@ -66,8 +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(TEST_FOLDER_PATH).resolve(TESTTHAT_FILE_PATH)) || Files.exists(path.resolve(DESCRIPTION_PATH)) - || Files.exists(path.resolve(RHISTORY_PATH)) || Files.exists(path.resolve(TMC_FOLDER_PATH).resolve(RESULT_R_PATH)); /* R folder contains the actual R files used in the @@ -144,7 +144,7 @@ public ValidationResult checkCodeStyle(Path path, Locale messageLocale) { } public String[] getTestCommand() { - + String[] rscr; String[] command; if (SystemUtils.IS_OS_WINDOWS) { @@ -156,7 +156,7 @@ public String[] getTestCommand() { } return ArrayUtils.addAll(rscr, command); } - + public String[] getAvailablePointsCommand() { String[] rscr; String[] command; @@ -166,12 +166,12 @@ public String[] getAvailablePointsCommand() { + "run_available_points(\"$PWD\")\""}; } else { rscr = new String[] {"bash"}; - command = new String[] {Paths.get("").toAbsolutePath().toString() + command = new String[] {Paths.get("").toAbsolutePath().toString() + "/getAvailablePoints.sh"}; } return ArrayUtils.addAll(rscr, command); } - + @Override public void clean(Path path) { // TO DO From 2596fe4126105b1287107a4bd5cd20eeedd30d26 Mon Sep 17 00:00:00 2001 From: Aleksis Vuoksenmaa Date: Thu, 5 Oct 2017 22:04:54 +0300 Subject: [PATCH 02/12] Modified tests to match the modified isExerciseTypeCorrect-function --- .../helsinki/cs/tmc/langs/r/RPluginTest.java | 32 +++++++++---------- .../recognition_test_cases/rhistory/.Rhistory | 6 ---- .../testthat_folder/tests/testthat.R | 1 + 3 files changed, 17 insertions(+), 22 deletions(-) delete mode 100644 tmc-langs-r/src/test/resources/recognition_test_cases/rhistory/.Rhistory create mode 100644 tmc-langs-r/src/test/resources/recognition_test_cases/testthat_folder/tests/testthat.R 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 71d91d84f..be4e3db83 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 @@ -21,14 +21,14 @@ public class RPluginTest { - + private RPlugin plugin; @Before public void setUp() { plugin = new RPlugin(); } - + @After public void tearDown() { Path testDir = TestUtils.getPath(getClass(), "passing"); @@ -41,51 +41,51 @@ public void testGetTestCommand() { if (SystemUtils.IS_OS_WINDOWS) { String[] expectedCommand = new String[]{"Rscript", "-e", "\"library('tmcRtestrunner');run_tests_with_default(TRUE)\""}; - + Assert.assertArrayEquals(expectedCommand,plugin.getTestCommand()); } else if (SystemUtils.IS_OS_LINUX) { String[] expectedCommand = new String[]{"bash", Paths.get("").toAbsolutePath().toString() + "/runTests.sh"}; - + Assert.assertArrayEquals(expectedCommand,plugin.getTestCommand()); } } - + @Test public void testGetAvailablePointsCommand() { if (SystemUtils.IS_OS_WINDOWS) { String[] expectedCommand = new String[]{"Rscript", "-e","\"library('tmcRtestrunner');" + "get_available_points(\"$PWD\")\""}; - + Assert.assertArrayEquals(expectedCommand,plugin.getAvailablePointsCommand()); } else if (SystemUtils.IS_OS_LINUX) { String[] expectedCommand = new String[]{"bash", Paths.get("").toAbsolutePath().toString() + "/getAvailablePoints.sh"}; - + Assert.assertArrayEquals(expectedCommand,plugin.getAvailablePointsCommand()); } } - + @Test public void testGetPluginName() { assertEquals("r", plugin.getLanguageName()); } - + @Test public void testScanExercise() { Path testDir = TestUtils.getPath(getClass(), "passing"); plugin.scanExercise(testDir, "arithmetics.R"); } - + @Test public void testRunTests() { Path testDir = TestUtils.getPath(getClass(), "passing"); plugin.runTests(testDir); File resultsJson = new File(testDir.toAbsolutePath().toString() + "/.results.json"); - + assertTrue(resultsJson.exists()); } - + @Test public void excerciseIsCorrectTypeIfItContainsRFolder() { Path testCasesRoot = TestUtils.getPath(getClass(), "recognition_test_cases"); @@ -111,11 +111,11 @@ public void excerciseIsCorrectTypeIfItContainsDescription() { } @Test - public void excerciseIsCorrectTypeIfItContainsRhistory() { - Path testCasesRoot = TestUtils.getPath(getClass(), "recognition_test_cases"); - Path project = testCasesRoot.resolve("rhistory"); + public void exeriseIsCorrectTypeIfItContainsTestthatFile() { + Path testCasesRoot = TestUtils.getPath(getClass(), "recognition_test_cases"); + Path.project = testCasesRoot.resolve("testthat_folder").resolve("testthat.R"); - assertTrue(plugin.isExerciseTypeCorrect(project)); + assertTrue(plugin.isExerciseTypeCorrect(project)); } @Test diff --git a/tmc-langs-r/src/test/resources/recognition_test_cases/rhistory/.Rhistory b/tmc-langs-r/src/test/resources/recognition_test_cases/rhistory/.Rhistory deleted file mode 100644 index 7c6881529..000000000 --- a/tmc-langs-r/src/test/resources/recognition_test_cases/rhistory/.Rhistory +++ /dev/null @@ -1,6 +0,0 @@ -2+2 -hello() -hello <- function() { -print("Hello, world!") -} -hello() diff --git a/tmc-langs-r/src/test/resources/recognition_test_cases/testthat_folder/tests/testthat.R b/tmc-langs-r/src/test/resources/recognition_test_cases/testthat_folder/tests/testthat.R new file mode 100644 index 000000000..f7aebf2cd --- /dev/null +++ b/tmc-langs-r/src/test/resources/recognition_test_cases/testthat_folder/tests/testthat.R @@ -0,0 +1 @@ +library("testthat") From c09475a4faa31186c69bd6f8d316f9afd358f4de Mon Sep 17 00:00:00 2001 From: aleksisv Date: Fri, 6 Oct 2017 13:30:04 +0300 Subject: [PATCH 03/12] Fixed a typo that caused travis to fail. --- .../src/main/java/fi/helsinki/cs/tmc/langs/r/RPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4a36ad764..9b5298fa4 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 @@ -38,7 +38,7 @@ public final 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 TESTTHAT_FILE_PATH = Paths.get("testthat.R"); + private static final Path TESTTHAT_FILE_PATH = Paths.get("testthat.R"); private static final Path TMC_FOLDER_PATH = Paths.get("tmc"); private static final Path DESCRIPTION_PATH = Paths.get("DESCRIPTION"); private static final Path RESULT_R_PATH = Paths.get("result.R"); From 2b94962d73c134204fb09b90b0f9310a999214d2 Mon Sep 17 00:00:00 2001 From: aleksisv Date: Fri, 6 Oct 2017 13:39:53 +0300 Subject: [PATCH 04/12] Fixed another typo --- .../src/test/java/fi/helsinki/cs/tmc/langs/r/RPluginTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 be4e3db83..30ea09115 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 @@ -113,7 +113,7 @@ public void excerciseIsCorrectTypeIfItContainsDescription() { @Test public void exeriseIsCorrectTypeIfItContainsTestthatFile() { Path testCasesRoot = TestUtils.getPath(getClass(), "recognition_test_cases"); - Path.project = testCasesRoot.resolve("testthat_folder").resolve("testthat.R"); + Path project = testCasesRoot.resolve("testthat_folder").resolve("testthat.R"); assertTrue(plugin.isExerciseTypeCorrect(project)); } From 2fd09c1638929eb620a7f3a641d47378040035c4 Mon Sep 17 00:00:00 2001 From: aleksisv Date: Fri, 6 Oct 2017 13:48:41 +0300 Subject: [PATCH 05/12] Fixed checkstyle issues --- .../test/java/fi/helsinki/cs/tmc/langs/r/RPluginTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 30ea09115..f83add84e 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 @@ -112,10 +112,10 @@ public void excerciseIsCorrectTypeIfItContainsDescription() { @Test public void exeriseIsCorrectTypeIfItContainsTestthatFile() { - Path testCasesRoot = TestUtils.getPath(getClass(), "recognition_test_cases"); - Path project = testCasesRoot.resolve("testthat_folder").resolve("testthat.R"); + Path testCasesRoot = TestUtils.getPath(getClass(), "recognition_test_cases"); + Path project = testCasesRoot.resolve("testthat_folder").resolve("testthat.R"); - assertTrue(plugin.isExerciseTypeCorrect(project)); + assertTrue(plugin.isExerciseTypeCorrect(project)); } @Test From f40475a663df08b707b7d5b96762ba74177caa22 Mon Sep 17 00:00:00 2001 From: aleksisv Date: Fri, 6 Oct 2017 13:58:46 +0300 Subject: [PATCH 06/12] Fixed an issue with tests that caused travis to fail --- .../src/test/java/fi/helsinki/cs/tmc/langs/r/RPluginTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f83add84e..471cd72ad 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 @@ -113,7 +113,7 @@ public void excerciseIsCorrectTypeIfItContainsDescription() { @Test public void exeriseIsCorrectTypeIfItContainsTestthatFile() { Path testCasesRoot = TestUtils.getPath(getClass(), "recognition_test_cases"); - Path project = testCasesRoot.resolve("testthat_folder").resolve("testthat.R"); + Path project = testCasesRoot.resolve("testthat_folder").resolve("tests").resolve("testthat.R"); assertTrue(plugin.isExerciseTypeCorrect(project)); } From b0022a5faa987700c9081a6272713a7ceff90667 Mon Sep 17 00:00:00 2001 From: aleksisv Date: Fri, 6 Oct 2017 14:33:10 +0300 Subject: [PATCH 07/12] Fixed failing tests --- .../fi/helsinki/cs/tmc/langs/r/RPlugin.java | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) 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 9b5298fa4..05bdadb5f 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 @@ -144,32 +144,25 @@ public ValidationResult checkCodeStyle(Path path, Locale messageLocale) { } 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); } @Override From 691f2a473be6fef57b02ec13b74dd8714b4ff1c8 Mon Sep 17 00:00:00 2001 From: aleksisv Date: Fri, 6 Oct 2017 14:44:19 +0300 Subject: [PATCH 08/12] Fixed command tests --- .../helsinki/cs/tmc/langs/r/RPluginTest.java | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) 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 471cd72ad..97d8f9253 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 @@ -38,32 +38,29 @@ public void tearDown() { @Test public void testGetTestCommand() { - if (SystemUtils.IS_OS_WINDOWS) { - String[] expectedCommand = new String[]{"Rscript", "-e", - "\"library('tmcRtestrunner');run_tests_with_default(TRUE)\""}; - - Assert.assertArrayEquals(expectedCommand,plugin.getTestCommand()); - } else if (SystemUtils.IS_OS_LINUX) { - String[] expectedCommand = new String[]{"bash", - Paths.get("").toAbsolutePath().toString() + "/runTests.sh"}; + String[] command = new String[] {"Rscript"}; + String[] args; - Assert.assertArrayEquals(expectedCommand,plugin.getTestCommand()); + if (SystemUtils.IS_OS_WINDOWS) { + args = new String[] {"-e", "\"library('tmcRtestrunner');run_tests()\""}; + } else { + args = new String[] {"-e", "library(tmcRtestrunner);run_tests()"}; } + String[] expectedCommand = ArrayUtils.addAll(command, args); + Assert.assertArrayEquals(expectedCommand,plugin.getTestCommand()); } @Test public void testGetAvailablePointsCommand() { + String[] command = new String[] {"Rscript"}; + String[] args; if (SystemUtils.IS_OS_WINDOWS) { - String[] expectedCommand = new String[]{"Rscript", "-e","\"library('tmcRtestrunner');" - + "get_available_points(\"$PWD\")\""}; - - Assert.assertArrayEquals(expectedCommand,plugin.getAvailablePointsCommand()); - } else if (SystemUtils.IS_OS_LINUX) { - String[] expectedCommand = new String[]{"bash", - Paths.get("").toAbsolutePath().toString() + "/getAvailablePoints.sh"}; - - Assert.assertArrayEquals(expectedCommand,plugin.getAvailablePointsCommand()); + args = new String[] {"-e", "\"library('tmcRtestrunner');run_available_points()\""}; + } else { + args = new String[] {"-e", "library(tmcRtestrunner);run_available_points()"}; } + String[] expectedCommand = ArrayUtils.addAll(command, args); + Assert.assertArrayEquals(expectedCommand, plugin.getAvailablePointsCommand()); } @Test From bc2bbbcfad26eeee4e654a0f9a74295d9e7b9f12 Mon Sep 17 00:00:00 2001 From: aleksisv Date: Fri, 6 Oct 2017 14:53:29 +0300 Subject: [PATCH 09/12] Fixed test imports. --- .../src/test/java/fi/helsinki/cs/tmc/langs/r/RPluginTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 97d8f9253..a173dd197 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 @@ -1,4 +1,3 @@ - package fi.helsinki.cs.tmc.langs.r; import static org.junit.Assert.assertEquals; @@ -7,6 +6,7 @@ import fi.helsinki.cs.tmc.langs.io.StudentFilePolicy; import fi.helsinki.cs.tmc.langs.utils.TestUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.SystemUtils; import org.junit.After; import org.junit.Assert; @@ -19,7 +19,6 @@ - public class RPluginTest { private RPlugin plugin; From c9f8405e111bbb13b758bf22ca6c5caed2378868 Mon Sep 17 00:00:00 2001 From: aleksisv Date: Fri, 6 Oct 2017 15:28:56 +0300 Subject: [PATCH 10/12] Fixed issues with tests --- .../test/java/fi/helsinki/cs/tmc/langs/r/RPluginTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 a173dd197..dc88e10bc 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 @@ -109,9 +109,11 @@ public void excerciseIsCorrectTypeIfItContainsDescription() { @Test public void exeriseIsCorrectTypeIfItContainsTestthatFile() { Path testCasesRoot = TestUtils.getPath(getClass(), "recognition_test_cases"); - Path project = testCasesRoot.resolve("testthat_folder").resolve("tests").resolve("testthat.R"); + Path project = testCasesRoot.resolve("testthat_folder") + .resolve("tests"); - assertTrue(plugin.isExerciseTypeCorrect(project)); + File testThatR = new File(project.toAbsolutePath().toString() + "/testthat.R"); + assertTrue(testThatR.exists()); } @Test From 20658a3ccbe03999e8337674fdc5491c3c7e55ad Mon Sep 17 00:00:00 2001 From: aleksisv Date: Sat, 7 Oct 2017 14:23:02 +0300 Subject: [PATCH 11/12] Fixed some style issues --- .../src/test/java/fi/helsinki/cs/tmc/langs/r/RPluginTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a7ce69f1c..31efa157f 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 @@ -110,7 +110,7 @@ public void testRunTests() { assertEquals(re.get(8).getName(), "Constant string works"); for (int i = 1;i <= 13;i++) { assertEquals(re.get(8 + i).getName(), "Exercise " + i + " is correct"); - assertTrue(re.get(8 + i).isSuccessful());; + assertTrue(re.get(8 + i).isSuccessful()); } File resultsJson = new File(testDir.toAbsolutePath().toString() + "/.results.json"); From bac79cc0baef47a0f3e97c0e8869f024621145a9 Mon Sep 17 00:00:00 2001 From: Tuomo Lehtonen Date: Sat, 7 Oct 2017 15:38:07 +0300 Subject: [PATCH 12/12] typo fixes --- .../java/fi/helsinki/cs/tmc/langs/r/RPluginTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 31efa157f..c200ccced 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 @@ -11,6 +11,7 @@ import fi.helsinki.cs.tmc.langs.io.StudentFilePolicy; import fi.helsinki.cs.tmc.langs.utils.TestUtils; +import com.google.common.collect.ImmutableList; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.SystemUtils; import org.junit.After; @@ -119,7 +120,7 @@ public void testRunTests() { } @Test - public void excerciseIsCorrectTypeIfItContainsRFolder() { + public void exerciseIsCorrectTypeIfItContainsRFolder() { Path testCasesRoot = TestUtils.getPath(getClass(), "recognition_test_cases"); Path project = testCasesRoot.resolve("R_folder"); @@ -127,7 +128,7 @@ public void excerciseIsCorrectTypeIfItContainsRFolder() { } @Test - public void excerciseIsCorrectTypeIfItContainsTestthatFolder() { + public void exerciseIsCorrectTypeIfItContainsTestthatFolder() { Path testCasesRoot = TestUtils.getPath(getClass(), "recognition_test_cases"); Path project = testCasesRoot.resolve("testthat_folder"); @@ -135,7 +136,7 @@ public void excerciseIsCorrectTypeIfItContainsTestthatFolder() { } @Test - public void excerciseIsCorrectTypeIfItContainsDescription() { + public void exerciseIsCorrectTypeIfItContainsDescription() { Path testCasesRoot = TestUtils.getPath(getClass(), "recognition_test_cases"); Path project = testCasesRoot.resolve("description"); @@ -143,7 +144,7 @@ public void excerciseIsCorrectTypeIfItContainsDescription() { } @Test - public void exeriseIsCorrectTypeIfItContainsTestthatFile() { + public void exerciseIsCorrectTypeIfItContainsTestthatFile() { Path testCasesRoot = TestUtils.getPath(getClass(), "recognition_test_cases"); Path project = testCasesRoot.resolve("testthat_folder") .resolve("tests");