From aa4e69de11f257be39d6c619b64d26c12f93e899 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 24 Jan 2013 20:34:17 +0400 Subject: [PATCH] Remove obsolete special files from android tests --- .../org/jetbrains/jet/compiler/android/SpecialFiles.java | 8 -------- compiler/testData/codegen/regressions/kt1592.kt | 2 +- compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java | 2 +- 3 files changed, 2 insertions(+), 10 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 fa95c938c47..816725eefe7 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 @@ -77,13 +77,6 @@ public class SpecialFiles { excludedFiles.add("kt1482.kt"); // Cannot change package name excludedFiles.add("kt326.kt"); // Commented excludedFiles.add("kt1213.kt"); // Commented - excludedFiles.add("kt882.kt"); // Commented - excludedFiles.add("kt789.kt"); // Commented - excludedFiles.add("enum.kt"); // Commented - excludedFiles.add("withclosure.kt"); // Commented - - excludedFiles.add("inRangeConditionsInWhen.kt"); // Commented - excludedFiles.add("kt1592.kt"); // Codegen don't execute blackBoxFile() on it excludedFiles.add("box.kt"); // MultiFileTest not supported yet excludedFiles.add("kt2060_1.kt"); // MultiFileTest not supported yet @@ -93,7 +86,6 @@ public class SpecialFiles { excludedFiles.add("kt684.kt"); // StackOverflow with StringBuilder (escape()) - excludedFiles.add("kt344.kt"); // Bug KT-2251 excludedFiles.add("kt529.kt"); // Bug excludedFiles.add("noClassObjectForJavaClass.kt"); diff --git a/compiler/testData/codegen/regressions/kt1592.kt b/compiler/testData/codegen/regressions/kt1592.kt index b5b588e1e10..e84dbbb116e 100644 --- a/compiler/testData/codegen/regressions/kt1592.kt +++ b/compiler/testData/codegen/regressions/kt1592.kt @@ -1,3 +1,3 @@ import org.junit.Test -Test fun box(m : java.lang.reflect.Method) = "OK" \ No newline at end of file +Test fun foo(m : java.lang.reflect.Method) = "OK" diff --git a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java index 977cb0a12e2..51a678fffde 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java @@ -146,7 +146,7 @@ public class StdlibTest extends CodegenTestCase { loadFile("regressions/kt1592.kt"); String fqName = NamespaceCodegen.getJVMClassNameForKotlinNs(JetPsiUtil.getFQName(myFiles.getPsiFile())).getFqName().getFqName(); Class namespaceClass = generateClass(fqName); - Method method = namespaceClass.getMethod("box", Method.class); + Method method = namespaceClass.getMethod("foo", Method.class); method.setAccessible(true); Test annotation = method.getAnnotation(Test.class); assertEquals(annotation.timeout(), 0l);