Skip to content

Commit 63854e3

Browse files
committed
Use the TestPaths helper to lookup files.
1 parent a773532 commit 63854e3

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

javascript/extractor/test/com/semmle/js/extractor/test/ASTMatchingTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.semmle.js.ast.AST2JSON;
1313
import com.semmle.js.ast.Program;
1414
import com.semmle.util.io.WholeIO;
15+
import com.semmle.util.tests.TestPaths;
1516
import java.io.File;
1617
import java.util.Iterator;
1718
import java.util.Map.Entry;
@@ -54,7 +55,7 @@ protected void assertMatch(String path, JsonElement expected, JsonElement actual
5455
}
5556
}
5657

57-
private static final File BABYLON_BASE = new File("parser-tests/babylon").getAbsoluteFile();
58+
private static final File BABYLON_BASE = TestPaths.get("parser-tests/babylon").toAbsolutePath().toFile();
5859

5960
protected void babylonTest(String dir) {
6061
babylonTest(dir, new Options().esnext(true));

javascript/extractor/test/com/semmle/js/extractor/test/JSXTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.semmle.js.ast.Program;
1111
import com.semmle.util.files.FileUtil;
1212
import com.semmle.util.io.WholeIO;
13+
import com.semmle.util.tests.TestPaths;
1314
import java.io.File;
1415
import java.util.ArrayList;
1516
import java.util.List;
@@ -25,7 +26,7 @@
2526
*/
2627
@RunWith(Parameterized.class)
2728
public class JSXTests extends ASTMatchingTests {
28-
private static final File BASE = new File("parser-tests/jcorn-jsx").getAbsoluteFile();
29+
private static final File BASE = TestPaths.get("parser-tests/jcorn-jsx").toAbsolutePath().toFile();
2930

3031
@Parameters(name = "{0}")
3132
public static Iterable<Object[]> tests() {

javascript/extractor/test/com/semmle/js/extractor/test/RobustnessTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.semmle.jcorn.Options;
44
import com.semmle.jcorn.Parser;
55
import com.semmle.util.io.WholeIO;
6+
import com.semmle.util.tests.TestPaths;
67
import java.io.File;
78
import java.nio.charset.StandardCharsets;
89
import org.junit.Test;
@@ -11,7 +12,7 @@ public class RobustnessTests {
1112

1213
@Test
1314
public void letLookheadTest() {
14-
File test = new File("parser-tests/robustness/letLookahead.js");
15+
File test = TestPaths.get("parser-tests/robustness/letLookahead.js").toFile();
1516
String src = new WholeIO(StandardCharsets.UTF_8.name()).strictread(test);
1617
new Parser(new Options(), src, 0).parse();
1718
}

javascript/extractor/test/com/semmle/js/extractor/test/TrapTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.semmle.util.io.WholeIO;
1414
import com.semmle.util.process.Env;
1515
import com.semmle.util.srcarchive.DummySourceArchive;
16+
import com.semmle.util.tests.TestPaths;
1617
import com.semmle.util.trap.ITrapWriterFactory;
1718
import com.semmle.util.trap.TrapWriter;
1819
import com.semmle.util.trap.pathtransformers.ProjectLayoutTransformer;
@@ -35,7 +36,7 @@
3536

3637
@RunWith(Parameterized.class)
3738
public class TrapTests {
38-
private static final File BASE = new File("tests").getAbsoluteFile();
39+
private static final File BASE = TestPaths.get("tests").toAbsolutePath().toFile();
3940

4041
@Parameters(name = "{0}:{1}")
4142
public static Iterable<Object[]> tests() {

0 commit comments

Comments
 (0)