From 8a605b3884ba5bf531c94f697148c5fb0c52d91b Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 7 Feb 2013 20:43:13 +0400 Subject: [PATCH] Codegen tests: move stdlib tests to boxWithStdlib --- .../regressions}/collections.kt | 0 .../regressions}/generic.kt | 0 .../{ => boxWithStdlib}/regressions/kt1406.kt | 2 +- .../{ => boxWithStdlib}/regressions/kt1568.kt | 2 +- .../{ => boxWithStdlib}/regressions/kt1733.kt | 0 .../{ => boxWithStdlib}/regressions/kt1779.kt | 2 +- .../{ => boxWithStdlib}/regressions/kt1800.kt | 0 .../{ => boxWithStdlib}/regressions/kt1932.kt | 0 .../{ => boxWithStdlib}/regressions/kt2210.kt | 0 .../{ => boxWithStdlib}/regressions/kt2246.kt | 0 .../{ => boxWithStdlib}/regressions/kt2318.kt | 0 .../{ => boxWithStdlib}/regressions/kt2334.kt | 2 +- .../{ => boxWithStdlib}/regressions/kt2593.kt | 0 .../{ => boxWithStdlib}/regressions/kt274.kt | 2 +- .../{ => boxWithStdlib}/regressions/kt3046.kt | 2 +- .../{ => boxWithStdlib}/regressions/kt344.kt | 0 .../{ => boxWithStdlib}/regressions/kt528.kt | 2 +- .../{ => boxWithStdlib}/regressions/kt529.kt | 2 +- .../{ => boxWithStdlib}/regressions/kt533.kt | 0 .../{ => boxWithStdlib}/regressions/kt715.kt | 2 +- .../{ => boxWithStdlib}/regressions/kt789.kt | 2 +- .../{ => boxWithStdlib}/regressions/kt864.kt | 0 .../regressions}/typeCastException.kt | 0 .../org/jetbrains/jet/codegen/StdlibTest.java | 93 ------------------- 24 files changed, 10 insertions(+), 103 deletions(-) rename compiler/testData/codegen/{jdk-annotations => boxWithStdlib/regressions}/collections.kt (100%) rename compiler/testData/codegen/{extensionFunctions => boxWithStdlib/regressions}/generic.kt (100%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt1406.kt (99%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt1568.kt (98%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt1733.kt (100%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt1779.kt (99%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt1800.kt (100%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt1932.kt (100%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt2210.kt (100%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt2246.kt (100%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt2318.kt (100%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt2334.kt (98%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt2593.kt (100%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt274.kt (99%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt3046.kt (99%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt344.kt (100%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt528.kt (99%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt529.kt (99%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt533.kt (100%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt715.kt (99%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt789.kt (99%) rename compiler/testData/codegen/{ => boxWithStdlib}/regressions/kt864.kt (100%) rename compiler/testData/codegen/{ => boxWithStdlib/regressions}/typeCastException.kt (100%) diff --git a/compiler/testData/codegen/jdk-annotations/collections.kt b/compiler/testData/codegen/boxWithStdlib/regressions/collections.kt similarity index 100% rename from compiler/testData/codegen/jdk-annotations/collections.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/collections.kt diff --git a/compiler/testData/codegen/extensionFunctions/generic.kt b/compiler/testData/codegen/boxWithStdlib/regressions/generic.kt similarity index 100% rename from compiler/testData/codegen/extensionFunctions/generic.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/generic.kt diff --git a/compiler/testData/codegen/regressions/kt1406.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt1406.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt1406.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt1406.kt index 5893c0043ae..758917e3008 100644 --- a/compiler/testData/codegen/regressions/kt1406.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt1406.kt @@ -24,4 +24,4 @@ class Item{ fun box() : String { C().foo() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1568.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt1568.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt1568.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt1568.kt index 11815979752..393b4b87392 100644 --- a/compiler/testData/codegen/regressions/kt1568.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt1568.kt @@ -1,4 +1,4 @@ fun box() : String { val i = 1 return if(i.javaClass.getSimpleName() == "int") "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1733.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt1733.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1733.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt1733.kt diff --git a/compiler/testData/codegen/regressions/kt1779.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt1779.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt1779.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt1779.kt index 73a6baf19de..f271858f0fe 100644 --- a/compiler/testData/codegen/regressions/kt1779.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt1779.kt @@ -15,4 +15,4 @@ fun box() : String { k+=x } return if(k=="01234") "OK" else k -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt1800.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt1800.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1800.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt1800.kt diff --git a/compiler/testData/codegen/regressions/kt1932.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt1932.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt1932.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt1932.kt diff --git a/compiler/testData/codegen/regressions/kt2210.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt2210.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2210.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt2210.kt diff --git a/compiler/testData/codegen/regressions/kt2246.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt2246.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2246.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt2246.kt diff --git a/compiler/testData/codegen/regressions/kt2318.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt2318.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2318.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt2318.kt diff --git a/compiler/testData/codegen/regressions/kt2334.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt2334.kt similarity index 98% rename from compiler/testData/codegen/regressions/kt2334.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt2334.kt index 2a1eb0a4b1a..f51b1913b75 100644 --- a/compiler/testData/codegen/regressions/kt2334.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt2334.kt @@ -10,4 +10,4 @@ public class Test { fun box() : String { Test().f() return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt2593.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt2593.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt2593.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt2593.kt diff --git a/compiler/testData/codegen/regressions/kt274.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt274.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt274.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt274.kt index 8645dc33dab..448002bf1dd 100644 --- a/compiler/testData/codegen/regressions/kt274.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt274.kt @@ -11,4 +11,4 @@ fun box() : String { sum += e } return if(sum == 6) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt3046.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt3046.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt3046.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt3046.kt index 45b3d9112ec..b43fe4c23c4 100644 --- a/compiler/testData/codegen/regressions/kt3046.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt3046.kt @@ -17,4 +17,4 @@ fun box(): String { if (d.javaClass != javaClass()) return "javaClass function on double fails" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt344.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt344.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt344.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt344.kt diff --git a/compiler/testData/codegen/regressions/kt528.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt528.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt528.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt528.kt index bc892093922..ef5ebaef0f2 100644 --- a/compiler/testData/codegen/regressions/kt528.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt528.kt @@ -123,4 +123,4 @@ fun Reader.forEachChar(body : (Char) -> Unit) { if (i == -1) break body(i.toChar()) } while(true) -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt529.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt529.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt529.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt529.kt index f57e0f2d8e9..196f78aae09 100644 --- a/compiler/testData/codegen/regressions/kt529.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt529.kt @@ -104,4 +104,4 @@ fun Reader.forEachChar(body : (Char) -> Unit) { if (i == -1) break body(i.toChar()) } while(true) -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt533.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt533.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt533.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt533.kt diff --git a/compiler/testData/codegen/regressions/kt715.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt715.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt715.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt715.kt index 833edf94e02..a3c3f64407b 100644 --- a/compiler/testData/codegen/regressions/kt715.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt715.kt @@ -8,4 +8,4 @@ fun box(): String { if(test.getCanonicalName() != "java.lang.String") return "fail" if(test2.getCanonicalName() != "java.util.Iterator") return "fail" return "OK" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt789.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt789.kt similarity index 99% rename from compiler/testData/codegen/regressions/kt789.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt789.kt index 13caeb84569..9ce0845893f 100644 --- a/compiler/testData/codegen/regressions/kt789.kt +++ b/compiler/testData/codegen/boxWithStdlib/regressions/kt789.kt @@ -9,4 +9,4 @@ fun box() : String { a.add(1) a.add(2) return if((a.size == 2) && (a.get(1) == 2) && (a.get(0) == 1)) "OK" else "fail" -} \ No newline at end of file +} diff --git a/compiler/testData/codegen/regressions/kt864.kt b/compiler/testData/codegen/boxWithStdlib/regressions/kt864.kt similarity index 100% rename from compiler/testData/codegen/regressions/kt864.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/kt864.kt diff --git a/compiler/testData/codegen/typeCastException.kt b/compiler/testData/codegen/boxWithStdlib/regressions/typeCastException.kt similarity index 100% rename from compiler/testData/codegen/typeCastException.kt rename to compiler/testData/codegen/boxWithStdlib/regressions/typeCastException.kt diff --git a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java index e771a8e9eb5..0800d633179 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java @@ -63,42 +63,6 @@ public class StdlibTest extends CodegenTestCase { } } - public void testKt533 () { - blackBoxFile("regressions/kt533.kt"); - } - - public void testKt529 () { - blackBoxFile("regressions/kt529.kt"); - } - - public void testKt528 () { - blackBoxFile("regressions/kt528.kt"); - } - - public void testKt789 () { - blackBoxFile("regressions/kt789.kt"); - } - - public void testKt715 () { - blackBoxFile("regressions/kt715.kt"); - } - - public void testKt864 () { - blackBoxFile("regressions/kt864.kt"); - } - - public void testKt274 () { - blackBoxFile("regressions/kt274.kt"); - } - - public void testKt344 () { - blackBoxFile("regressions/kt344.kt"); - } - - //from ExtensionFunctionsTest - public void testGeneric() throws Exception { - blackBoxFile("extensionFunctions/generic.kt"); - } //from NamespaceGenTest // public void testPredicateOperator() throws Exception { @@ -130,14 +94,6 @@ public class StdlibTest extends CodegenTestCase { } } - public void testKt1406() throws Exception { - blackBoxFile("regressions/kt1406.kt"); - } - - public void testKt1568() throws Exception { - blackBoxFile("regressions/kt1568.kt"); - } - public void testKt1592 () throws MalformedURLException, ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException { loadFile("regressions/kt1592.kt"); String fqName = NamespaceCodegen.getJVMClassNameForKotlinNs(JetPsiUtil.getFQName(myFiles.getPsiFile())).getFqName().getFqName(); @@ -303,56 +259,7 @@ public class StdlibTest extends CodegenTestCase { assertEquals(invoke1[1].value(), RetentionPolicy.SOURCE); } - public void testInvokeAnnotationMethod() { - blackBoxFile("regressions/kt1932.kt"); - } - - - public void testKt1800() { - blackBoxFile("regressions/kt1800.kt"); - } - - public void testKt2334() { - blackBoxFile("regressions/kt2334.kt"); - } - - public void test1733() { - blackBoxFile("regressions/kt1733.kt"); - } - - public void test1779() { - blackBoxFile("regressions/kt1779.kt"); - } - - public void testKt2210() throws Exception { - blackBoxFile("regressions/kt2210.kt"); - } - - public void testKt2593() { - blackBoxFile("regressions/kt2593.kt"); - } - - public void testKt2318() { - blackBoxFile("regressions/kt2318.kt"); - } - - public void testKt3046() { - blackBoxFile("regressions/kt3046.kt"); - } - - public void testKt2246() { - blackBoxFile("regressions/kt2246.kt"); - } - - public void testCollections() { - blackBoxFile("jdk-annotations/collections.kt"); - } - public void testKt1515() { blackBoxMultiFile("/multi/kt1515/thisPackage.kt", "/multi/kt1515/otherPackage.kt"); } - - public void testTypeCastException() { - blackBoxFile("typeCastException.kt"); - } }