Cleanup (test data format)

testData/results/TestPrivateEmptyConstructor.dec

@@ -1,3 +1,5 @@
+package pkg;
+
 public final class TestPrivateEmptyConstructor {
    private TestPrivateEmptyConstructor() {
    }// 4
@@ -7,20 +9,20 @@ public final class TestPrivateEmptyConstructor {
    }// 8
 }
 
-class 'TestPrivateEmptyConstructor' {
+class 'pkg/TestPrivateEmptyConstructor' {
    method '<init> ()V' {
-      4      2
+      4      4
    }
 
    method 'test ()V' {
-      0      5
+      0      7
-      3      5
+      3      7
-      5      5
+      5      7
-      8      6
+      8      8
    }
 }
 
 Lines mapping:
-4 <-> 3
+4 <-> 5
-7 <-> 6
+7 <-> 8
-8 <-> 7
+8 <-> 9

testData/results/TestSynchronizedUnprotected.dec

@@ -1,25 +1,42 @@
+package pkg;
+
+import kotlin.Metadata;
+import kotlin.Unit;
+
+@Metadata(
+   mv = {1, 1, 11},
+   bv = {1, 0, 2},
+   k = 1,
+   xi = 2,
+   d1 = {"\u0000\u0010\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\b\u0002\n\u0002\u0010\u0002\u0018\u00002\u00020\u0001B\u0005¢\u0006\u0002\u0010\u0002J\u0006\u0010\u0003\u001a\u00020\u0004"},
+   d2 = {"Lpkg/TestSynchronizedUnprotected;", "", "()V", "test", ""}
+)
 public final class TestSynchronizedUnprotected {
    public final void test() {
-      synchronized(this) {// 5
+      synchronized(this) {
-         System.out.println("test");// 6
+         String var2 = "Boom";// 6
+         System.out.println(var2);
+         Unit var3 = Unit.INSTANCE;// 5 7
+      }
    }
-   }// 7
 }
 
-class 'TestSynchronizedUnprotected' {
+class 'pkg/TestSynchronizedUnprotected' {
    method 'test ()V' {
-      3      2
+      3      15
-      4      3
+      5      16
-      7      3
+      7      16
-      9      3
+      8      17
-      e      5
+      c      17
+      f      18
+      12      18
+      15      20
    }
 }
 
 Lines mapping:
-5 <-> 3
+5 <-> 19
-6 <-> 4
+6 <-> 17
-7 <-> 6
+7 <-> 19
 Not mapped:
 8
-

testData/src/pkg/TestPrivateEmptyConstructor.java

@@ -1,11 +1,9 @@
 package pkg;
 
-public final class PrivateEmptyConstructor {
+public final class TestPrivateEmptyConstructor {
-
+   private TestPrivateEmptyConstructor() {}
-   private PrivateEmptyConstructor() {}
 
    public final void test() {
 		System.out.println("test");
    }
 }
-

testData/src/pkg/TestSynchronizedUnprotected.kt

@@ -1,5 +1,6 @@
+package pkg
 
-object TestSynchronizedUnprotected {
+class TestSynchronizedUnprotected {
     fun test() {
         synchronized(this) {
             println("Boom")