From bb5c65a7db566031865e17097afde4db2c580a35 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 29 Jan 2013 15:14:13 +0400 Subject: [PATCH] Fix Android tests --- .../jet/compiler/android/SpecialFiles.java | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java b/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java index 3f1b286bf6d..65977796dd3 100644 --- a/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java +++ b/compiler/android-tests/tests/org/jetbrains/jet/compiler/android/SpecialFiles.java @@ -90,7 +90,7 @@ public class SpecialFiles { excludedFiles.add("kt529.kt"); // Bug excludedFiles.add("kt344.kt"); // Bug - excludedFiles.add("noClassObjectForJavaClass.kt"); + excludedFiles.add("classWithNestedEnum.kt"); excludedFiles.add("doGenerateAssertions.kt"); // Multi-file + Java excludedFiles.add("doNotGenerateAssertions.kt"); // Multi-file + Java @@ -99,19 +99,18 @@ public class SpecialFiles { excludedFiles.add("nestedInPackage.kt"); // Custom packages are not supported excludedFiles.add("importNestedClass.kt"); // Won't work when moved to another package - excludedFiles.add("protectedStaticClass.kt"); // Java - excludedFiles.add("protectedStaticClass2.kt"); // Java - excludedFiles.add("protectedStaticFun.kt"); // Java - excludedFiles.add("protectedStaticFunCallInConstructor.kt"); // Java - excludedFiles.add("protectedStaticFunClassObject.kt"); // Java - excludedFiles.add("protectedStaticFunGenericClass.kt"); // Java - excludedFiles.add("protectedStaticFunNestedStaticClass.kt"); // Java - excludedFiles.add("protectedStaticFunNestedStaticClass2.kt"); // Java - excludedFiles.add("protectedStaticFunNestedStaticGenericClass.kt"); // Java - excludedFiles.add("protectedStaticFunNotDirectSuperClass.kt"); // Java - excludedFiles.add("protectedStaticFunObject.kt"); // Java - excludedFiles.add("protectedStaticProperty.kt"); // Java - + excludedFiles.add("funCallInConstructor.kt"); // Java + excludedFiles.add("funClassObject.kt"); // Java + excludedFiles.add("funGenericClass.kt"); // Java + excludedFiles.add("funNestedStaticClass.kt"); // Java + excludedFiles.add("funNestedStaticClass2.kt"); // Java + excludedFiles.add("funNestedStaticGenericClass.kt"); // Java + excludedFiles.add("funNotDirectSuperClass.kt"); // Java + excludedFiles.add("funObject.kt"); // Java + excludedFiles.add("simpleClass.kt"); // Java + excludedFiles.add("simpleClass2.kt"); // Java + excludedFiles.add("simpleFun.kt"); // Java + excludedFiles.add("simpleProperty.kt"); // Java } private SpecialFiles() {