Skip to content

Commit ceaa639

Browse files
cardillancardillan
committed
Fix unit tests
1 parent 0627ecc commit ceaa639

2 files changed

Lines changed: 42 additions & 28 deletions

File tree

‎toolapp/src/test/java/info/teksol/mindcode/cmdline/CompileMindcodeActionTest.java‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
import org.jspecify.annotations.NullMarked;
99
import org.junit.jupiter.api.Nested;
1010
import org.junit.jupiter.api.Test;
11+
import org.junit.jupiter.api.io.TempDir;
1112

1213
import java.io.File;
14+
import java.nio.file.Path;
1315
import java.util.List;
1416
import java.util.Set;
1517
import java.util.stream.Collectors;
@@ -109,38 +111,43 @@ public void outputArgumentFile() throws ArgumentParserException {
109111
class OutputDirectoryArgumentsTest {
110112

111113
@Test
112-
public void outputArgumentDefaultDefault() throws ArgumentParserException {
113-
Namespace arguments = parseCommandLine("--output-directory C:\\temp -");
114+
public void outputArgumentDefaultDefault(@TempDir Path tempDir) throws ArgumentParserException {
115+
String tempDirPath = tempDir.toAbsolutePath().toString();
116+
Namespace arguments = parseCommandLine("--output-directory " + tempDirPath + " -");
114117
File output = resolveOutputFile(arguments, ".mlog");
115118
assertEquals(new File("-"), output);
116119
}
117120

118121
@Test
119-
public void outputArgumentDefaultFile() throws ArgumentParserException {
120-
Namespace arguments = parseCommandLine("--output-directory C:\\temp input.mnd");
122+
public void outputArgumentDefaultFile(@TempDir Path tempDir) throws ArgumentParserException {
123+
String tempDirPath = tempDir.toAbsolutePath().toString();
124+
Namespace arguments = parseCommandLine("--output-directory " + tempDirPath + " input.mnd");
121125
File output = resolveOutputFile(arguments, ".mlog");
122-
assertEquals(new File("C:\\temp\\input.mlog"), output);
126+
assertEquals(new File(tempDirPath, "input.mlog"), output);
123127
}
124128

125129
@Test
126-
public void outputArgumentFile() throws ArgumentParserException {
127-
Namespace arguments = parseCommandLine("--output-directory C:\\temp input.mnd -o output.mlog");
130+
public void outputArgumentFile(@TempDir Path tempDir) throws ArgumentParserException {
131+
String tempDirPath = tempDir.toAbsolutePath().toString();
132+
Namespace arguments = parseCommandLine("--output-directory " + tempDirPath + " input.mnd -o output.mlog");
128133
File output = resolveOutputFile(arguments, ".mlog");
129-
assertEquals(new File("C:\\temp\\output.mlog"), output);
134+
assertEquals(new File(tempDirPath, "output.mlog"), output);
130135
}
131136

132137
@Test
133-
public void logArgumentDefault() throws ArgumentParserException {
134-
Namespace arguments = parseCommandLine("--output-directory C:\\temp input.mnd -o output.mlog -l");
138+
public void logArgumentDefault(@TempDir Path tempDir) throws ArgumentParserException {
139+
String tempDirPath = tempDir.toAbsolutePath().toString();
140+
Namespace arguments = parseCommandLine("--output-directory " + tempDirPath + " input.mnd -o output.mlog -l");
135141
File output = resolveLogFile(arguments, ".log");
136-
assertEquals(new File("C:\\temp\\input.log"), output);
142+
assertEquals(new File(tempDirPath, "input.log"), output);
137143
}
138144

139145
@Test
140-
public void logArgumentFile() throws ArgumentParserException {
141-
Namespace arguments = parseCommandLine("--output-directory C:\\temp input.mnd -o output.mlog -l log.log");
146+
public void logArgumentFile(@TempDir Path tempDir) throws ArgumentParserException {
147+
String tempDirPath = tempDir.toAbsolutePath().toString();
148+
Namespace arguments = parseCommandLine("--output-directory " + tempDirPath + " input.mnd -o output.mlog -l log.log");
142149
File output = resolveLogFile(arguments, ".log");
143-
assertEquals(new File("C:\\temp\\log.log"), output);
150+
assertEquals(new File(tempDirPath, "log.log"), output);
144151
}
145152
}
146153

‎toolapp/src/test/java/info/teksol/mindcode/cmdline/CompileSchemacodeActionTest.java‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
import org.jspecify.annotations.NullMarked;
88
import org.junit.jupiter.api.Nested;
99
import org.junit.jupiter.api.Test;
10+
import org.junit.jupiter.api.io.TempDir;
1011

1112
import java.io.File;
13+
import java.nio.file.Path;
1214
import java.util.List;
1315

1416
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -82,38 +84,43 @@ public void logArgumentFile() throws ArgumentParserException {
8284
class OutputDirectoryArgumentsTest {
8385

8486
@Test
85-
public void outputArgumentDefaultDefault() throws ArgumentParserException {
86-
Namespace arguments = parseCommandLine("--output-directory C:\\temp -");
87+
public void outputArgumentDefaultDefault(@TempDir Path tempDir) throws ArgumentParserException {
88+
String tempDirPath = tempDir.toAbsolutePath().toString();
89+
Namespace arguments = parseCommandLine("--output-directory " + tempDirPath + " -");
8790
File output = resolveOutputFile(arguments, ".msch");
8891
assertEquals(new File("-"), output);
8992
}
9093

9194
@Test
92-
public void outputArgumentDefaultFile() throws ArgumentParserException {
93-
Namespace arguments = parseCommandLine("--output-directory C:\\temp input.sdf");
95+
public void outputArgumentDefaultFile(@TempDir Path tempDir) throws ArgumentParserException {
96+
String tempDirPath = tempDir.toAbsolutePath().toString();
97+
Namespace arguments = parseCommandLine("--output-directory " + tempDirPath + " input.sdf");
9498
File output = resolveOutputFile(arguments, ".msch");
95-
assertEquals(new File("C:\\temp\\input.msch"), output);
99+
assertEquals(new File(tempDirPath, "input.msch"), output);
96100
}
97101

98102
@Test
99-
public void outputArgumentFile() throws ArgumentParserException {
100-
Namespace arguments = parseCommandLine("--output-directory C:\\temp input.sdf -o output.msch");
103+
public void outputArgumentFile(@TempDir Path tempDir) throws ArgumentParserException {
104+
String tempDirPath = tempDir.toAbsolutePath().toString();
105+
Namespace arguments = parseCommandLine("--output-directory " + tempDirPath + " input.sdf -o output.msch");
101106
File output = resolveOutputFile(arguments, ".msch");
102-
assertEquals(new File("C:\\temp\\output.msch"), output);
107+
assertEquals(new File(tempDirPath, "output.msch"), output);
103108
}
104109

105110
@Test
106-
public void logArgumentDefault() throws ArgumentParserException {
107-
Namespace arguments = parseCommandLine("--output-directory C:\\temp input.sdf -o output.msch -l");
111+
public void logArgumentDefault(@TempDir Path tempDir) throws ArgumentParserException {
112+
String tempDirPath = tempDir.toAbsolutePath().toString();
113+
Namespace arguments = parseCommandLine("--output-directory " + tempDirPath + " input.sdf -o output.msch -l");
108114
File output = resolveLogFile(arguments, ".log");
109-
assertEquals(new File("C:\\temp\\input.log"), output);
115+
assertEquals(new File(tempDirPath, "input.log"), output);
110116
}
111117

112118
@Test
113-
public void logArgumentFile() throws ArgumentParserException {
114-
Namespace arguments = parseCommandLine("--output-directory C:\\temp input.sdf -o output.msch -l log.log");
119+
public void logArgumentFile(@TempDir Path tempDir) throws ArgumentParserException {
120+
String tempDirPath = tempDir.toAbsolutePath().toString();
121+
Namespace arguments = parseCommandLine("--output-directory " + tempDirPath + " input.sdf -o output.msch -l log.log");
115122
File output = resolveLogFile(arguments, ".log");
116-
assertEquals(new File("C:\\temp\\log.log"), output);
123+
assertEquals(new File(tempDirPath, "log.log"), output);
117124
}
118125
}
119126

0 commit comments

Comments
 (0)