From 3f24be75c06e08b837fae0e1b47760cbb9b37b3d Mon Sep 17 00:00:00 2001 From: jupblb Date: Tue, 23 Jun 2026 21:26:45 +0200 Subject: [PATCH] Move build tool tests to scip-java --- CONTRIBUTING.md | 7 +++- build.sbt | 42 +++++++------------ flake.nix | 11 ++--- .../test/kotlin/tests/AutoBuildToolTest.kt | 0 .../src/test/kotlin/tests/BuildToolHarness.kt | 0 .../test/kotlin/tests/GradleBuildToolTest.kt | 0 .../test/kotlin/tests/MavenBuildToolTest.kt | 0 .../test/kotlin/tests/MissingBuildToolTest.kt | 0 .../test/kotlin/tests/ScipBuildToolTest.kt | 0 .../gradle/annotation-path/build.gradle | 0 .../src/main/java/WorkflowOptions.java | 0 .../fixtures/gradle/basic/build.gradle | 0 .../gradle/basic/src/main/java/App.java | 0 .../gradle/basic/src/test/java/AppTest.java | 0 .../gradle/build-command/build.gradle | 0 .../build-command/src/main/java/Example.java | 0 .../src/test/java/ExampleSuite.java | 0 .../gradle/build-with-Werror/build.gradle | 0 .../src/main/java/main/bla/ExampleClass.java | 0 .../fixtures/gradle/explicit/build.gradle | 0 .../fixtures/gradle/explicit/pom.xml | 0 .../explicit/src/main/java/Example.java | 0 .../explicit/src/test/java/ExampleSuite.java | 0 .../implementation-deps/app/build.gradle | 0 .../app/src/main/java/foo/Methods.java | 0 .../implementation-deps/settings.gradle | 0 .../gradle/kotlin-jvm-toolchains/build.gradle | 0 .../src/main/kotlin/foo/Example.kt | 0 .../fixtures/gradle/kotlin2/build.gradle | 0 .../kotlin2/src/main/java/foo/JExample.java | 0 .../kotlin2/src/main/kotlin/foo/Example.kt | 0 .../src/test/java/foo/JExampleSuite.java | 0 .../src/test/kotlin/foo/ExampleSuite.kt | 0 .../build.gradle | 0 .../src/intTest/java/ExampleIntTest.java | 0 .../src/main/java/Example.java | 0 .../gradle/protobuf-generator/build.gradle | 0 .../src/main/java/Example.java | 0 .../src/main/proto/message.proto | 0 .../fixtures/gradle/publishing/build.gradle | 0 .../src/main/java/test/ExampleClass.java | 0 .../fixtures/gradle/toolchains/build.gradle | 0 .../toolchains/src/main/java/Example.java | 0 .../resources/fixtures/maven/basic/pom.xml | 0 .../basic/src/main/java/com/Example.java | 0 .../basic/src/test/java/com/ExampleSuite.java | 0 .../fixtures/missing/ambiguous/build.gradle | 0 .../fixtures/missing/ambiguous/pom.xml | 0 .../missing/no-matching-explicit/pom.xml | 0 .../bar/Greeter.java | 0 .../compiles-with-classpath/foo/Example.java | 0 .../compiles-with-classpath/lsif-java.json | 0 .../foo/Example.java | 0 .../foo/Example2.java | 0 .../lsif-java.json | 0 .../foo/Example.java | 0 .../rejects-dependencies-field/lsif-java.json | 0 57 files changed, 27 insertions(+), 33 deletions(-) rename {tests/buildTools => scip-java}/src/test/kotlin/tests/AutoBuildToolTest.kt (100%) rename {tests/buildTools => scip-java}/src/test/kotlin/tests/BuildToolHarness.kt (100%) rename {tests/buildTools => scip-java}/src/test/kotlin/tests/GradleBuildToolTest.kt (100%) rename {tests/buildTools => scip-java}/src/test/kotlin/tests/MavenBuildToolTest.kt (100%) rename {tests/buildTools => scip-java}/src/test/kotlin/tests/MissingBuildToolTest.kt (100%) rename {tests/buildTools => scip-java}/src/test/kotlin/tests/ScipBuildToolTest.kt (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/annotation-path/build.gradle (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/annotation-path/src/main/java/WorkflowOptions.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/basic/build.gradle (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/basic/src/main/java/App.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/basic/src/test/java/AppTest.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/build-command/build.gradle (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/build-command/src/main/java/Example.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/build-command/src/test/java/ExampleSuite.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/build-with-Werror/build.gradle (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/build-with-Werror/src/main/java/main/bla/ExampleClass.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/explicit/build.gradle (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/explicit/pom.xml (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/explicit/src/main/java/Example.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/explicit/src/test/java/ExampleSuite.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/implementation-deps/app/build.gradle (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/implementation-deps/app/src/main/java/foo/Methods.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/implementation-deps/settings.gradle (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/kotlin-jvm-toolchains/build.gradle (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/kotlin-jvm-toolchains/src/main/kotlin/foo/Example.kt (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/kotlin2/build.gradle (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/kotlin2/src/main/java/foo/JExample.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/kotlin2/src/main/kotlin/foo/Example.kt (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/kotlin2/src/test/java/foo/JExampleSuite.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/kotlin2/src/test/kotlin/foo/ExampleSuite.kt (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/lazy-sourceset-with-toolchain/build.gradle (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/lazy-sourceset-with-toolchain/src/intTest/java/ExampleIntTest.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/lazy-sourceset-with-toolchain/src/main/java/Example.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/protobuf-generator/build.gradle (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/protobuf-generator/src/main/java/Example.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/protobuf-generator/src/main/proto/message.proto (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/publishing/build.gradle (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/publishing/src/main/java/test/ExampleClass.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/toolchains/build.gradle (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/gradle/toolchains/src/main/java/Example.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/maven/basic/pom.xml (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/maven/basic/src/main/java/com/Example.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/maven/basic/src/test/java/com/ExampleSuite.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/missing/ambiguous/build.gradle (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/missing/ambiguous/pom.xml (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/missing/no-matching-explicit/pom.xml (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/scip/compiles-with-classpath-lib/bar/Greeter.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/scip/compiles-with-classpath/foo/Example.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/scip/compiles-with-classpath/lsif-java.json (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/scip/compiles-with-empty-classpath/foo/Example.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/scip/compiles-with-empty-classpath/foo/Example2.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/scip/compiles-with-empty-classpath/lsif-java.json (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/scip/rejects-dependencies-field/foo/Example.java (100%) rename {tests/buildTools => scip-java}/src/test/resources/fixtures/scip/rejects-dependencies-field/lsif-java.json (100%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a2c56b723..018188df7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,6 +41,8 @@ These are the main components of the project. corpus of published Java libraries. - `scip-java/src/main/kotlin`: implementation of the `scip-java` command-line interface. +- `scip-java/src/test`: build-tool integration tests and fixtures for the + `scip-java` command-line interface. - `build.sbt`: the sbt build definition. - `project/plugins.sbt`: plugins for the sbt build. @@ -51,7 +53,7 @@ These are the main components of the project. | `sbt` | terminal | Start interactive sbt shell with Java 11 (run from `nix develop`). Takes a while to load on the first run. | | `unit/test` | sbt | Run fast unit tests. | | `~unit/test` | sbt | Start watch mode to run tests on file save, good for local edit-and-test workflows. | -| `buildTools/test` | sbt | Run slow build tool tests (Gradle, Maven). | +| `cli/test` | sbt | Run slow build tool tests (Gradle, Maven). | | `snapshots/testOnly tests.MinimizedSnapshotScipTest` | sbt | Runs fast snapshot tests. Indexes a small set of files under `tests/minimized`. | | `snapshots/test` | sbt | Runs all snapshot tests. | | `snapshots/run` | sbt | Update only the Java snapshot goldens under `tests/snapshots`. | @@ -93,4 +95,5 @@ snapshot suite is a JUnit `@TestFactory` that emits one dynamic test per generated document, comparing it against the committed goldens under `tests/snapshots/src/main/generated` ([snapshot testing](https://jestjs.io/docs/en/snapshot-testing) is heavily used -in this codebase). Build-tool tests (`tests/buildTools`) are written in Kotlin. +in this codebase). Build-tool tests (`scip-java/src/test`) are written in +Kotlin. diff --git a/build.sbt b/build.sbt index 15bf9249d..0ed5f25b3 100644 --- a/build.sbt +++ b/build.sbt @@ -182,6 +182,15 @@ lazy val cli = project // sbt invokes it directly (e.g. from the scip-kotlinc snapshots // task) so it cannot kill the surrounding sbt process. Compile / run / fork := true, + Test / fork := true, + // Our CI set up is a couple of measly vCPUs so parallelising tests there makes + // everything worse. + Test / testForkedParallel := !sys.env.contains("CI"), + // The SCIP build tool drives javac in-process; on JDK 17+ this requires + // opening the JDK-internal javac packages. + Test / javaOptions ++= javacModuleOptions.map(_.stripPrefix("-J")), + // Pin the JDK version embedded in stdlib SCIP symbols so output is stable. + Test / javaOptions += "-Dscip.jdk.version=11", libraryDependencies ++= List( "com.github.ajalt.clikt" % "clikt-jvm" % V.clikt, @@ -195,6 +204,13 @@ lazy val cli = project "org.jetbrains.kotlin" % "kotlin-scripting-dependencies-maven" % V.kotlinVersion ), + libraryDependencies ++= + Seq( + "org.jetbrains.kotlin" % "kotlin-test" % V.kotlinVersion % Test, + "org.jetbrains.kotlin" % "kotlin-test-junit5" % V.kotlinVersion % Test, + "com.github.sbt.junit" % "jupiter-interface" % + JupiterKeys.jupiterVersion.value % Test + ), (Compile / resourceGenerators) += Def .task { @@ -450,32 +466,6 @@ def javacModuleOptions = List( "-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED" ) -lazy val buildTools = project - .in(file("tests/buildTools")) - .enablePlugins(KotlinPlugin) - .settings( - publish / skip := true, - kotlinVersion := V.kotlinVersion, - kotlincJvmTarget := "11", - Test / fork := true, - // Our CI set up is a couple of measly vCPUs so parallelising tests there makes - // everything worse - Test / testForkedParallel := !sys.env.contains("CI"), - // The SCIP build tool drives javac in-process; on JDK 17+ this requires - // opening the JDK-internal javac packages. - Test / javaOptions ++= javacModuleOptions.map(_.stripPrefix("-J")), - // Pin the JDK version embedded in stdlib SCIP symbols so output is stable. - Test / javaOptions += "-Dscip.jdk.version=11", - libraryDependencies ++= - Seq( - "org.jetbrains.kotlin" % "kotlin-test" % V.kotlinVersion % Test, - "org.jetbrains.kotlin" % "kotlin-test-junit5" % V.kotlinVersion % Test, - "com.github.sbt.junit" % "jupiter-interface" % - JupiterKeys.jupiterVersion.value % Test - ) - ) - .dependsOn(cli) - lazy val snapshots = project .in(file("tests/snapshots")) .settings( diff --git a/flake.nix b/flake.nix index 24c755c8a..05e31b331 100644 --- a/flake.nix +++ b/flake.nix @@ -53,13 +53,13 @@ cd ${./.} # Exclude minimized fixtures and generated SCIP snapshot goldens # (coupled to exact line/column annotations), the standalone example - # projects, and the buildTools test fixtures: these all mirror + # projects, and the scip-java build-tool test fixtures: these all mirror # real-world project layouts that must not be reformatted here. find . -name '*.java' \ -not -path './examples/*' \ -not -path './tests/minimized/*' \ -not -path './tests/snapshots/*' \ - -not -path './tests/buildTools/src/test/resources/fixtures/*' \ + -not -path './scip-java/src/test/resources/fixtures/*' \ -not -path './scip-kotlinc/minimized/*' \ -exec ${pkgs.google-java-format}/bin/google-java-format --dry-run --set-exit-if-changed {} + touch $out @@ -67,11 +67,12 @@ ktfmt = pkgs.runCommand "check-ktfmt" { } '' cd ${./.} # Exclude minimized Kotlin snapshots (coupled to generated SCIP - # goldens with exact line/column annotations) and the buildTools test - # fixtures (real-world project layouts): neither may be reformatted. + # goldens with exact line/column annotations) and the scip-java + # build-tool test fixtures (real-world project layouts): neither may + # be reformatted. find . -name '*.kt' \ -not -path './scip-kotlinc/minimized/*' \ - -not -path './tests/buildTools/src/test/resources/fixtures/*' \ + -not -path './scip-java/src/test/resources/fixtures/*' \ -exec ${pkgs.ktfmt}/bin/ktfmt --kotlinlang-style --dry-run --set-exit-if-changed {} + touch $out ''; diff --git a/tests/buildTools/src/test/kotlin/tests/AutoBuildToolTest.kt b/scip-java/src/test/kotlin/tests/AutoBuildToolTest.kt similarity index 100% rename from tests/buildTools/src/test/kotlin/tests/AutoBuildToolTest.kt rename to scip-java/src/test/kotlin/tests/AutoBuildToolTest.kt diff --git a/tests/buildTools/src/test/kotlin/tests/BuildToolHarness.kt b/scip-java/src/test/kotlin/tests/BuildToolHarness.kt similarity index 100% rename from tests/buildTools/src/test/kotlin/tests/BuildToolHarness.kt rename to scip-java/src/test/kotlin/tests/BuildToolHarness.kt diff --git a/tests/buildTools/src/test/kotlin/tests/GradleBuildToolTest.kt b/scip-java/src/test/kotlin/tests/GradleBuildToolTest.kt similarity index 100% rename from tests/buildTools/src/test/kotlin/tests/GradleBuildToolTest.kt rename to scip-java/src/test/kotlin/tests/GradleBuildToolTest.kt diff --git a/tests/buildTools/src/test/kotlin/tests/MavenBuildToolTest.kt b/scip-java/src/test/kotlin/tests/MavenBuildToolTest.kt similarity index 100% rename from tests/buildTools/src/test/kotlin/tests/MavenBuildToolTest.kt rename to scip-java/src/test/kotlin/tests/MavenBuildToolTest.kt diff --git a/tests/buildTools/src/test/kotlin/tests/MissingBuildToolTest.kt b/scip-java/src/test/kotlin/tests/MissingBuildToolTest.kt similarity index 100% rename from tests/buildTools/src/test/kotlin/tests/MissingBuildToolTest.kt rename to scip-java/src/test/kotlin/tests/MissingBuildToolTest.kt diff --git a/tests/buildTools/src/test/kotlin/tests/ScipBuildToolTest.kt b/scip-java/src/test/kotlin/tests/ScipBuildToolTest.kt similarity index 100% rename from tests/buildTools/src/test/kotlin/tests/ScipBuildToolTest.kt rename to scip-java/src/test/kotlin/tests/ScipBuildToolTest.kt diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/annotation-path/build.gradle b/scip-java/src/test/resources/fixtures/gradle/annotation-path/build.gradle similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/annotation-path/build.gradle rename to scip-java/src/test/resources/fixtures/gradle/annotation-path/build.gradle diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/annotation-path/src/main/java/WorkflowOptions.java b/scip-java/src/test/resources/fixtures/gradle/annotation-path/src/main/java/WorkflowOptions.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/annotation-path/src/main/java/WorkflowOptions.java rename to scip-java/src/test/resources/fixtures/gradle/annotation-path/src/main/java/WorkflowOptions.java diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/basic/build.gradle b/scip-java/src/test/resources/fixtures/gradle/basic/build.gradle similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/basic/build.gradle rename to scip-java/src/test/resources/fixtures/gradle/basic/build.gradle diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/basic/src/main/java/App.java b/scip-java/src/test/resources/fixtures/gradle/basic/src/main/java/App.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/basic/src/main/java/App.java rename to scip-java/src/test/resources/fixtures/gradle/basic/src/main/java/App.java diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/basic/src/test/java/AppTest.java b/scip-java/src/test/resources/fixtures/gradle/basic/src/test/java/AppTest.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/basic/src/test/java/AppTest.java rename to scip-java/src/test/resources/fixtures/gradle/basic/src/test/java/AppTest.java diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/build-command/build.gradle b/scip-java/src/test/resources/fixtures/gradle/build-command/build.gradle similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/build-command/build.gradle rename to scip-java/src/test/resources/fixtures/gradle/build-command/build.gradle diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/build-command/src/main/java/Example.java b/scip-java/src/test/resources/fixtures/gradle/build-command/src/main/java/Example.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/build-command/src/main/java/Example.java rename to scip-java/src/test/resources/fixtures/gradle/build-command/src/main/java/Example.java diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/build-command/src/test/java/ExampleSuite.java b/scip-java/src/test/resources/fixtures/gradle/build-command/src/test/java/ExampleSuite.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/build-command/src/test/java/ExampleSuite.java rename to scip-java/src/test/resources/fixtures/gradle/build-command/src/test/java/ExampleSuite.java diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/build-with-Werror/build.gradle b/scip-java/src/test/resources/fixtures/gradle/build-with-Werror/build.gradle similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/build-with-Werror/build.gradle rename to scip-java/src/test/resources/fixtures/gradle/build-with-Werror/build.gradle diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/build-with-Werror/src/main/java/main/bla/ExampleClass.java b/scip-java/src/test/resources/fixtures/gradle/build-with-Werror/src/main/java/main/bla/ExampleClass.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/build-with-Werror/src/main/java/main/bla/ExampleClass.java rename to scip-java/src/test/resources/fixtures/gradle/build-with-Werror/src/main/java/main/bla/ExampleClass.java diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/explicit/build.gradle b/scip-java/src/test/resources/fixtures/gradle/explicit/build.gradle similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/explicit/build.gradle rename to scip-java/src/test/resources/fixtures/gradle/explicit/build.gradle diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/explicit/pom.xml b/scip-java/src/test/resources/fixtures/gradle/explicit/pom.xml similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/explicit/pom.xml rename to scip-java/src/test/resources/fixtures/gradle/explicit/pom.xml diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/explicit/src/main/java/Example.java b/scip-java/src/test/resources/fixtures/gradle/explicit/src/main/java/Example.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/explicit/src/main/java/Example.java rename to scip-java/src/test/resources/fixtures/gradle/explicit/src/main/java/Example.java diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/explicit/src/test/java/ExampleSuite.java b/scip-java/src/test/resources/fixtures/gradle/explicit/src/test/java/ExampleSuite.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/explicit/src/test/java/ExampleSuite.java rename to scip-java/src/test/resources/fixtures/gradle/explicit/src/test/java/ExampleSuite.java diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/implementation-deps/app/build.gradle b/scip-java/src/test/resources/fixtures/gradle/implementation-deps/app/build.gradle similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/implementation-deps/app/build.gradle rename to scip-java/src/test/resources/fixtures/gradle/implementation-deps/app/build.gradle diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/implementation-deps/app/src/main/java/foo/Methods.java b/scip-java/src/test/resources/fixtures/gradle/implementation-deps/app/src/main/java/foo/Methods.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/implementation-deps/app/src/main/java/foo/Methods.java rename to scip-java/src/test/resources/fixtures/gradle/implementation-deps/app/src/main/java/foo/Methods.java diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/implementation-deps/settings.gradle b/scip-java/src/test/resources/fixtures/gradle/implementation-deps/settings.gradle similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/implementation-deps/settings.gradle rename to scip-java/src/test/resources/fixtures/gradle/implementation-deps/settings.gradle diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/kotlin-jvm-toolchains/build.gradle b/scip-java/src/test/resources/fixtures/gradle/kotlin-jvm-toolchains/build.gradle similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/kotlin-jvm-toolchains/build.gradle rename to scip-java/src/test/resources/fixtures/gradle/kotlin-jvm-toolchains/build.gradle diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/kotlin-jvm-toolchains/src/main/kotlin/foo/Example.kt b/scip-java/src/test/resources/fixtures/gradle/kotlin-jvm-toolchains/src/main/kotlin/foo/Example.kt similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/kotlin-jvm-toolchains/src/main/kotlin/foo/Example.kt rename to scip-java/src/test/resources/fixtures/gradle/kotlin-jvm-toolchains/src/main/kotlin/foo/Example.kt diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/kotlin2/build.gradle b/scip-java/src/test/resources/fixtures/gradle/kotlin2/build.gradle similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/kotlin2/build.gradle rename to scip-java/src/test/resources/fixtures/gradle/kotlin2/build.gradle diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/kotlin2/src/main/java/foo/JExample.java b/scip-java/src/test/resources/fixtures/gradle/kotlin2/src/main/java/foo/JExample.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/kotlin2/src/main/java/foo/JExample.java rename to scip-java/src/test/resources/fixtures/gradle/kotlin2/src/main/java/foo/JExample.java diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/kotlin2/src/main/kotlin/foo/Example.kt b/scip-java/src/test/resources/fixtures/gradle/kotlin2/src/main/kotlin/foo/Example.kt similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/kotlin2/src/main/kotlin/foo/Example.kt rename to scip-java/src/test/resources/fixtures/gradle/kotlin2/src/main/kotlin/foo/Example.kt diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/kotlin2/src/test/java/foo/JExampleSuite.java b/scip-java/src/test/resources/fixtures/gradle/kotlin2/src/test/java/foo/JExampleSuite.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/kotlin2/src/test/java/foo/JExampleSuite.java rename to scip-java/src/test/resources/fixtures/gradle/kotlin2/src/test/java/foo/JExampleSuite.java diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/kotlin2/src/test/kotlin/foo/ExampleSuite.kt b/scip-java/src/test/resources/fixtures/gradle/kotlin2/src/test/kotlin/foo/ExampleSuite.kt similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/kotlin2/src/test/kotlin/foo/ExampleSuite.kt rename to scip-java/src/test/resources/fixtures/gradle/kotlin2/src/test/kotlin/foo/ExampleSuite.kt diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/lazy-sourceset-with-toolchain/build.gradle b/scip-java/src/test/resources/fixtures/gradle/lazy-sourceset-with-toolchain/build.gradle similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/lazy-sourceset-with-toolchain/build.gradle rename to scip-java/src/test/resources/fixtures/gradle/lazy-sourceset-with-toolchain/build.gradle diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/lazy-sourceset-with-toolchain/src/intTest/java/ExampleIntTest.java b/scip-java/src/test/resources/fixtures/gradle/lazy-sourceset-with-toolchain/src/intTest/java/ExampleIntTest.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/lazy-sourceset-with-toolchain/src/intTest/java/ExampleIntTest.java rename to scip-java/src/test/resources/fixtures/gradle/lazy-sourceset-with-toolchain/src/intTest/java/ExampleIntTest.java diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/lazy-sourceset-with-toolchain/src/main/java/Example.java b/scip-java/src/test/resources/fixtures/gradle/lazy-sourceset-with-toolchain/src/main/java/Example.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/lazy-sourceset-with-toolchain/src/main/java/Example.java rename to scip-java/src/test/resources/fixtures/gradle/lazy-sourceset-with-toolchain/src/main/java/Example.java diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/protobuf-generator/build.gradle b/scip-java/src/test/resources/fixtures/gradle/protobuf-generator/build.gradle similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/protobuf-generator/build.gradle rename to scip-java/src/test/resources/fixtures/gradle/protobuf-generator/build.gradle diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/protobuf-generator/src/main/java/Example.java b/scip-java/src/test/resources/fixtures/gradle/protobuf-generator/src/main/java/Example.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/protobuf-generator/src/main/java/Example.java rename to scip-java/src/test/resources/fixtures/gradle/protobuf-generator/src/main/java/Example.java diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/protobuf-generator/src/main/proto/message.proto b/scip-java/src/test/resources/fixtures/gradle/protobuf-generator/src/main/proto/message.proto similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/protobuf-generator/src/main/proto/message.proto rename to scip-java/src/test/resources/fixtures/gradle/protobuf-generator/src/main/proto/message.proto diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/publishing/build.gradle b/scip-java/src/test/resources/fixtures/gradle/publishing/build.gradle similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/publishing/build.gradle rename to scip-java/src/test/resources/fixtures/gradle/publishing/build.gradle diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/publishing/src/main/java/test/ExampleClass.java b/scip-java/src/test/resources/fixtures/gradle/publishing/src/main/java/test/ExampleClass.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/publishing/src/main/java/test/ExampleClass.java rename to scip-java/src/test/resources/fixtures/gradle/publishing/src/main/java/test/ExampleClass.java diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/toolchains/build.gradle b/scip-java/src/test/resources/fixtures/gradle/toolchains/build.gradle similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/toolchains/build.gradle rename to scip-java/src/test/resources/fixtures/gradle/toolchains/build.gradle diff --git a/tests/buildTools/src/test/resources/fixtures/gradle/toolchains/src/main/java/Example.java b/scip-java/src/test/resources/fixtures/gradle/toolchains/src/main/java/Example.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/gradle/toolchains/src/main/java/Example.java rename to scip-java/src/test/resources/fixtures/gradle/toolchains/src/main/java/Example.java diff --git a/tests/buildTools/src/test/resources/fixtures/maven/basic/pom.xml b/scip-java/src/test/resources/fixtures/maven/basic/pom.xml similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/maven/basic/pom.xml rename to scip-java/src/test/resources/fixtures/maven/basic/pom.xml diff --git a/tests/buildTools/src/test/resources/fixtures/maven/basic/src/main/java/com/Example.java b/scip-java/src/test/resources/fixtures/maven/basic/src/main/java/com/Example.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/maven/basic/src/main/java/com/Example.java rename to scip-java/src/test/resources/fixtures/maven/basic/src/main/java/com/Example.java diff --git a/tests/buildTools/src/test/resources/fixtures/maven/basic/src/test/java/com/ExampleSuite.java b/scip-java/src/test/resources/fixtures/maven/basic/src/test/java/com/ExampleSuite.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/maven/basic/src/test/java/com/ExampleSuite.java rename to scip-java/src/test/resources/fixtures/maven/basic/src/test/java/com/ExampleSuite.java diff --git a/tests/buildTools/src/test/resources/fixtures/missing/ambiguous/build.gradle b/scip-java/src/test/resources/fixtures/missing/ambiguous/build.gradle similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/missing/ambiguous/build.gradle rename to scip-java/src/test/resources/fixtures/missing/ambiguous/build.gradle diff --git a/tests/buildTools/src/test/resources/fixtures/missing/ambiguous/pom.xml b/scip-java/src/test/resources/fixtures/missing/ambiguous/pom.xml similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/missing/ambiguous/pom.xml rename to scip-java/src/test/resources/fixtures/missing/ambiguous/pom.xml diff --git a/tests/buildTools/src/test/resources/fixtures/missing/no-matching-explicit/pom.xml b/scip-java/src/test/resources/fixtures/missing/no-matching-explicit/pom.xml similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/missing/no-matching-explicit/pom.xml rename to scip-java/src/test/resources/fixtures/missing/no-matching-explicit/pom.xml diff --git a/tests/buildTools/src/test/resources/fixtures/scip/compiles-with-classpath-lib/bar/Greeter.java b/scip-java/src/test/resources/fixtures/scip/compiles-with-classpath-lib/bar/Greeter.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/scip/compiles-with-classpath-lib/bar/Greeter.java rename to scip-java/src/test/resources/fixtures/scip/compiles-with-classpath-lib/bar/Greeter.java diff --git a/tests/buildTools/src/test/resources/fixtures/scip/compiles-with-classpath/foo/Example.java b/scip-java/src/test/resources/fixtures/scip/compiles-with-classpath/foo/Example.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/scip/compiles-with-classpath/foo/Example.java rename to scip-java/src/test/resources/fixtures/scip/compiles-with-classpath/foo/Example.java diff --git a/tests/buildTools/src/test/resources/fixtures/scip/compiles-with-classpath/lsif-java.json b/scip-java/src/test/resources/fixtures/scip/compiles-with-classpath/lsif-java.json similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/scip/compiles-with-classpath/lsif-java.json rename to scip-java/src/test/resources/fixtures/scip/compiles-with-classpath/lsif-java.json diff --git a/tests/buildTools/src/test/resources/fixtures/scip/compiles-with-empty-classpath/foo/Example.java b/scip-java/src/test/resources/fixtures/scip/compiles-with-empty-classpath/foo/Example.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/scip/compiles-with-empty-classpath/foo/Example.java rename to scip-java/src/test/resources/fixtures/scip/compiles-with-empty-classpath/foo/Example.java diff --git a/tests/buildTools/src/test/resources/fixtures/scip/compiles-with-empty-classpath/foo/Example2.java b/scip-java/src/test/resources/fixtures/scip/compiles-with-empty-classpath/foo/Example2.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/scip/compiles-with-empty-classpath/foo/Example2.java rename to scip-java/src/test/resources/fixtures/scip/compiles-with-empty-classpath/foo/Example2.java diff --git a/tests/buildTools/src/test/resources/fixtures/scip/compiles-with-empty-classpath/lsif-java.json b/scip-java/src/test/resources/fixtures/scip/compiles-with-empty-classpath/lsif-java.json similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/scip/compiles-with-empty-classpath/lsif-java.json rename to scip-java/src/test/resources/fixtures/scip/compiles-with-empty-classpath/lsif-java.json diff --git a/tests/buildTools/src/test/resources/fixtures/scip/rejects-dependencies-field/foo/Example.java b/scip-java/src/test/resources/fixtures/scip/rejects-dependencies-field/foo/Example.java similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/scip/rejects-dependencies-field/foo/Example.java rename to scip-java/src/test/resources/fixtures/scip/rejects-dependencies-field/foo/Example.java diff --git a/tests/buildTools/src/test/resources/fixtures/scip/rejects-dependencies-field/lsif-java.json b/scip-java/src/test/resources/fixtures/scip/rejects-dependencies-field/lsif-java.json similarity index 100% rename from tests/buildTools/src/test/resources/fixtures/scip/rejects-dependencies-field/lsif-java.json rename to scip-java/src/test/resources/fixtures/scip/rejects-dependencies-field/lsif-java.json