From ae8820254f7dcae83501bd5a8dcd696241fb4746 Mon Sep 17 00:00:00 2001
From: Daniel Crazzolara <crazzolaradaniel@gmail.com>
Date: Wed, 6 Apr 2022 15:10:24 +0200
Subject: [PATCH] Fixed previous tests
---
.../gitsearch/service/ExerciseServiceIT.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/test/java/at/ac/uibk/gitsearch/service/ExerciseServiceIT.java b/src/test/java/at/ac/uibk/gitsearch/service/ExerciseServiceIT.java
index 395af0a2c..9dea881dd 100644
--- a/src/test/java/at/ac/uibk/gitsearch/service/ExerciseServiceIT.java
+++ b/src/test/java/at/ac/uibk/gitsearch/service/ExerciseServiceIT.java
@@ -12,6 +12,7 @@ import java.io.FileWriter;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.FileUtils;
@@ -58,8 +59,8 @@ public class ExerciseServiceIT {
@After
public void cleanUp() throws IOException {
- if (new File("tmp-import/", token).exists()) {
- FileUtils.deleteDirectory(new File("tmp-import/" + token));
+ if (new File(System.getProperty("java.io.tmpdir"), token).exists()) {
+ FileUtils.deleteDirectory(new File(System.getProperty("java.io.tmpdir") + token));
}
}
@@ -67,29 +68,29 @@ public class ExerciseServiceIT {
public void testImportExercise() throws Exception {
int gitlabGroup = 1;
- File metadata = new File("tmp-import/" + token, "Exercise-Details-something.json");
+ File metadata = Paths.get(System.getProperty("java.io.tmpdir"), token, "Exercise-Details-something.json").toFile();
metadata.getParentFile().mkdirs();
metadata.createNewFile();
Group group = new Group();
- Repository jgitRepo = FileRepositoryBuilder.create(new File("tmp-import/" + token, ".git"));
+ Repository jgitRepo = FileRepositoryBuilder.create(Paths.get(System.getProperty("java.io.tmpdir"), token, ".git").toFile());
// mocks
doNothing().when(gitlabService).setJGitDefaultAuth();
doReturn(group).when(gitlabService).getGroupById(gitlabGroup);
doReturn("repoUrl").when(gitlabService).createRepository(group, artemisExerciseInfo.getTitle());
doReturn(jgitRepo).when(gitlabService).checkoutRepo("repoUrl");
- doNothing().when(gitlabService).commitAndPushToRepo(jgitRepo, new File("tmp-import", token));
+ doNothing().when(gitlabService).commitAndPushToRepo(jgitRepo, new File(System.getProperty("java.io.tmpdir"), token));
exerciseService.importExercise(artemisExerciseInfo, token, gitlabGroup);
// asserts
verify(gitlabService, times(1)).createRepository(group, artemisExerciseInfo.getTitle());
- verify(gitlabService, times(1)).commitAndPushToRepo(jgitRepo, new File("tmp-import", token));
+ verify(gitlabService, times(1)).commitAndPushToRepo(jgitRepo, new File(System.getProperty("java.io.tmpdir"), token));
}
@Test
public void testApplyExerciseInfoChanges() throws Exception {
- File metadata = new File("tmp-import/" + token, "metadata.yaml");
+ File metadata = Paths.get(System.getProperty("java.io.tmpdir"), token, "metadata.yaml").toFile();
metadata.getParentFile().mkdirs();
metadata.createNewFile();
@@ -103,7 +104,7 @@ public class ExerciseServiceIT {
@Test
public void testGetArtemisExerciseInfo() throws Exception {
- File metadata = new File("tmp-import/" + token, "Exercise-Details-something.json");
+ File metadata = Paths.get(System.getProperty("java.io.tmpdir"), token, "Exercise-Details-something.json").toFile();
metadata.getParentFile().mkdirs();
metadata.createNewFile();
FileWriter writer = new FileWriter(metadata, StandardCharsets.UTF_8);
@@ -145,7 +146,7 @@ public class ExerciseServiceIT {
@Test
public void testGetArtemisExerciseInfo_onlyMetadata() throws Exception {
- File metadata = new File("tmp-import/" + token, "Exercise-Details-something.json");
+ File metadata = Paths.get(System.getProperty("java.io.tmpdir"), token, "Exercise-Details-something.json").toFile();
metadata.getParentFile().mkdirs();
metadata.createNewFile();
FileWriter writer = new FileWriter(metadata, StandardCharsets.UTF_8);
--
GitLab