Skip to content

Commit 6eb4ca3

Browse files
committed
Move javac test harness into scip-javac, drop tests/unit project
1 parent c14f70d commit 6eb4ca3

8 files changed

Lines changed: 16 additions & 14 deletions

File tree

build.sbt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,15 @@ lazy val javacPlugin = project
153153
"org.relaxng.**" -> "com.sourcegraph.shaded.relaxng.@1"
154154
)
155155
.inAll
156-
)
156+
),
157+
// JUnit 5 for the colocated in-process javac tests (test scope only, so it
158+
// stays out of the published scip-javac POM).
159+
libraryDependencies += "com.github.sbt.junit" % "jupiter-interface" %
160+
JupiterKeys.jupiterVersion.value % Test,
161+
Test / fork := true,
162+
// The tests drive javac in-process via ScipPlugin; on JDK 17+ this requires
163+
// the JDK-internal javac packages to be opened.
164+
Test / javaOptions ++= javacModuleOptions.map(_.stripPrefix("-J"))
157165
)
158166
.dependsOn(scipShared)
159167

@@ -551,11 +559,6 @@ def javacModuleOptions = List(
551559
"-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
552560
)
553561

554-
lazy val unit = project
555-
.in(file("tests/unit"))
556-
.settings(javaOnlySettings, javaJUnitTestSettings)
557-
.dependsOn(javacPlugin)
558-
559562
lazy val buildTools = project
560563
.in(file("tests/buildTools"))
561564
.enablePlugins(KotlinPlugin)

tests/unit/src/main/java/tests/CompileResult.java renamed to scip-javac/src/test/java/com/sourcegraph/scip_javac/CompileResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tests;
1+
package com.sourcegraph.scip_javac;
22

33
import java.util.Collections;
44
import java.util.List;

tests/unit/src/test/java/tests/JavacClassesDirectoryTest.java renamed to scip-javac/src/test/java/com/sourcegraph/scip_javac/JavacClassesDirectoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tests;
1+
package com.sourcegraph.scip_javac;
22

33
import static org.junit.jupiter.api.Assertions.assertTrue;
44

tests/unit/src/main/java/tests/SimpleClassFile.java renamed to scip-javac/src/test/java/com/sourcegraph/scip_javac/SimpleClassFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tests;
1+
package com.sourcegraph.scip_javac;
22

33
import java.io.ByteArrayOutputStream;
44
import java.io.IOException;

tests/unit/src/main/java/tests/SimpleFileManager.java renamed to scip-javac/src/test/java/com/sourcegraph/scip_javac/SimpleFileManager.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package tests;
1+
package com.sourcegraph.scip_javac;
22

3-
import com.sourcegraph.scip_javac.ScipPlugin;
43
import java.net.URI;
54
import java.nio.file.Path;
65
import java.util.ArrayList;

tests/unit/src/main/java/tests/SimpleSourceFile.java renamed to scip-javac/src/test/java/com/sourcegraph/scip_javac/SimpleSourceFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tests;
1+
package com.sourcegraph.scip_javac;
22

33
import java.nio.file.Path;
44
import javax.tools.SimpleJavaFileObject;

tests/unit/src/main/java/tests/TestCompiler.java renamed to scip-javac/src/test/java/com/sourcegraph/scip_javac/TestCompiler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tests;
1+
package com.sourcegraph.scip_javac;
22

33
import java.io.IOException;
44
import java.io.StringWriter;

tests/unit/src/main/java/tests/VirtualFile.java renamed to scip-javac/src/test/java/com/sourcegraph/scip_javac/VirtualFile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package tests;
1+
package com.sourcegraph.scip_javac;
22

33
/**
44
* Minimal in-memory source file (relative path + text), replacing the former use of scalameta's

0 commit comments

Comments
 (0)