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

Move Android JPS plugin tests to android-jps-plugin module

Browse Source
This commit is contained in:
Yan Zhulanow
2014-11-06 15:19:16 +03:00
parent 94af8302ec
commit b7f8496e5b
8 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-jps-plugin/android-jps-plugin.iml
+4
View File
@@ -4,6 +4,7 @@
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
@@ -13,5 +14,8 @@
<orderEntry type="library" name="kotlin-runtime" level="project" /> <orderEntry type="library" name="kotlin-runtime" level="project" />
<orderEntry type="module" module-name="android-compiler-plugin" /> <orderEntry type="module" module-name="android-compiler-plugin" />
<orderEntry type="module" module-name="util" scope="PROVIDED" /> <orderEntry type="module" module-name="util" scope="PROVIDED" />
<orderEntry type="library" scope="TEST" name="jps-test" level="project" />
<orderEntry type="library" scope="TEST" name="idea-full" level="project" />
<orderEntry type="module" module-name="compiler-tests" scope="TEST" />
</component> </component>
</module> </module>
jps-plugin/testData/android/simple/AndroidManifest.xml → plugins/android-jps-plugin/testData/android/simple/AndroidManifest.xml
View File
jps-plugin/testData/android/simple/res/layout/main.xml → plugins/android-jps-plugin/testData/android/simple/res/layout/main.xml
View File
jps-plugin/testData/android/simple/simple.iml → plugins/android-jps-plugin/testData/android/simple/simple.iml
View File
jps-plugin/testData/android/simple/simple.ipr → plugins/android-jps-plugin/testData/android/simple/simple.ipr
View File
jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt → plugins/android-jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt
View File
jps-plugin/test/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt → plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt
View File
jps-plugin/test/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java → plugins/android-jps-plugin/tests/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java
+6 -6
View File
@@ -17,28 +17,28 @@
package org.jetbrains.jet.jps.build.android; package org.jetbrains.jet.jps.build.android;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import junit.framework.Test; import org.jetbrains.jet.JUnit3RunnerWithInners;
import junit.framework.TestSuite;
import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.InnerTestClasses;
import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.test.TestMetadata;
import org.junit.runner.RunWith;
import java.io.File; import java.io.File;
import java.util.regex.Pattern; import java.util.regex.Pattern;
/** 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("jps-plugin/testData/android") @TestMetadata("plugins/android-jps-plugin/testData/android")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public class AndroidJpsTestCaseGenerated extends AbstractAndroidJpsTestCase { public class AndroidJpsTestCaseGenerated extends AbstractAndroidJpsTestCase {
public void testAllFilesPresentInAndroid() throws Exception { public void testAllFilesPresentInAndroid() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/android"), Pattern.compile("^([^\\.]+)$"), false); JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("plugins/android-jps-plugin/testData/android"), Pattern.compile("^([^\\.]+)$"), false);
} }
@TestMetadata("simple") @TestMetadata("simple")
public void testSimple() throws Exception { public void testSimple() throws Exception {
String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/android/simple/"); String fileName = JetTestUtils.navigationMetadata("plugins/android-jps-plugin/testData/android/simple/");
doTest(fileName); doTest(fileName);
} }
} }