Entire repository import test (#53)

* testkit version bump * test * todo * style * style v2 * ci fix 1 * ci fix * variable update + gitignore update
JetBrains · Apr 22, 2021 · 5032915 · 5032915
1 parent 93e39c1
commit 5032915
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,6 @@
 /.idea/
 /.ijwb/
 /bazel-*
-.DS_Store
+.DS_Store
+test-resources/.bazelbsp/
+test-resources/.bsp/
diff --git a/src/test/java/org/jetbrains/bsp/bazel/BazelBspServerTest.java b/src/test/java/org/jetbrains/bsp/bazel/BazelBspServerTest.java
@@ -12,6 +12,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+// TODO: these tests need some love again...
 public class BazelBspServerTest {
 
   private static final Logger LOGGER = LogManager.getLogger(BazelBspServerTest.class);
@@ -27,16 +28,17 @@ private static <T> Stream<T> concat(Stream<T>... streams) {
   }
 
   public void run() {
-
     LOGGER.info("Creating TestClients...");
+
     List<BazelBspServerSingleTest> testsToRun =
         concat(
                 getSampleRepoTests().stream(),
                 getActionGraphV1Tests().stream(),
                 getActionGraphV2Tests().stream(),
                 getJava8ProjectTests().stream(),
                 getJava11ProjectTests().stream(),
-                getJavaDefaultProjectTests().stream())
+                getJavaDefaultProjectTests().stream(),
+                getEntireRepositoryImportTests().stream())
             .collect(Collectors.toList());
 
     LOGGER.info("Created TestClients. Running BazelBspServerTest...");
@@ -85,6 +87,17 @@ private List<BazelBspServerSingleTest> getJavaDefaultProjectTests() {
                     BazelBspServerTestData.EXPECTED_BUILD_TARGETS_JAVA_11)));
   }
 
+  private List<BazelBspServerSingleTest> getEntireRepositoryImportTests() {
+    TestClient client =
+        TestClient$.MODULE$.testInitialStructure(
+            BazelBspServerTestData.REPO_PATH,
+            ImmutableMap.of(),
+            BazelBspServerTestData.TEST_CLIENT_TIMEOUT_IN_MINUTES);
+    return ImmutableList.of(
+        new BazelBspServerSingleTest(
+            "import entire repo", () -> client.testResolveProject(true, false)));
+  }
+
   private List<BazelBspServerSingleTest> getActionGraphV1Tests() {
     TestClient client =
         TestClient$.MODULE$.testInitialStructure(
@@ -137,7 +150,8 @@ private List<BazelBspServerSingleTest> getSampleRepoTests() {
             BazelBspServerTestData.TEST_CLIENT_TIMEOUT_IN_MINUTES);
 
     return ImmutableList.of(
-        new BazelBspServerSingleTest("resolve project", client::testResolveProject),
+        new BazelBspServerSingleTest(
+            "resolve project", () -> client.testResolveProject(false, false)),
         new BazelBspServerSingleTest(
             "compare workspace targets results",
             () ->

diff --git a/src/test/java/org/jetbrains/bsp/bazel/BazelBspServerTestData.java b/src/test/java/org/jetbrains/bsp/bazel/BazelBspServerTestData.java
@@ -39,6 +39,9 @@
 
 class BazelBspServerTestData {
 
+  private static final String BUILD_WORKSPACE_DIRECTORY = "BUILD_WORKSPACE_DIRECTORY";
+  static final String REPO_PATH = System.getenv(BUILD_WORKSPACE_DIRECTORY);
+
   private static final String SAMPLE_REPO_PATH = "sample-repo";
   private static final String ACTION_GRAPH_V2 = "action-graph-v2";
   private static final String JAVA_8 = "java-8-project";
@@ -48,9 +51,7 @@ class BazelBspServerTestData {
   private static final String SAMPLE_REPO_DEP_PATH = SAMPLE_REPO_PATH + "/dep";
 
   private static final String TEST_RESOURCES_PATH = "test-resources";
-  private static final String BUILD_WORKSPACE_DIRECTORY = "BUILD_WORKSPACE_DIRECTORY";
-  private static final String WORKSPACE_DIR_PATH =
-      System.getenv(BUILD_WORKSPACE_DIRECTORY) + "/" + TEST_RESOURCES_PATH;
+  private static final String WORKSPACE_DIR_PATH = REPO_PATH + "/" + TEST_RESOURCES_PATH;
 
   private static final BuildTargetIdentifier EXAMPLE_EXAMPLE_TARGET =
       new BuildTargetIdentifier("//example:example");

diff --git a/test-resources/action-graph-v2/.gitignore b/test-resources/action-graph-v2/.gitignore
@@ -0,0 +1,5 @@
+/.bazelbsp/
+/.bsp/
+/.idea/
+/.ijwb/
+/bazel-*
diff --git a/test.sh b/test.sh
@@ -36,9 +36,13 @@ test_bsp_server() {
 
   bazel run --define "maven_repo=file://$HOME/.m2/repository" //:bsp.publish
   bsp_path="$(bazel info bazel-bin)/bsp-project.jar"
-  cd test-resources
 
   log_test_progress "Installing BSP..."
+
+  java -cp "$bsp_path" org.jetbrains.bsp.bazel.install.Install
+
+  cd test-resources
+
   for project in "${TEST_PROJECTS[@]}"
   do
     cd "$project"

diff --git a/third_party.bzl b/third_party.bzl
@@ -17,7 +17,7 @@ _deps = [
     _dependency("com.google.code.gson:gson:2.8.5"),
     _dependency("com.google.guava:guava:28.1-jre"),
     _dependency("ch.epfl.scala:bsp4j:2.0.0-M13+37-43869cf9-SNAPSHOT"),
-    _dependency("ch.epfl.scala:bsp-testkit_2.13:2.0.0-M13+37-43869cf9-SNAPSHOT"),
+    _dependency("ch.epfl.scala:bsp-testkit_2.13:2.0.0-M13+38-664bda5b-SNAPSHOT"),
     _dependency("org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc:0.8.0"),
     _dependency("org.eclipse.xtext:org.eclipse.xtext.xbase.lib:2.19.0"),
     _dependency("commons-cli:commons-cli:jar:1.4"),