From d56a4f8830123748925c4324b08ee093fa0b860b Mon Sep 17 00:00:00 2001 From: Pavel Punegov <32519625+PavelPunegov@users.noreply.github.com> Date: Tue, 17 Oct 2017 12:43:28 +0300 Subject: [PATCH] Fixes to tests: forgotten package names and tests --- backend.native/tests/build.gradle | 18 +++++++++--------- .../tests/codegen/branching/advanced_when2.kt | 2 +- .../tests/codegen/branching/advanced_when5.kt | 2 +- .../tests/codegen/branching/if_else.kt | 2 +- .../tests/codegen/branching/when2.kt | 2 +- .../tests/codegen/branching/when4.kt | 2 +- .../tests/codegen/branching/when5.kt | 2 +- .../tests/codegen/branching/when6.kt | 2 +- .../tests/codegen/branching/when7.kt | 2 +- .../tests/codegen/branching/when8.kt | 2 +- .../tests/codegen/branching/when9.kt | 2 +- .../tests/codegen/branching/when_through.kt | 2 +- backend.native/tests/codegen/kclass/kclass0.kt | 6 +++--- backend.native/tests/codegen/kclass/kclass1.kt | 4 ++-- .../objectExpression/{1.kt => expr1.kt} | 2 +- .../objectExpression/{2.kt => expr2.kt} | 3 +-- .../objectExpression/{3.kt => expr3.kt} | 2 +- .../tests/runtime/basic/main_exception.kt | 6 +++++- 18 files changed, 33 insertions(+), 30 deletions(-) rename backend.native/tests/codegen/objectExpression/{1.kt => expr1.kt} (86%) rename backend.native/tests/codegen/objectExpression/{2.kt => expr2.kt} (88%) rename backend.native/tests/codegen/objectExpression/{3.kt => expr3.kt} (88%) diff --git a/backend.native/tests/build.gradle b/backend.native/tests/build.gradle index ccef15bcf34..490edd407a9 100644 --- a/backend.native/tests/build.gradle +++ b/backend.native/tests/build.gradle @@ -1265,7 +1265,7 @@ task link(type: LinkKonanTest) { goldValue = "0\n" source = "link/src/bar.kt" lib = "link/lib" -} +}( */ task link_omit_unused(type: LinkKonanTest) { @@ -1274,7 +1274,7 @@ task link_omit_unused(type: LinkKonanTest) { lib = "link/omit/lib.kt" } -task link_default_libs(type: RunKonanTest) { +task link_default_libs(type: RunStandaloneKonanTest) { disabled = (project.testTarget == 'wasm32') // there will be no posix.klib for wasm goldValue = "sizet = 0\n" source = "link/default/default.kt" @@ -1761,17 +1761,17 @@ task lambda13(type: RunKonanTest) { task objectExpression1(type: RunKonanTest) { goldValue = "aabb\n" - source = "codegen/objectExpression/1.kt" + source = "codegen/objectExpression/expr1.kt" } task objectExpression2(type: RunKonanTest) { goldValue = "a\n" - source = "codegen/objectExpression/2.kt" + source = "codegen/objectExpression/expr2.kt" } task objectExpression3(type: RunKonanTest) { goldValue = "\n1\n2\n" - source = "codegen/objectExpression/3.kt" + source = "codegen/objectExpression/expr3.kt" } task initializers2(type: RunStandaloneKonanTest) { @@ -1841,7 +1841,7 @@ task memory_cycles0(type: RunKonanTest) { source = "runtime/memory/cycles0.kt" } -task memory_basic0(type: RunStandaloneKonanTest) { +task memory_basic0(type: RunKonanTest) { source = "runtime/memory/basic0.kt" } @@ -2036,7 +2036,7 @@ task deserialized_members(type: LinkKonanTest) { source = "serialization/deserialize_members.kt" } -task testing_annotations(type: RunKonanTest) { +task testing_annotations(type: RunStandaloneKonanTest) { source = "testing/annotations.kt" flags = ['-tr'] arguments = ['--ktest_logger=SIMPLE'] @@ -2062,14 +2062,14 @@ task testing_annotations(type: RunKonanTest) { 'Test suite finished: kotlin.test.tests.AnnotationsKt\nIteration finished: 1\nTesting finished\n' } -task testing_assertions(type: RunKonanTest) { +task testing_assertions(type: RunStandaloneKonanTest) { source = "testing/assertions.kt" flags = ['-tr'] expectedFail = (project.testTarget == 'wasm32') // Uses exceptions. expectedExitStatus = 0 } -task testing_custom_main(type: RunKonanTest) { +task testing_custom_main(type: RunStandaloneKonanTest) { source = "testing/custom_main.kt" flags = ['-tr', '-e', 'kotlin.test.tests.main'] arguments = ['--ktest_logger=SIMPLE', '--ktest_repeat=2'] diff --git a/backend.native/tests/codegen/branching/advanced_when2.kt b/backend.native/tests/codegen/branching/advanced_when2.kt index c0fea6e5cfc..962bdda80eb 100644 --- a/backend.native/tests/codegen/branching/advanced_when2.kt +++ b/backend.native/tests/codegen/branching/advanced_when2.kt @@ -1,4 +1,4 @@ -package codegen.boxing.advanced_when2 +package codegen.branching.advanced_when2 import kotlin.test.* diff --git a/backend.native/tests/codegen/branching/advanced_when5.kt b/backend.native/tests/codegen/branching/advanced_when5.kt index 97b703a0c32..b6384cae8fe 100644 --- a/backend.native/tests/codegen/branching/advanced_when5.kt +++ b/backend.native/tests/codegen/branching/advanced_when5.kt @@ -1,4 +1,4 @@ -package codegen.boxing.advanced_when5 +package codegen.branching.advanced_when5 import kotlin.test.* diff --git a/backend.native/tests/codegen/branching/if_else.kt b/backend.native/tests/codegen/branching/if_else.kt index 2213ee3dde3..2e8d42f350d 100644 --- a/backend.native/tests/codegen/branching/if_else.kt +++ b/backend.native/tests/codegen/branching/if_else.kt @@ -1,4 +1,4 @@ -package codegen.boxing.if_else +package codegen.branching.if_else import kotlin.test.* diff --git a/backend.native/tests/codegen/branching/when2.kt b/backend.native/tests/codegen/branching/when2.kt index 1e8d1169112..a41c4155a2e 100644 --- a/backend.native/tests/codegen/branching/when2.kt +++ b/backend.native/tests/codegen/branching/when2.kt @@ -1,4 +1,4 @@ -package codegen.boxing.when2 +package codegen.branching.when2 import kotlin.test.* diff --git a/backend.native/tests/codegen/branching/when4.kt b/backend.native/tests/codegen/branching/when4.kt index aec44a82aec..fb2f8adafb8 100644 --- a/backend.native/tests/codegen/branching/when4.kt +++ b/backend.native/tests/codegen/branching/when4.kt @@ -1,4 +1,4 @@ -package codegen.boxing.when4 +package codegen.branching.when4 import kotlin.test.* diff --git a/backend.native/tests/codegen/branching/when5.kt b/backend.native/tests/codegen/branching/when5.kt index f0b6abc2cd4..42fe935b7b5 100644 --- a/backend.native/tests/codegen/branching/when5.kt +++ b/backend.native/tests/codegen/branching/when5.kt @@ -1,4 +1,4 @@ -package codegen.boxing.when5 +package codegen.branching.when5 import kotlin.test.* diff --git a/backend.native/tests/codegen/branching/when6.kt b/backend.native/tests/codegen/branching/when6.kt index 3fb6c81dafe..ed1f85eeffc 100644 --- a/backend.native/tests/codegen/branching/when6.kt +++ b/backend.native/tests/codegen/branching/when6.kt @@ -1,4 +1,4 @@ -package codegen.boxing.when6 +package codegen.branching.when6 import kotlin.test.* diff --git a/backend.native/tests/codegen/branching/when7.kt b/backend.native/tests/codegen/branching/when7.kt index dfa8bc4201f..76c228cfbfb 100644 --- a/backend.native/tests/codegen/branching/when7.kt +++ b/backend.native/tests/codegen/branching/when7.kt @@ -1,4 +1,4 @@ -package codegen.boxing.when7 +package codegen.branching.when7 import kotlin.test.* diff --git a/backend.native/tests/codegen/branching/when8.kt b/backend.native/tests/codegen/branching/when8.kt index c5d1abd2bcb..422ac4c7711 100644 --- a/backend.native/tests/codegen/branching/when8.kt +++ b/backend.native/tests/codegen/branching/when8.kt @@ -1,4 +1,4 @@ -package codegen.boxing.when8 +package codegen.branching.when8 import kotlin.test.* diff --git a/backend.native/tests/codegen/branching/when9.kt b/backend.native/tests/codegen/branching/when9.kt index f7dcdbdbe9a..872f9ff743c 100644 --- a/backend.native/tests/codegen/branching/when9.kt +++ b/backend.native/tests/codegen/branching/when9.kt @@ -1,4 +1,4 @@ -package codegen.boxing.when9 +package codegen.branching.when9 import kotlin.test.* diff --git a/backend.native/tests/codegen/branching/when_through.kt b/backend.native/tests/codegen/branching/when_through.kt index 17953acda12..1025d7a8764 100644 --- a/backend.native/tests/codegen/branching/when_through.kt +++ b/backend.native/tests/codegen/branching/when_through.kt @@ -1,4 +1,4 @@ -package codegen.boxing.when_through +package codegen.branching.when_through import kotlin.test.* diff --git a/backend.native/tests/codegen/kclass/kclass0.kt b/backend.native/tests/codegen/kclass/kclass0.kt index 0e42b8ac3ea..47b6c12513b 100644 --- a/backend.native/tests/codegen/kclass/kclass0.kt +++ b/backend.native/tests/codegen/kclass/kclass0.kt @@ -11,8 +11,8 @@ fun main(args: Array) { checkClass(Any::class, "kotlin.Any", "Any", Any(), null) checkClass(Int::class, "kotlin.Int", "Int", 42, "17") checkClass(String::class, "kotlin.String", "String", "17", 42) - checkClass(RootClass::class, "RootClass", "RootClass", RootClass(), Any()) - checkClass(RootClass.Nested::class, "RootClass.Nested", "Nested", RootClass.Nested(), Any()) + checkClass(RootClass::class, "codegen.kclass.kclass0.RootClass", "RootClass", RootClass(), Any()) + checkClass(RootClass.Nested::class, "codegen.kclass.kclass0.RootClass.Nested", "Nested", RootClass.Nested(), Any()) class Local { val captured = args @@ -33,7 +33,7 @@ fun main(args: Array) { // Interfaces: checkClass(Comparable::class, "kotlin.Comparable", "Comparable", 42, Any()) - checkClass(Interface::class, "Interface", "Interface", object : Interface {}, Any()) + checkClass(Interface::class, "codegen.kclass.kclass0.Interface", "Interface", object : Interface {}, Any()) checkInstanceClass(Any(), Any::class) checkInstanceClass(42, Int::class) diff --git a/backend.native/tests/codegen/kclass/kclass1.kt b/backend.native/tests/codegen/kclass/kclass1.kt index 6c0fcb51750..de0ef99cbdd 100644 --- a/backend.native/tests/codegen/kclass/kclass1.kt +++ b/backend.native/tests/codegen/kclass/kclass1.kt @@ -40,9 +40,9 @@ class App(testQualified: Boolean) { } init { - assert(type.simpleName == "Test") + assert(type.simpleName == "TestClass") if (testQualified) - assert(type.qualifiedName == "com.github.salomonbrys.kmffkn.Test") // This is not really necessary, but always better :). + assert(type.qualifiedName == "codegen.kclass.kclass1.TestClass") // This is not really necessary, but always better :). assert(String::class == String::class) assert(String::class != Int::class) diff --git a/backend.native/tests/codegen/objectExpression/1.kt b/backend.native/tests/codegen/objectExpression/expr1.kt similarity index 86% rename from backend.native/tests/codegen/objectExpression/1.kt rename to backend.native/tests/codegen/objectExpression/expr1.kt index 716b392de51..1ba4dfcb49e 100644 --- a/backend.native/tests/codegen/objectExpression/1.kt +++ b/backend.native/tests/codegen/objectExpression/expr1.kt @@ -1,4 +1,4 @@ -package codegen.objectExpression_1 +package codegen.objectExpression.expr1 import kotlin.test.* diff --git a/backend.native/tests/codegen/objectExpression/2.kt b/backend.native/tests/codegen/objectExpression/expr2.kt similarity index 88% rename from backend.native/tests/codegen/objectExpression/2.kt rename to backend.native/tests/codegen/objectExpression/expr2.kt index 7efdaf4405b..0629dd51efe 100644 --- a/backend.native/tests/codegen/objectExpression/2.kt +++ b/backend.native/tests/codegen/objectExpression/expr2.kt @@ -1,5 +1,4 @@ -package codegen.objectExpression_2 - +package codegen.objectExpression.expr2 import kotlin.test.* @Test fun runTest() { diff --git a/backend.native/tests/codegen/objectExpression/3.kt b/backend.native/tests/codegen/objectExpression/expr3.kt similarity index 88% rename from backend.native/tests/codegen/objectExpression/3.kt rename to backend.native/tests/codegen/objectExpression/expr3.kt index 28f754e62ae..88ab491d4bf 100644 --- a/backend.native/tests/codegen/objectExpression/3.kt +++ b/backend.native/tests/codegen/objectExpression/expr3.kt @@ -1,4 +1,4 @@ -package codegen.objectExpression_3 +package codegen.objectExpression.expr3 import kotlin.test.* diff --git a/backend.native/tests/runtime/basic/main_exception.kt b/backend.native/tests/runtime/basic/main_exception.kt index a15ece10c00..072b2a684dd 100644 --- a/backend.native/tests/runtime/basic/main_exception.kt +++ b/backend.native/tests/runtime/basic/main_exception.kt @@ -1,3 +1,7 @@ -fun main(args: Array) { +package runtime.basic.main_exception + +import kotlin.test.* + +@Test fun runTest() { throw Error("Hello!") }