Fixes to tests: forgotten package names and tests

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.*
 

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.*
 

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.*
 

backend.native/tests/codegen/branching/when2.kt

@@ -1,4 +1,4 @@
-package codegen.boxing.when2
+package codegen.branching.when2
 
 import kotlin.test.*
 

backend.native/tests/codegen/branching/when4.kt

@@ -1,4 +1,4 @@
-package codegen.boxing.when4
+package codegen.branching.when4
 
 import kotlin.test.*
 

backend.native/tests/codegen/branching/when5.kt

@@ -1,4 +1,4 @@
-package codegen.boxing.when5
+package codegen.branching.when5
 
 import kotlin.test.*
 

backend.native/tests/codegen/branching/when6.kt

@@ -1,4 +1,4 @@
-package codegen.boxing.when6
+package codegen.branching.when6
 
 import kotlin.test.*
 

backend.native/tests/codegen/branching/when7.kt

@@ -1,4 +1,4 @@
-package codegen.boxing.when7
+package codegen.branching.when7
 
 import kotlin.test.*
 

backend.native/tests/codegen/branching/when8.kt

@@ -1,4 +1,4 @@
-package codegen.boxing.when8
+package codegen.branching.when8
 
 import kotlin.test.*
 

backend.native/tests/codegen/branching/when9.kt

@@ -1,4 +1,4 @@
-package codegen.boxing.when9
+package codegen.branching.when9
 
 import kotlin.test.*
 

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.*
 

backend.native/tests/codegen/kclass/kclass0.kt

@@ -11,8 +11,8 @@ fun main(args: Array<String>) {
     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<String>) {
 
     // 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)

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)

backend.native/tests/codegen/objectExpression/expr1.kt

@@ -1,4 +1,4 @@
-package codegen.objectExpression_1
+package codegen.objectExpression.expr1
 
 import kotlin.test.*
 

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() {

backend.native/tests/codegen/objectExpression/expr3.kt

@@ -1,4 +1,4 @@
-package codegen.objectExpression_3
+package codegen.objectExpression.expr3
 
 import kotlin.test.*