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

Gradle: test cleanup

Browse Source
This commit is contained in:
Vladislav.Soroka
2018-04-23 15:52:38 +03:00
parent 885ef4866f
commit 397bcb10f3
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/ExternalSystemImportingTestCase.java
+4 -4
View File
@@ -517,13 +517,13 @@ public abstract class ExternalSystemImportingTestCase extends ExternalSystemTest
return counter;
}
protected static Collection<UsageInfo> doFindUsages(PsiElement resolved) throws Exception {
return ProgressManager.getInstance().run(new Task.WithResult<Collection<UsageInfo>, Exception>(resolved.getProject(), "", false) {
protected static Collection<UsageInfo> findUsages(PsiElement element) throws Exception {
return ProgressManager.getInstance().run(new Task.WithResult<Collection<UsageInfo>, Exception>(element.getProject(), "", false) {
@Override
protected Collection<UsageInfo> compute(@NotNull ProgressIndicator indicator) {
return ApplicationManager.getApplication().runReadAction((Computable<Collection<UsageInfo>>)() -> {
FindUsagesManager findUsagesManager = ((FindManagerImpl)FindManager.getInstance(resolved.getProject())).getFindUsagesManager();
FindUsagesHandler handler = findUsagesManager.getFindUsagesHandler(resolved, false);
FindUsagesManager findUsagesManager = ((FindManagerImpl)FindManager.getInstance(element.getProject())).getFindUsagesManager();
FindUsagesHandler handler = findUsagesManager.getFindUsagesHandler(element, false);
assertNotNull(handler);
final FindUsagesOptions options = handler.getFindUsagesOptions();
final CommonProcessors.CollectProcessor<UsageInfo> processor = new CommonProcessors.CollectProcessor<>();
plugins/gradle/java/testSources/importing/GradleFindUsagesTest.java
+1 -14
View File
@@ -1,26 +1,13 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.plugins.gradle.importing;
import com.intellij.find.FindManager;
import com.intellij.find.findUsages.FindUsagesHandler;
import com.intellij.find.findUsages.FindUsagesManager;
import com.intellij.find.findUsages.FindUsagesOptions;
import com.intellij.find.impl.FindManagerImpl;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.Trinity;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.usageView.UsageInfo;
import com.intellij.util.CommonProcessors;
import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import org.junit.runners.Parameterized;
@@ -219,6 +206,6 @@ public class GradleFindUsagesTest extends GradleImportingTestCase {
}
private static void assertUsagesCount(int expectedUsagesCount, PsiElement resolved) throws Exception {
assertEquals(expectedUsagesCount, doFindUsages(resolved).size());
assertEquals(expectedUsagesCount, findUsages(resolved).size());
}
}