azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed printing usage type in tests and fixed "find usages" tests.

Browse Source
This commit is contained in:
Zalim Bashorov
2014-02-24 14:18:37 +04:00
parent fc42f3e3ab
commit 75e10322d0
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java
+10 -3
View File
@@ -34,6 +34,7 @@ import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
import com.intellij.usageView.UsageInfo; import com.intellij.usageView.UsageInfo;
import com.intellij.usages.UsageInfo2UsageAdapter; import com.intellij.usages.UsageInfo2UsageAdapter;
import com.intellij.usages.UsageViewPresentation;
import com.intellij.usages.impl.rules.UsageType; import com.intellij.usages.impl.rules.UsageType;
import com.intellij.usages.impl.rules.UsageTypeProvider; import com.intellij.usages.impl.rules.UsageTypeProvider;
import com.intellij.usages.rules.UsageFilteringRule; import com.intellij.usages.rules.UsageFilteringRule;
@@ -57,6 +58,9 @@ import java.util.Collection;
import java.util.List; import java.util.List;
public abstract class AbstractJetFindUsagesTest extends LightCodeInsightFixtureTestCase { public abstract class AbstractJetFindUsagesTest extends LightCodeInsightFixtureTestCase {
public static final UsageViewPresentation USAGE_VIEW_PRESENTATION = new UsageViewPresentation();
protected static enum OptionsParser { protected static enum OptionsParser {
CLASS { CLASS {
@NotNull @NotNull
@@ -307,8 +311,11 @@ public abstract class AbstractJetFindUsagesTest extends LightCodeInsightFixtureT
@Override @Override
public String apply(@Nullable UsageInfo2UsageAdapter usageAdapter) { public String apply(@Nullable UsageInfo2UsageAdapter usageAdapter) {
assert usageAdapter != null; assert usageAdapter != null;
return getUsageType(usageAdapter.getElement())
+ " " + Joiner.on("").join(Arrays.asList(usageAdapter.getPresentation().getText())); UsageType usageType = getUsageType(usageAdapter.getElement());
String usageTypeAsString = usageType == null ? "null" : usageType.toString(USAGE_VIEW_PRESENTATION);
return usageTypeAsString + " " + Joiner.on("").join(Arrays.asList(usageAdapter.getPresentation().getText()));
} }
}; };
@@ -361,7 +368,7 @@ public abstract class AbstractJetFindUsagesTest extends LightCodeInsightFixtureT
} }
@Nullable @Nullable
private static UsageType getUsageType(PsiElement element) { private static UsageType getUsageType(@Nullable PsiElement element) {
if (element == null) return null; if (element == null) return null;
if (PsiTreeUtil.getParentOfType(element, PsiComment.class, false) != null) { if (PsiTreeUtil.getParentOfType(element, PsiComment.class, false) != null) {