From ca31ce8d88df09b1862db45c619635caa53729d5 Mon Sep 17 00:00:00 2001
From: Mikhael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Fri, 6 May 2016 16:52:57 +0300
Subject: [PATCH] Support new tests on android, disabled not applicable ones

---
 .../kotlin/android/tests/SpecialFiles.java    | 24 +++++++++----------
 .../testData/codegen/box/smap/chainCalls.kt   |  2 +-
 .../testData/codegen/box/smap/infixCalls.kt   |  2 +-
 .../codegen/box/smap/simpleCallWithParams.kt  |  2 +-
 4 files changed, 14 insertions(+), 16 deletions(-)

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 b8ef6b1b7d3..4cf8df0799f 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
@@ -39,15 +39,11 @@ public class SpecialFiles {
         excludedFiles.add("reflection");
         excludedFiles.add("kt3238.kt"); // Reflection
         excludedFiles.add("kt1482_2279.kt"); // Reflection
+        excludedFiles.add("extensionMethod.kt"); // Reflection loadClass
 
         excludedFiles.add("nestedInPackage.kt"); // Cannot change package name
-        excludedFiles.add("importNestedClass.kt"); // Cannot change package name
         excludedFiles.add("packageQualifiedMethod.kt"); // Cannot change package name
         excludedFiles.add("classObjectToString.kt"); // Cannot change package name
-        excludedFiles.add("invokeOnClassObjectOfNestedClass2.kt"); // Cannot change package name
-        excludedFiles.add("invokeOnImportedEnum1.kt"); // Cannot change package name
-        excludedFiles.add("invokeOnImportedEnum2.kt"); // Cannot change package name
-        excludedFiles.add("sortEnumEntries.kt"); // Cannot change package name
         excludedFiles.add("assertionStackTrace.kt"); // Cannot change package name
         excludedFiles.add("anonymousObjectReifiedSupertype.kt"); // Cannot change package name
         excludedFiles.add("innerAnonymousObject.kt"); // Cannot change package name
@@ -57,15 +53,20 @@ public class SpecialFiles {
         excludedFiles.add("classForEnumEntry.kt"); // Cannot change package name
         excludedFiles.add("kt10143.kt"); // Cannot change package name
         excludedFiles.add("internalTopLevelOtherPackage.kt"); // Cannot change package name
+        excludedFiles.add("noPrivateDelegation.kt"); // Cannot change package name
+        excludedFiles.add("platformTypeAssertionStackTrace.kt"); // Cannot change package name
+        excludedFiles.add("packages.kt"); // Cannot change package name
+        excludedFiles.add("kt10259.kt"); // Cannot change package name
+        excludedFiles.add("kt11081.kt"); // Cannot change package name
+        excludedFiles.add("kt6990.kt"); // Cannot change package name
+        excludedFiles.add("mainInFiles.kt"); // Cannot change package name
+        excludedFiles.add("noClassForSimpleEnum.kt"); // Cannot change package name
 
         excludedFiles.add("kt684.kt"); // StackOverflow with StringBuilder (escape())
 
         excludedFiles.add("kt529.kt");  // Bug
         excludedFiles.add("kt344.kt");  // Bug
 
-        excludedFiles.add("comparisonWithNullCallsFun.kt"); // java.lang.NoClassDefFoundError: kotlin.Nothing
-        excludedFiles.add("kt3574.kt"); // java.lang.NoClassDefFoundError: kotlin.Nothing
-
         excludedFiles.add("genericBackingFieldSignature.kt"); // Wrong signature after package renaming
         excludedFiles.add("genericMethodSignature.kt"); // Wrong signature after package renaming
 
@@ -73,15 +74,12 @@ public class SpecialFiles {
 
         excludedFiles.add("manyNumbers.kt"); // Out of memory
 
-        excludedFiles.add("smap"); // Line numbers
-
-        //TODO: fix KT-12127
-        excludedFiles.add("genericProperty.kt");
-
         excludedFiles.add("external"); //native methods
 
         excludedFiles.add("enclosingInfo"); //  Wrong enclosing info after package renaming
         excludedFiles.add("signature"); //  Wrong signature after package renaming
+
+        //excludedFiles.add("simpleThrow.kt"); // jack and jill fail
     }
 
     private SpecialFiles() {
diff --git a/compiler/testData/codegen/box/smap/chainCalls.kt b/compiler/testData/codegen/box/smap/chainCalls.kt
index 0c2942f3cac..6e8e83d736a 100644
--- a/compiler/testData/codegen/box/smap/chainCalls.kt
+++ b/compiler/testData/codegen/box/smap/chainCalls.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 // FULL_JDK
-
+package test
 fun testProperLineNumber(): String {
     var exceptionCount = 0;
     try {
diff --git a/compiler/testData/codegen/box/smap/infixCalls.kt b/compiler/testData/codegen/box/smap/infixCalls.kt
index 76e9224ef34..a115824e6b7 100644
--- a/compiler/testData/codegen/box/smap/infixCalls.kt
+++ b/compiler/testData/codegen/box/smap/infixCalls.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 // FULL_JDK
-
+package test
 fun testProperLineNumber(): String {
     var exceptionCount = 0;
     try {
diff --git a/compiler/testData/codegen/box/smap/simpleCallWithParams.kt b/compiler/testData/codegen/box/smap/simpleCallWithParams.kt
index f7ec55b4a0f..d6f3c282f5b 100644
--- a/compiler/testData/codegen/box/smap/simpleCallWithParams.kt
+++ b/compiler/testData/codegen/box/smap/simpleCallWithParams.kt
@@ -1,6 +1,6 @@
 // WITH_RUNTIME
 // FULL_JDK
-
+package test
 fun testProperLineNumberAfterInline(): String {
     var exceptionCount = 0;
     try {