fixed ijwb integration tests

bazelbuild · Oct 9, 2024 · 4ba4f85 · 4ba4f85
1 parent 5bbb03a
commit 4ba4f85
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/base/src/com/google/idea/blaze/base/sync/aspects/strategy/SyncAspectTemplateProvider.java b/base/src/com/google/idea/blaze/base/sync/aspects/strategy/SyncAspectTemplateProvider.java
@@ -29,7 +29,7 @@
 import java.nio.file.Paths;
 import java.util.Map;
 
-class SyncAspectTemplateProvider implements SyncListener {
+public class SyncAspectTemplateProvider implements SyncListener {
   private final Map<LanguageClass, String> supportedLanguageAspectTemplate = Map.of(
       LanguageClass.JAVA, "java_info.template.bzl",
       LanguageClass.GENERIC, "java_info.template.bzl"

diff --git a/...tests/utils/integration/com/google/idea/blaze/base/sync/BlazeSyncIntegrationTestCase.java b/...tests/utils/integration/com/google/idea/blaze/base/sync/BlazeSyncIntegrationTestCase.java
@@ -57,6 +57,7 @@
 import com.google.idea.blaze.base.sync.aspects.BlazeIdeInterface;
 import com.google.idea.blaze.base.sync.aspects.BuildResult;
 import com.google.idea.blaze.base.sync.aspects.strategy.AspectStrategy.OutputGroup;
+import com.google.idea.blaze.base.sync.aspects.strategy.SyncAspectTemplateProvider;
 import com.google.idea.blaze.base.sync.data.BlazeDataStorage;
 import com.google.idea.blaze.base.sync.projectview.LanguageSupport;
 import com.google.idea.blaze.base.sync.projectview.WorkspaceLanguageSettings;
@@ -120,6 +121,8 @@ public void doSetup() throws Throwable {
     projectViewManager = new MockProjectViewManager(getProject());
     ServiceHelper.registerExtension(
         BlazeVcsHandlerProvider.EP_NAME, new MockBlazeVcsHandlerProvider(), thisClassDisposable);
+    ServiceHelper.unregisterExtension(
+        SyncListener.EP_NAME, SyncAspectTemplateProvider.class, thisClassDisposable);
     blazeInfoData = new MockBlazeInfoRunner();
     blazeModData = new MockBlazeModRunner();
     blazeIdeInterface = new MockBlazeIdeInterface();

diff --git a/testing/src/com/google/idea/testing/ServiceHelper.java b/testing/src/com/google/idea/testing/ServiceHelper.java
@@ -58,6 +58,19 @@ public static <T> void registerExtension(
     ep.registerExtension(instance, parentDisposable);
   }
 
+  public static <T> void unregisterExtension(
+      ExtensionPointName<T> name, Class<? extends T> clazz, Disposable parentDisposable) {
+    final var ep = name.getPoint();
+    for (final var extension : name.getExtensions()) {
+      if (!extension.getClass().equals(clazz)) {
+        continue;
+      }
+
+      ep.unregisterExtension(extension);
+      Disposer.register(parentDisposable, () -> ep.registerExtension(extension));
+    }
+  }
+
   public static <T> void registerProjectExtension(
       Project project, ExtensionPointName<T> name, T instance, Disposable parentDisposable) {
     ExtensionPoint<T> ep = project.getExtensionArea().getExtensionPoint(name);