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

Simplify "Find Usages" test data, Move configuration options to test files

Browse Source
This commit is contained in:
Alexey Sedunov
2013-08-12 18:40:45 +04:00
parent 76c81aa3f0
commit 497d3c6706
54 changed files with 300 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/org/jetbrains/jet/generators/tests/GenerateTests.java
+3 -44
View File
@@ -436,48 +436,7 @@ public class GenerateTests {
"idea/tests/",
"JetFindUsagesTest",
AbstractJetFindUsagesTest.class,
testModelWithFileName(
"idea/testData/findUsages/findClassUsages/javaClassUsages", "Server.kt", "testFindClassJavaUsages"
),
testModelWithFileName(
"idea/testData/findUsages/findClassUsages/kotlinClassUsages1", "Server.kt", "testFindClassKotlinUsages"
),
testModelWithFileName(
"idea/testData/findUsages/findClassUsages/kotlinClassUsages2", "Server.kt", "testFindClassKotlinUsages"
),
testModelWithFileName(
"idea/testData/findUsages/findClassUsages/kotlinClassUsages3", "Server.kt", "testFindClassKotlinUsages"
),
testModelWithFileName(
"idea/testData/findUsages/findObjectUsages/javaObjectUsages", "Server.kt", "testFindObjectJavaUsages"
),
testModelWithFileName(
"idea/testData/findUsages/findObjectUsages/kotlinObjectUsages", "Server.kt", "testFindObjectKotlinUsages"
),
testModelWithFileName(
"idea/testData/findUsages/findMethodUsages/javaMethodUsages", "Server.kt", "testFindMethodJavaUsages"
),
testModelWithFileName(
"idea/testData/findUsages/findMethodUsages/kotlinMethodUsages", "Server.kt", "testFindMethodKotlinUsages"
),
testModelWithFileName(
"idea/testData/findUsages/findMethodUsages/javaAndKotlinOverrides", "Server.kt", "testFindMethodJavaUsages"
),
testModelWithFileName(
"idea/testData/findUsages/findMethodUsages/kotlinExtensionAndOverloadUsages", "Server.kt", "testFindMethodKotlinUsages"
),
testModelWithFileName(
"idea/testData/findUsages/findPropertyUsages/javaPropertyUsages", "Server.kt", "testFindPropertyJavaUsages"
),
testModelWithFileName(
"idea/testData/findUsages/findPropertyUsages/kotlinPropertyUsages", "Server.kt", "testFindPropertyKotlinUsages"
),
testModelWithFileName(
"idea/testData/findUsages/findWithFilteringImports", "Server.kt", "testFindWithFilteringImports"
),
testModelWithFileName(
"idea/testData/findUsages/unresolvedAnnotation", "Server.kt", "testFindUsagesUnresolvedAnnotation"
)
testModelWithPattern("idea/testData/findUsages", "^(.+).0.kt$", "doTest")
);
}
@@ -497,8 +456,8 @@ public class GenerateTests {
return new SimpleTestClassModel(new File(rootPath), false, Pattern.compile("^(.+)$"), methodName);
}
private static SimpleTestClassModel testModelWithFileName(@NotNull String rootPath, @NotNull String fileName, @NotNull String methodName) {
return new SimpleTestClassModel(new File(rootPath), true, Pattern.compile("^(.*)" + fileName + "$"), methodName);
private static SimpleTestClassModel testModelWithPattern(@NotNull String rootPath, @NotNull String pattern, @NotNull String methodName) {
return new SimpleTestClassModel(new File(rootPath), true, Pattern.compile(pattern), methodName);
}
private static SimpleTestClassModel testModel(