Skip to content

Commit 4eccb2a

Browse files
committed
[TEST] system independent test
1 parent d27c5c1 commit 4eccb2a

File tree

3 files changed

+19
-15
lines changed

3 files changed

+19
-15
lines changed

src/main/java/net/seesharpsoft/intellij/plugins/csv/CsvStorageHelper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ public static Path getFilePath(Project project, String fileName) {
3434
if (project == null || fileName == null) {
3535
return null;
3636
}
37-
return Paths.get(project.getBasePath()).resolve(fileName.startsWith(File.separator) ? fileName.substring(1) : fileName);
37+
String formattedFileName = Paths.get(fileName).toString();
38+
return Paths.get(project.getBasePath()).resolve(formattedFileName.startsWith(File.separator) ? formattedFileName.substring(1) : formattedFileName);
3839
}
3940

4041
public static VirtualFile getFileInProject(Project project, String fileName) {

src/test/java/net/seesharpsoft/intellij/plugins/csv/CsvStorageHelperTest.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,34 @@ protected void setUp() throws Exception {
1212
super.setUp();
1313
Paths.get(this.getProject().getBasePath(), "csv_file_test.csv").toFile().createNewFile();
1414
Paths.get(this.getProject().getBasePath(), "test").toFile().mkdir();
15-
Paths.get(this.getProject().getBasePath(), "test/py_file_test.py").toFile().createNewFile();
15+
Paths.get(this.getProject().getBasePath(), "test", "py_file_test.py").toFile().createNewFile();
1616
}
1717

1818
@Override
1919
protected void tearDown() throws Exception {
20-
// TODO delete or not delete, that's the question
21-
// Paths.get(this.getProject().getBasePath(), "csv_file_test.csv").toFile().delete();
22-
// Paths.get(this.getProject().getBasePath(), "test/py_file_test.py").toFile().delete();
23-
// Paths.get(this.getProject().getBasePath(), "test").toFile().delete();
20+
Paths.get(this.getProject().getBasePath(), "csv_file_test.csv").toFile().delete();
21+
Paths.get(this.getProject().getBasePath(), "test", "py_file_test.py").toFile().delete();
22+
Paths.get(this.getProject().getBasePath(), "test").toFile().delete();
2423
super.tearDown();
2524
}
2625

2726
public void testGetFileInProjectExists() {
28-
VirtualFile vf = CsvStorageHelper.getFileInProject(this.getProject(), "csv_file_test.csv");
27+
VirtualFile vf = CsvStorageHelper.getFileInProject(this.getProject(), Paths.get("/csv_file_test.csv").toString());
2928
assertNotNull(vf);
3029
}
3130

3231
public void testGetFileInProjectDirectory() {
33-
VirtualFile vf = CsvStorageHelper.getFileInProject(this.getProject(), "\\test\\py_file_test.py");
32+
VirtualFile vf = CsvStorageHelper.getFileInProject(this.getProject(), Paths.get("/test/py_file_test.py").toString());
3433
assertNotNull(vf);
3534
}
3635

3736
public void testGetFileInProjectDoesNotExist() {
38-
VirtualFile vf = CsvStorageHelper.getFileInProject(this.getProject(), "do_not_exist_csv_file_test.csv");
37+
VirtualFile vf = CsvStorageHelper.getFileInProject(this.getProject(), Paths.get("/not_existing_csv_file_test.csv").toString());
3938
assertNull(vf);
4039
}
4140

4241
public void testGetFileInProjectDirectoryDoesNotExist() {
43-
VirtualFile vf = CsvStorageHelper.getFileInProject(this.getProject(), "\\test2\\py_file_test.py");
42+
VirtualFile vf = CsvStorageHelper.getFileInProject(this.getProject(), Paths.get("/test2/py_file_test.py").toString());
4443
assertNull(vf);
4544
}
4645
}

src/test/java/net/seesharpsoft/intellij/plugins/csv/components/CsvFileAttributesTest.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,15 @@ protected void setUp() throws Exception {
1818
super.setUp();
1919
Paths.get(this.getProject().getBasePath(), "csv_file_test.csv").toFile().createNewFile();
2020
Paths.get(this.getProject().getBasePath(), "test").toFile().mkdir();
21-
Paths.get(this.getProject().getBasePath(), "test/py_file_test.py").toFile().createNewFile();
21+
Paths.get(this.getProject().getBasePath(), "test", "py_file_test.py").toFile().createNewFile();
2222
}
2323

2424
@Override
2525
protected void tearDown() throws Exception {
26+
Paths.get(this.getProject().getBasePath(), "test", "py_file_test.py").toFile().delete();
27+
Paths.get(this.getProject().getBasePath(), "test").toFile().delete();
28+
Paths.get(this.getProject().getBasePath(), "csv_file_test.csv").toFile().delete();
29+
2630
CsvFileAttributes.getInstance(this.getProject()).reset();
2731
super.tearDown();
2832
}
@@ -51,16 +55,16 @@ public void testSaveFileEscapeCharacter() {
5155

5256
public void testCleanupAttributeMap() {
5357
CsvFileAttributes fileAttributes = CsvFileAttributes.getInstance(this.getProject());
54-
fileAttributes.attributeMap.put("\\csv_file_test.csv", new CsvFileAttributes.Attribute());
55-
fileAttributes.attributeMap.put("\\test\\py_file_test.py", new CsvFileAttributes.Attribute());
56-
fileAttributes.attributeMap.put("\\not_existing_csv_file_test.csv", new CsvFileAttributes.Attribute());
58+
fileAttributes.attributeMap.put(Paths.get("/csv_file_test.csv").toString(), new CsvFileAttributes.Attribute());
59+
fileAttributes.attributeMap.put(Paths.get("/test/py_file_test.py").toString(), new CsvFileAttributes.Attribute());
60+
fileAttributes.attributeMap.put(Paths.get("/not_existing_csv_file_test.csv").toString(), new CsvFileAttributes.Attribute());
5761

5862
assertEquals(3, fileAttributes.attributeMap.size());
5963

6064
fileAttributes.cleanupAttributeMap(this.getProject());
6165

6266
assertEquals(1, fileAttributes.attributeMap.size());
63-
assertNotNull(fileAttributes.attributeMap.get("\\csv_file_test.csv"));
67+
assertNotNull(fileAttributes.attributeMap.get(Paths.get("/csv_file_test.csv").toString()));
6468
}
6569

6670
}

0 commit comments

Comments
 (0)