From 476c1ec26408da9f0cddc729f27141dd3ae988b5 Mon Sep 17 00:00:00 2001
From: Michael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Wed, 29 Jun 2016 11:00:49 +0300
Subject: [PATCH] Compile android tests against jdk 6

---
 .idea/runConfigurations/Codegen_Tests_on_Android.xml          | 2 +-
 .../org/jetbrains/kotlin/android/tests/AndroidRunner.java     | 4 +++-
 .../kotlin/android/tests/CodegenTestsOnAndroidGenerator.java  | 4 ++--
 .../org/jetbrains/kotlin/android/tests/SpecialFiles.java      | 1 -
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.idea/runConfigurations/Codegen_Tests_on_Android.xml b/.idea/runConfigurations/Codegen_Tests_on_Android.xml
index d4a52e829d8..2b6c0d899b2 100644
--- a/.idea/runConfigurations/Codegen_Tests_on_Android.xml
+++ b/.idea/runConfigurations/Codegen_Tests_on_Android.xml
@@ -3,7 +3,7 @@
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="android-tests" />
     <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="MAIN_CLASS_NAME" value="org.jetbrains.kotlin.android.tests.AndroidRunner" />
     <option name="METHOD_NAME" value="" />
diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidRunner.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidRunner.java
index acc927842b1..1596ac6871e 100644
--- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidRunner.java
+++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidRunner.java
@@ -50,7 +50,9 @@ public class AndroidRunner extends TestSuite {
 
         System.out.println("Run tests on android...");
         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;
     }
 
diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
index fe88c7c3db6..749a7c37c10 100644
--- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
+++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
@@ -20,7 +20,6 @@ import com.google.common.collect.Lists;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.io.FileUtilRt;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.testFramework.UsefulTestCase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
 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.KotlinTestUtils;
 import org.jetbrains.kotlin.test.TestJdkKind;
+import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase;
 import org.jetbrains.kotlin.utils.Printer;
 import org.junit.Assert;
 
@@ -48,7 +48,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
+public class CodegenTestsOnAndroidGenerator extends KtUsefulTestCase {
 
     private final PathManager pathManager;
     private static final String testClassPackage = "org.jetbrains.kotlin.android.tests";
diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java
index 47764f3f3e5..086e74c9c2b 100644
--- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java
+++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/SpecialFiles.java
@@ -90,7 +90,6 @@ public class SpecialFiles {
 
         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("immutableRemove.kt"); // need to compile against java 6
 
         excludedFiles.add("closureOfInnerLocalClass.kt"); // KT-8120
         excludedFiles.add("closureWithSelfInstantiation.kt"); // KT-8120