Skip to content

Added method for deleting .results.json before running #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 11, 2017
Merged

Added method for deleting .results.json before running #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions tmc-langs-r/src/main/java/fi/helsinki/cs/tmc/langs/r/RPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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
*/
Expand Down
16 changes: 15 additions & 1 deletion tmc-langs-r/src/test/java/fi/helsinki/cs/tmc/langs/r/RPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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")));
}
}