MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (test data formatting)

Browse Source 
GitOrigin-RevId: dd51abac3d12cd5fcf23e2babccb1e0962ec2917
This commit is contained in:
Roman Shevchenko
2020-02-20 00:30:33 +01:00
committed by intellij-monorepo-bot
parent 85cb9606ff
commit 00a9ab4f2a
1 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
java/java-tests/testSrc/com/intellij/java/codeInsight/psi/AnnotatedTypeTest.groovy
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2017 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.
// Copyright 2000-2020 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 com.intellij.java.codeInsight.psi
import com.intellij.codeInsight.AnnotationUtil
@@ -40,83 +40,74 @@ class AnnotatedTypeTest extends LightJavaCodeInsightFixtureTestCase {
}
void testPrimitiveArrayType() {
doTest("@A @TA(1) int @TA(2) [] a", "@pkg.TA(1) int @pkg.TA(2) []", "int[]",
"@TA int @TA []", "int[]")
doTest("@A @TA(1) int @TA(2) [] a", "int[]", "@pkg.TA(1) int @pkg.TA(2) []", "int[]", "@TA int @TA []")
}
void testEllipsisType() {
doTest("@TA int @TA ... p", "@pkg.TA int @pkg.TA ...", "int...",
"@TA int @TA ...", "int...")
doTest("@TA int @TA ... p", "int...", "@pkg.TA int @pkg.TA ...", "int...", "@TA int @TA ...")
}
void testClassReferenceType() {
doTest("@A @TA(1) String s", "java.lang.@pkg.TA(1) String", "java.lang.String",
"@TA String", "String")
doTest("@A @TA(1) String s", "java.lang.String", "java.lang.@pkg.TA(1) String", "String", "@TA String")
}
void testQualifiedClassReferenceType() {
doTest("@A java.lang.@TA(1) String s", "java.lang.@pkg.TA(1) String", "java.lang.String",
"@TA String", "String")
doTest("@A java.lang.@TA(1) String s", "java.lang.String", "java.lang.@pkg.TA(1) String", "String", "@TA String")
}
void testQualifiedPackageClassReferenceType() {
doTest("@A @TA java.lang.String s", "java.lang.String", "java.lang.String", // packages cannot have type annotations
"String", "String")
doTest("@A @TA java.lang.String s", "java.lang.String", "java.lang.String", "String", "String" ) // packages can't have type annotations
}
void testPartiallyQualifiedClassReferenceType() {
doTest("@TA(1) O.@TA(2) I i", "pkg.@pkg.TA(1) O.@pkg.TA(2) I", "pkg.O.I",
"@TA I", "I")
doTest("@TA(1) O.@TA(2) I i", "pkg.O.I", "pkg.@pkg.TA(1) O.@pkg.TA(2) I", "I", "@TA I")
}
void testCStyleArrayType() {
doTest("@A @TA(1) String @TA(2) [] f @TA(3) []", "java.lang.@pkg.TA(1) String @pkg.TA(2) [] @pkg.TA(3) []", "java.lang.String[][]",
"@TA String @TA [] @TA []", "String[][]")
doTest("@A @TA(1) String @TA(2) [] f @TA(3) []",
"java.lang.String[][]", "java.lang.@pkg.TA(1) String @pkg.TA(2) [] @pkg.TA(3) []",
"String[][]", "@TA String @TA [] @TA []")
}
void testWildcardType() {
doTest("Class<@TA(1) ?> c", "java.lang.Class<@pkg.TA(1) ?>", "java.lang.Class<?>",
"Class<@TA ?>", "Class<?>")
doTest("Class<@TA(1) ?> c", "java.lang.Class<?>", "java.lang.Class<@pkg.TA(1) ?>", "Class<?>", "Class<@TA ?>")
}
void testWildcardBoundType() {
doTest("Class<@TA(1) ? extends @TA(2) Object> c", "java.lang.Class<@pkg.TA(1) ? extends java.lang.@pkg.TA(2) Object>",
"java.lang.Class<? extends java.lang.Object>",
"Class<@TA ? extends @TA Object>", "Class<? extends Object>")
doTest("Class<@TA(1) ? extends @TA(2) Object> c",
"java.lang.Class<? extends java.lang.Object>", "java.lang.Class<@pkg.TA(1) ? extends java.lang.@pkg.TA(2) Object>",
"Class<? extends Object>", "Class<@TA ? extends @TA Object>")
}
void testDisjunctionType() {
def psi = factory.createStatementFromText("try { } catch (@A @TA(1) E1 | @TA(2) E2 e) { }", context) as PsiTryStatement
assertTypeText psi.catchBlockParameters[0].type, "pkg.@pkg.TA(1) E1 | pkg.@pkg.TA(2) E2", "pkg.E1 | pkg.E2",
"@TA E1 | @TA E2", "E1 | E2"
assertTypeText psi.catchBlockParameters[0].type, "pkg.E1 | pkg.E2", "pkg.@pkg.TA(1) E1 | pkg.@pkg.TA(2) E2", "E1 | E2", "@TA E1 | @TA E2"
}
void testDiamondType() {
def psi = factory.createStatementFromText("Class<@TA String> cs = new Class<>()", context) as PsiDeclarationStatement
def var = psi.declaredElements[0] as PsiVariable
assertTypeText var.initializer.type, "java.lang.Class<java.lang.@pkg.TA String>", "java.lang.Class<java.lang.String>",
"Class<@TA String>", "Class<String>"
assertTypeText var.initializer.type,
"java.lang.Class<java.lang.String>", "java.lang.Class<java.lang.@pkg.TA String>",
"Class<String>", "Class<@TA String>"
}
void testImmediateClassType() {
def aClass = myFixture.javaFacade.findClass(CommonClassNames.JAVA_LANG_OBJECT)
def annotations = factory.createParameterFromText("@TA int x", context).modifierList.annotations
def type = new PsiImmediateClassType(aClass, PsiSubstitutor.EMPTY, LanguageLevel.JDK_1_8, annotations)
assertTypeText type, "java.lang.@pkg.TA Object", CommonClassNames.JAVA_LANG_OBJECT,
"@TA Object", "Object"
assertTypeText type, CommonClassNames.JAVA_LANG_OBJECT, "java.lang.@pkg.TA Object", "Object", "@TA Object"
}
void testFieldType() {
def psi = factory.createFieldFromText("@A @TA(1) String f;", context)
assertTypeText psi.type, "java.lang.@pkg.TA(1) String", "java.lang.String",
"@TA String", "String"
assertTypeText psi.type, "java.lang.String", "java.lang.@pkg.TA(1) String", "String", "@TA String"
assertAnnotations psi.type, "@TA(1)"
}
void testMethodReturnType() {
def psi = factory.createMethodFromText("@A @TA(1) <T> @TA(2) String m() { return null; }", context)
assertTypeText psi.returnType, "java.lang.@pkg.TA(1) @pkg.TA(2) String", "java.lang.String",
"@TA @TA String", "String"
assertTypeText psi.returnType, "java.lang.String", "java.lang.@pkg.TA(1) @pkg.TA(2) String", "String", "@TA @TA String"
assertAnnotations psi.returnType, "@TA(1)", "@TA(2)"
}
@@ -131,15 +122,15 @@ class AnnotatedTypeTest extends LightJavaCodeInsightFixtureTestCase {
}
private void doTest(String text, String annotated, String canonical, String presentableAnnotated, String presentable) {
assertTypeText(factory.createParameterFromText(text, context).type, annotated, canonical, presentableAnnotated, presentable)
private void doTest(String text, String canonical, String canonicalAnnotated, String presentable, String presentableAnnotated) {
assertTypeText factory.createParameterFromText(text, context).type, canonical, canonicalAnnotated, presentable, presentableAnnotated
}
private static void assertTypeText(PsiType type, String annotated, String canonical, String presentableAnnotated, String presentable) {
assert type.getCanonicalText(true) == annotated
private static void assertTypeText(PsiType type, String canonical, String canonicalAnnotated, String presentable, String presentableAnnotated) {
assert type.getCanonicalText(false) == canonical
assert type.getPresentableText(true) == presentableAnnotated
assert type.getCanonicalText(true) == canonicalAnnotated
assert type.getPresentableText(false) == presentable
assert type.getPresentableText(true) == presentableAnnotated
}
private static void assertAnnotations(PsiType type, String... annotations) {