MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

maven fix tests - temporaly removed sync console from tests and restored passthrough

Browse Source 
GitOrigin-RevId: a71d2de3896fde093af27af36d5962888bea67d7
This commit is contained in:
Alexander Bubenchikov
2019-05-20 21:19:21 +03:00
committed by intellij-monorepo-bot
parent d936fdc54c
commit f601d4896d
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java
+1 -1
View File
@@ -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);
plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java
+2 -6
View File
@@ -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<VirtualFile> files, String... profiles) {
plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManagerTest.java
+7 -5
View File
@@ -50,10 +50,11 @@ public class MavenProjectIndicesManagerTest extends MavenIndicesTestCase {
"<version>1</version>");
List<MavenIndex> 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 {
"<version>1</version>");
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);
}
}