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

Moved test data.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-08-23 15:28:04 +04:00
committed by Pavel V. Talanov
parent 461b64e0e7
commit 8e442bc509
15 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt
+2 -2
View File
@@ -447,11 +447,11 @@ fun main(args: Array<String>) {
} }
testClass(javaClass<AbstractCompiledKotlinInJavaCompletionTest>()) { testClass(javaClass<AbstractCompiledKotlinInJavaCompletionTest>()) {
model("completion/injava/compiled", extension = "java") model("completion/injava", extension = "java")
} }
testClass(javaClass<AbstractKotlinSourceInJavaCompletionTest>()) { testClass(javaClass<AbstractKotlinSourceInJavaCompletionTest>()) {
model("completion/injava/compiled", extension = "java") model("completion/injava", extension = "java")
} }
} }
idea/testData/completion/injava/compiled/Class.java → idea/testData/completion/injava/Class.java
View File
idea/testData/completion/injava/compiled/ClassMembers.java → idea/testData/completion/injava/ClassMembers.java
View File
idea/testData/completion/injava/compiled/ClassesFromNamespace.java → idea/testData/completion/injava/ClassesFromNamespace.java
View File
idea/testData/completion/injava/compiled/EnumConstants.java → idea/testData/completion/injava/EnumConstants.java
View File
idea/testData/completion/injava/compiled/ObjectInstance.java → idea/testData/completion/injava/ObjectInstance.java
View File
idea/testData/completion/injava/compiled/Subpackage.java → idea/testData/completion/injava/Subpackage.java
View File
idea/testData/completion/injava/compiled/TopLevelMembers.java → idea/testData/completion/injava/TopLevelMembers.java
View File
idea/testData/completion/injava/compiled/TraitMember.java → idea/testData/completion/injava/TraitMember.java
View File
idea/testData/completion/injava/compiled/mockLib/another.kt → idea/testData/completion/injava/mockLib/another.kt
View File
idea/testData/completion/injava/compiled/mockLib/main.kt → idea/testData/completion/injava/mockLib/main.kt
View File
idea/tests/org/jetbrains/jet/completion/AbstractCompiledKotlinInJavaCompletionTest.java
+1 -1
View File
@@ -16,7 +16,7 @@ public abstract class AbstractCompiledKotlinInJavaCompletionTest extends JetFixt
@NotNull @NotNull
@Override @Override
protected LightProjectDescriptor getProjectDescriptor() { protected LightProjectDescriptor getProjectDescriptor() {
return new JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/completion/injava/compiled/mockLib", false); return new JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/completion/injava/mockLib", false);
} }
@NotNull @NotNull
idea/tests/org/jetbrains/jet/completion/AbstractKotlinSourceInJavaCompletionTest.java
+1 -1
View File
@@ -19,7 +19,7 @@ public abstract class AbstractKotlinSourceInJavaCompletionTest extends JetFixtur
@Override @Override
public void doTest(String testPath) { public void doTest(String testPath) {
File mockLibDir = new File(PluginTestCaseBase.getTestDataPathBase() + "/completion/injava/compiled/mockLib"); File mockLibDir = new File(PluginTestCaseBase.getTestDataPathBase() + "/completion/injava/mockLib");
File[] listFiles = mockLibDir.listFiles(); File[] listFiles = mockLibDir.listFiles();
assertNotNull(listFiles); assertNotNull(listFiles);
String[] paths = ArrayUtil.toStringArray(ContainerUtil.map(listFiles, new Function<File, String>() { String[] paths = ArrayUtil.toStringArray(ContainerUtil.map(listFiles, new Function<File, String>() {
idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java
+11 -11
View File
@@ -30,51 +30,51 @@ import org.jetbrains.jet.completion.AbstractCompiledKotlinInJavaCompletionTest;
/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all") @SuppressWarnings("all")
@TestMetadata("idea/testData/completion/injava/compiled") @TestMetadata("idea/testData/completion/injava")
@InnerTestClasses({}) @InnerTestClasses({})
public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompiledKotlinInJavaCompletionTest { public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompiledKotlinInJavaCompletionTest {
public void testAllFilesPresentInCompiled() throws Exception { public void testAllFilesPresentInInjava() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/completion/injava/compiled"), Pattern.compile("^(.+)\\.java$"), true); JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/completion/injava"), Pattern.compile("^(.+)\\.java$"), true);
} }
@TestMetadata("Class.java") @TestMetadata("Class.java")
public void testClass() throws Exception { public void testClass() throws Exception {
doTest("idea/testData/completion/injava/compiled/Class.java"); doTest("idea/testData/completion/injava/Class.java");
} }
@TestMetadata("ClassMembers.java") @TestMetadata("ClassMembers.java")
public void testClassMembers() throws Exception { public void testClassMembers() throws Exception {
doTest("idea/testData/completion/injava/compiled/ClassMembers.java"); doTest("idea/testData/completion/injava/ClassMembers.java");
} }
@TestMetadata("ClassesFromNamespace.java") @TestMetadata("ClassesFromNamespace.java")
public void testClassesFromNamespace() throws Exception { public void testClassesFromNamespace() throws Exception {
doTest("idea/testData/completion/injava/compiled/ClassesFromNamespace.java"); doTest("idea/testData/completion/injava/ClassesFromNamespace.java");
} }
@TestMetadata("EnumConstants.java") @TestMetadata("EnumConstants.java")
public void testEnumConstants() throws Exception { public void testEnumConstants() throws Exception {
doTest("idea/testData/completion/injava/compiled/EnumConstants.java"); doTest("idea/testData/completion/injava/EnumConstants.java");
} }
@TestMetadata("ObjectInstance.java") @TestMetadata("ObjectInstance.java")
public void testObjectInstance() throws Exception { public void testObjectInstance() throws Exception {
doTest("idea/testData/completion/injava/compiled/ObjectInstance.java"); doTest("idea/testData/completion/injava/ObjectInstance.java");
} }
@TestMetadata("Subpackage.java") @TestMetadata("Subpackage.java")
public void testSubpackage() throws Exception { public void testSubpackage() throws Exception {
doTest("idea/testData/completion/injava/compiled/Subpackage.java"); doTest("idea/testData/completion/injava/Subpackage.java");
} }
@TestMetadata("TopLevelMembers.java") @TestMetadata("TopLevelMembers.java")
public void testTopLevelMembers() throws Exception { public void testTopLevelMembers() throws Exception {
doTest("idea/testData/completion/injava/compiled/TopLevelMembers.java"); doTest("idea/testData/completion/injava/TopLevelMembers.java");
} }
@TestMetadata("TraitMember.java") @TestMetadata("TraitMember.java")
public void testTraitMember() throws Exception { public void testTraitMember() throws Exception {
doTest("idea/testData/completion/injava/compiled/TraitMember.java"); doTest("idea/testData/completion/injava/TraitMember.java");
} }
public static Test suite() { public static Test suite() {
idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java
+11 -11
View File
@@ -30,51 +30,51 @@ import org.jetbrains.jet.completion.AbstractKotlinSourceInJavaCompletionTest;
/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all") @SuppressWarnings("all")
@TestMetadata("idea/testData/completion/injava/compiled") @TestMetadata("idea/testData/completion/injava")
@InnerTestClasses({}) @InnerTestClasses({})
public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSourceInJavaCompletionTest { public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSourceInJavaCompletionTest {
public void testAllFilesPresentInCompiled() throws Exception { public void testAllFilesPresentInInjava() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/completion/injava/compiled"), Pattern.compile("^(.+)\\.java$"), true); JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/completion/injava"), Pattern.compile("^(.+)\\.java$"), true);
} }
@TestMetadata("Class.java") @TestMetadata("Class.java")
public void testClass() throws Exception { public void testClass() throws Exception {
doTest("idea/testData/completion/injava/compiled/Class.java"); doTest("idea/testData/completion/injava/Class.java");
} }
@TestMetadata("ClassMembers.java") @TestMetadata("ClassMembers.java")
public void testClassMembers() throws Exception { public void testClassMembers() throws Exception {
doTest("idea/testData/completion/injava/compiled/ClassMembers.java"); doTest("idea/testData/completion/injava/ClassMembers.java");
} }
@TestMetadata("ClassesFromNamespace.java") @TestMetadata("ClassesFromNamespace.java")
public void testClassesFromNamespace() throws Exception { public void testClassesFromNamespace() throws Exception {
doTest("idea/testData/completion/injava/compiled/ClassesFromNamespace.java"); doTest("idea/testData/completion/injava/ClassesFromNamespace.java");
} }
@TestMetadata("EnumConstants.java") @TestMetadata("EnumConstants.java")
public void testEnumConstants() throws Exception { public void testEnumConstants() throws Exception {
doTest("idea/testData/completion/injava/compiled/EnumConstants.java"); doTest("idea/testData/completion/injava/EnumConstants.java");
} }
@TestMetadata("ObjectInstance.java") @TestMetadata("ObjectInstance.java")
public void testObjectInstance() throws Exception { public void testObjectInstance() throws Exception {
doTest("idea/testData/completion/injava/compiled/ObjectInstance.java"); doTest("idea/testData/completion/injava/ObjectInstance.java");
} }
@TestMetadata("Subpackage.java") @TestMetadata("Subpackage.java")
public void testSubpackage() throws Exception { public void testSubpackage() throws Exception {
doTest("idea/testData/completion/injava/compiled/Subpackage.java"); doTest("idea/testData/completion/injava/Subpackage.java");
} }
@TestMetadata("TopLevelMembers.java") @TestMetadata("TopLevelMembers.java")
public void testTopLevelMembers() throws Exception { public void testTopLevelMembers() throws Exception {
doTest("idea/testData/completion/injava/compiled/TopLevelMembers.java"); doTest("idea/testData/completion/injava/TopLevelMembers.java");
} }
@TestMetadata("TraitMember.java") @TestMetadata("TraitMember.java")
public void testTraitMember() throws Exception { public void testTraitMember() throws Exception {
doTest("idea/testData/completion/injava/compiled/TraitMember.java"); doTest("idea/testData/completion/injava/TraitMember.java");
} }
public static Test suite() { public static Test suite() {