From f601d4896d9282f8a806ef8789a13bc17fc734bf Mon Sep 17 00:00:00 2001 From: Alexander Bubenchikov Date: Mon, 20 May 2019 20:32:12 +0300 Subject: [PATCH] maven fix tests - temporaly removed sync console from tests and restored passthrough GitOrigin-RevId: a71d2de3896fde093af27af36d5962888bea67d7 --- .../idea/maven/project/MavenProjectsManager.java | 2 +- .../jetbrains/idea/maven/MavenImportingTestCase.java | 8 ++------ .../indices/MavenProjectIndicesManagerTest.java | 12 +++++++----- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java index 1a864c1d7014..1e670e8901eb 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java @@ -368,7 +368,7 @@ public class MavenProjectsManager extends MavenSimpleProjectComponent new MavenProjectsManagerWatcher(myProject, this, myProjectsTree, getGeneralSettings(), myReadingProcessor, myEmbeddersManager); myImportingQueue = new MavenMergingUpdateQueue(getComponentName() + ": Importing queue", IMPORT_DELAY, !isUnitTestMode(), myProject); - myImportingQueue.setPassThrough(ApplicationManager.getApplication().isUnitTestMode()); + myImportingQueue.setPassThrough(false); myImportingQueue.makeUserAware(myProject); myImportingQueue.makeDumbAware(myProject); diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java index 5ad40739114f..455207a7439c 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java @@ -28,7 +28,6 @@ import com.intellij.util.ui.UIUtil; import org.intellij.lang.annotations.Language; import org.jetbrains.annotations.NotNull; import org.jetbrains.concurrency.AsyncPromise; -import org.jetbrains.idea.maven.buildtool.MavenSyncConsole; import org.jetbrains.idea.maven.execution.*; import org.jetbrains.idea.maven.model.MavenArtifact; import org.jetbrains.idea.maven.model.MavenExplicitProfiles; @@ -43,6 +42,8 @@ import java.io.File; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; +import static org.jetbrains.concurrency.Promise.State.PENDING; + public abstract class MavenImportingTestCase extends MavenTestCase { protected MavenProjectsTree myProjectsTree; protected MavenProjectsManager myProjectsManager; @@ -397,11 +398,6 @@ public abstract class MavenImportingTestCase extends MavenTestCase { assertFalse("Failed to import Maven project: " + each.getProblems(), each.hasReadingProblems()); } } - - MavenSyncConsole syncConsole = myProjectsManager.getSyncConsole(); - assertEquals(0, syncConsole.runningProcesses()); - assertTrue(syncConsole.isFinished()); - } protected void readProjects(List files, String... profiles) { diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManagerTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManagerTest.java index db2dfb0782ab..02689aef2c0a 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManagerTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManagerTest.java @@ -50,10 +50,11 @@ public class MavenProjectIndicesManagerTest extends MavenIndicesTestCase { "1"); List indices = myIndicesFixture.getProjectIndicesManager().getIndices(); - assertEquals(1, indices.size()); + assertEquals(2, indices.size()); - assertEquals(MavenSearchIndex.Kind.LOCAL, indices.get(0).getKind()); - assertTrue(indices.get(0).getRepositoryPathOrUrl().endsWith("local1")); + assertEquals(MavenSearchIndex.Kind.REMOTE, indices.get(0).getKind()); + assertEquals(MavenSearchIndex.Kind.LOCAL, indices.get(1).getKind()); + assertTrue(indices.get(1).getRepositoryPathOrUrl().endsWith("local1")); assertTrue(myIndicesFixture.getProjectIndicesManager().hasVersion("junit", "junit", "4.0")); } @@ -63,9 +64,10 @@ public class MavenProjectIndicesManagerTest extends MavenIndicesTestCase { "1"); DependencySearchService service = myIndicesFixture.getProjectIndicesManager().getSearchService(); - assertEquals(2, service.getProviders().size()); + assertEquals(3, service.getProviders().size()); assertTrue(service.getProviders().get(0) instanceof IndexBasedCompletionProvider); - assertTrue(service.getProviders().get(1) instanceof ProjectModulesCompletionProvider); + assertTrue(service.getProviders().get(1) instanceof IndexBasedCompletionProvider); + assertTrue(service.getProviders().get(2) instanceof ProjectModulesCompletionProvider); } }