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

Compile android tests against jdk 6

Browse Source
This commit is contained in:
Michael Bogdanov
2016-06-29 11:00:49 +03:00
parent 3a3e7bb814
commit 476c1ec264
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/runConfigurations/Codegen_Tests_on_Android.xml
Generated
+1 -1
View File
@@ -3,7 +3,7 @@
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="android-tests" /> <module name="android-tests" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="1.8" /> <option name="ALTERNATIVE_JRE_PATH" value="1.6" />
<option name="PACKAGE_NAME" value="org.jetbrains.kotlin.android.tests" /> <option name="PACKAGE_NAME" value="org.jetbrains.kotlin.android.tests" />
<option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.android.tests.AndroidRunner" /> <option name="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.android.tests.AndroidRunner" />
<option name="METHOD_NAME" value="" /> <option name="METHOD_NAME" value="" />
compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidRunner.java
+3 -1
View File
@@ -50,7 +50,9 @@ public class AndroidRunner extends TestSuite {
System.out.println("Run tests on android..."); System.out.println("Run tests on android...");
TestSuite suite = CodegenTestsOnAndroidRunner.getTestSuite(pathManager); TestSuite suite = CodegenTestsOnAndroidRunner.getTestSuite(pathManager);
suite.addTest(new AndroidJpsBuildTestCase()); //AndroidJpsBuildTestCase indirectly depends on UsefulTestCase which compiled against java 8
//TODO: Need add separate run configuration for AndroidJpsBuildTestCase
//suite.addTest(new AndroidJpsBuildTestCase());
return suite; return suite;
} }
compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
+2 -2
View File
@@ -20,7 +20,6 @@ import com.google.common.collect.Lists;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import com.intellij.testFramework.UsefulTestCase;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt;
@@ -40,6 +39,7 @@ import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.kotlin.test.TestJdkKind;
import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase;
import org.jetbrains.kotlin.utils.Printer; import org.jetbrains.kotlin.utils.Printer;
import org.junit.Assert; import org.junit.Assert;
@@ -48,7 +48,7 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { public class CodegenTestsOnAndroidGenerator extends KtUsefulTestCase {
private final PathManager pathManager; private final PathManager pathManager;
private static final String testClassPackage = "org.jetbrains.kotlin.android.tests"; private static final String testClassPackage = "org.jetbrains.kotlin.android.tests";
compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java
-1
View File
@@ -90,7 +90,6 @@ public class SpecialFiles {
excludedFiles.add("nestedClasses.kt"); // additional nested class in 'Thread' class on Android excludedFiles.add("nestedClasses.kt"); // additional nested class in 'Thread' class on Android
excludedFiles.add("kt12200Const.kt"); // no 'modifiers' field in 'java.lang.reflect.Field' class excludedFiles.add("kt12200Const.kt"); // no 'modifiers' field in 'java.lang.reflect.Field' class
excludedFiles.add("immutableRemove.kt"); // need to compile against java 6
excludedFiles.add("closureOfInnerLocalClass.kt"); // KT-8120 excludedFiles.add("closureOfInnerLocalClass.kt"); // KT-8120
excludedFiles.add("closureWithSelfInstantiation.kt"); // KT-8120 excludedFiles.add("closureWithSelfInstantiation.kt"); // KT-8120