Minor, package "test" in compileJavaAgainstKotlin testData

compiler/testData/compileJavaAgainstKotlin/class/ClassObject.java

@@ -1,3 +1,5 @@
+package test;
+
 class ClassObject {
     void accessToClassObject() {
         WithClassObject.object$.foo();

compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt

@@ -1,3 +1,5 @@
+package test
+
 class WithClassObject {
   class object {
     fun foo() {}

compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.java

@@ -1,3 +1,5 @@
+package test;
+
 class Simple {
     void foo() {
         new A();

compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.kt

@@ -1 +1,3 @@
+package test
+
 class A(val a: Int = 1)

compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.java

@@ -1,3 +1,5 @@
+package test;
+
 class Simple {
     void foo() {
         new A();

compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.kt

@@ -1 +1,3 @@
+package test
+
 class A(val a: Int = 1, val b: String = "default")

compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.java

@@ -1,3 +1,5 @@
+package test;
+
 class ExtendsAbstractListT {
     {
         Mine<String> mine = null;

compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.kt

@@ -1 +1,3 @@
+package test
+
 abstract class Mine<T>() : java.util.AbstractList<T>()

compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.java

@@ -1,3 +1,5 @@
+package test;
+
 
 class PlainExtendsListString {
     {

compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.kt

@@ -1 +1,3 @@
+package test
+
 abstract class Mine : java.util.List<String>

compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.java

@@ -1,3 +1,5 @@
+package test;
+
 
 class ImplementsMapPP {
     {

compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.kt

@@ -1 +1,3 @@
+package test
+
 abstract class Mine<P1, P2> : java.util.Map<P2, P1>

compiler/testData/compileJavaAgainstKotlin/class/Simple.java

@@ -1,3 +1,5 @@
+package test;
+
 class Simple {
     {
         new Impossible<String>();

compiler/testData/compileJavaAgainstKotlin/class/Simple.kt

@@ -1 +1,3 @@
+package test
+
 class Impossible<P>()

compiler/testData/compileJavaAgainstKotlin/class/kt3561.kt

@@ -3,4 +3,3 @@ package test
 enum class MyEnum {
   OK
 }
-

compiler/testData/compileJavaAgainstKotlin/method/Any.java

@@ -1,6 +1,7 @@
+package test;
 
 class Any {
     {
-        Object r = _DefaultPackage.anyany(new Object(), null);
+        Object r = TestPackage.anyany(new Object(), null);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/Any.kt

@@ -1,2 +1,4 @@
+package test
+
 // extra parameter is to preserve generic signature
 fun anyany(a: Any, ignore: java.util.List<String>) = a

compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.java

@@ -1,7 +1,9 @@
+package test;
+
 
 class ArrayOfIntArray {
     {
         int[][] a = new int[0][];
-        int[][] r = _DefaultPackage.ohMy(a);
+        int[][] r = TestPackage.ohMy(a);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.kt

@@ -1 +1,3 @@
+package test
+
 fun ohMy(p: Array<IntArray>) = p

compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.java

@@ -1,7 +1,9 @@
+package test;
+
 
 class ArrayOfIntArray {
     {
         Integer[][] a = new Integer[0][];
-        Integer[][] r = _DefaultPackage.ohMy(a, null);
+        Integer[][] r = TestPackage.ohMy(a, null);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.kt

@@ -1,2 +1,4 @@
+package test
+
 // extra parameter is to make sure generic signature is generated
 fun ohMy(p: Array<Array<Int>>, ignore: java.util.List<String>) = p

compiler/testData/compileJavaAgainstKotlin/method/DefaultMethod.java

@@ -1,6 +1,8 @@
+package test;
+
 class JavaClass {
     public static void main(String[] args) {
-        _DefaultPackage.foo$default(1, 0);
+        TestPackage.foo$default(1, 0);
     }
 
 }

compiler/testData/compileJavaAgainstKotlin/method/DefaultMethod.kt

@@ -1 +1,3 @@
+package test
+
 fun foo(a: Int = 1) {}

compiler/testData/compileJavaAgainstKotlin/method/Delegation.java

@@ -1,3 +1,5 @@
+package test;
+
 class JavaClass {
     public static void main(String[] args) {
         Test test = new Test();

compiler/testData/compileJavaAgainstKotlin/method/Delegation.kt

@@ -1,3 +1,5 @@
+package test
+
 trait Trait {
     fun foo()
     val bar: Int

compiler/testData/compileJavaAgainstKotlin/method/GenericArray.java

@@ -1,5 +1,7 @@
+package test;
+
 class GenericArray {
     public static void ggff() {
-        String[] s = _DefaultPackage.ffgg(new String[0]);
+        String[] s = TestPackage.ffgg(new String[0]);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt

@@ -1 +1,3 @@
+package test
+
 fun <P> ffgg(a: Array<P>) = a

compiler/testData/compileJavaAgainstKotlin/method/Hello.java

@@ -1,6 +1,8 @@
+package test;
+
 
 class Hello {
     public static void xx() {
-        String s = _DefaultPackage.f();
+        String s = TestPackage.f();
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/Hello.kt

@@ -1 +1,3 @@
+package test
+
 fun f() = "hello"

compiler/testData/compileJavaAgainstKotlin/method/Int.java

@@ -1,6 +1,8 @@
+package test;
+
 
 class Int {
     {
-        int r = _DefaultPackage.lll(1);
+        int r = TestPackage.lll(1);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/Int.kt

@@ -1 +1,3 @@
+package test
+
 fun lll(a: Int) = a

compiler/testData/compileJavaAgainstKotlin/method/IntArray.java

@@ -1,6 +1,8 @@
+package test;
+
 
 class IntArray {
     {
-        int[] r = _DefaultPackage.doNothing(new int[0], null);
+        int[] r = TestPackage.doNothing(new int[0], null);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/IntArray.kt

@@ -1,2 +1,4 @@
+package test
+
 // extra parameter is to make sure generic signature is not erased
 fun doNothing(array: IntArray, ignore: java.util.List<String>) = array

compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.java

@@ -1,6 +1,8 @@
+package test;
+
 
 class IntWithDefault {
     {
-        int r = _DefaultPackage.www(1);
+        int r = TestPackage.www(1);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.kt

@@ -1 +1,3 @@
+package test
+
 fun www(p: Int = 1) = p

compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.java

@@ -1,6 +1,8 @@
+package test;
+
 
 class IntArray {
     {
-        Integer[] r = _DefaultPackage.doNothing(new Integer[0], null);
+        Integer[] r = TestPackage.doNothing(new Integer[0], null);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.kt

@@ -1,2 +1,4 @@
+package test
+
 // extra parameter is to make sure generic signature is preserved
 fun doNothing(array: Array<Int>, ignore: java.util.List<String>) = array

compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.java

@@ -1,3 +1,5 @@
+package test;
+
 import java.util.List;
 import java.util.ArrayList;
 
@@ -5,7 +7,7 @@ class ListOfInt {
 
     public static void hhh() {
         List<Integer> list = new ArrayList<Integer>();
-        List<Integer> r = _DefaultPackage.ggg(list);
+        List<Integer> r = TestPackage.ggg(list);
     }
 
 }

compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt

@@ -1 +1,3 @@
+package test
+
 fun ggg(list: List<Int>) = list

compiler/testData/compileJavaAgainstKotlin/method/ListOfString.java

@@ -1,9 +1,11 @@
+package test;
+
 import java.util.List;
 import java.util.ArrayList;
 
 class ListString {
     public static void gg() {
         List<String> list = new ArrayList<String>();
-        _DefaultPackage.ff(list);
+        TestPackage.ff(list);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt

@@ -1 +1,3 @@
+package test
+
 fun ff(p: List<String>) = 1

compiler/testData/compileJavaAgainstKotlin/method/ListOfT.java

@@ -1,3 +1,5 @@
+package test;
+
 import java.util.List;
 import java.util.ArrayList;
 
@@ -5,7 +7,7 @@ class ListOfT {
 
     public static void check() {
         List<String> list = new ArrayList<String>();
-        List<String> r = _DefaultPackage.listOfT(list);
+        List<String> r = TestPackage.listOfT(list);
     }
 
 }

compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt

@@ -1 +1,3 @@
+package test
+
 fun <P> listOfT(list: List<P>) = list

compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.java

@@ -1,3 +1,5 @@
+package test;
+
 import java.util.Map;
 import java.util.HashMap;
 import java.math.BigDecimal;
@@ -6,6 +8,6 @@ class MapOfKString {
     public static void gfgdgfg() {
         Map<BigDecimal, String> map = new HashMap<BigDecimal, String>();
         
-        Map<BigDecimal, String> r = _DefaultPackage.fff(map);
+        Map<BigDecimal, String> r = TestPackage.fff(map);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt

@@ -1,2 +1,4 @@
+package test
+
 
 fun <K> fff(map: Map<K, String>) = map

compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.java

@@ -1,3 +1,5 @@
+package test;
+
 import java.util.Map;
 import java.util.HashMap;
 import java.math.BigDecimal;
@@ -6,6 +8,6 @@ class MapOfKString {
     public static void gfgdgfg() {
         Map<String, Integer> map = new HashMap<String, Integer>();
         
-        Map<String, Integer> r = _DefaultPackage.fff(map);
+        Map<String, Integer> r = TestPackage.fff(map);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt

@@ -1,2 +1,4 @@
+package test
+
 
 fun fff(map: Map<String, Int?>) = map

compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.java

@@ -1,7 +1,9 @@
+package test;
+
 class Question {
     // id2 is to prevent java type parameter type inference
     static <T> T id2(T p) { return p; }
     {
-        java.util.List<? extends String> s = id2(_DefaultPackage.id(null));
+        java.util.List<? extends String> s = id2(TestPackage.id(null));
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.kt

@@ -1 +1,3 @@
+package test
+
 fun <P1 : List<String>> id(p: P1) = p

compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.java

@@ -1,7 +1,9 @@
+package test;
+
 class Question {
     // id2 is to prevent java type parameter type inference
     static <T> T id2(T p) { return p; }
     {
-        String s = id2(_DefaultPackage.id(null));
+        String s = id2(TestPackage.id(null));
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.kt

@@ -1 +1,3 @@
+package test
+
 fun <T : String> id(p: T) = p

compiler/testData/compileJavaAgainstKotlin/method/Vararg.java

@@ -1,9 +1,11 @@
+package test;
+
 import java.util.List;
 import java.util.ArrayList;
 
 class Vararg {
     {
         List<String> list = new ArrayList<String>();
-        List<String> r = _DefaultPackage.gg(list, 3, 4, 5, 6);
+        List<String> r = TestPackage.gg(list, 3, 4, 5, 6);
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt

@@ -1 +1,3 @@
+package test
+
 fun gg(list: List<String>, vararg ints: Int) = list

compiler/testData/compileJavaAgainstKotlin/method/Void.java

@@ -1,5 +1,7 @@
+package test;
+
 class Void {
     {
-        _DefaultPackage.f();
+        TestPackage.f();
     }
 }

compiler/testData/compileJavaAgainstKotlin/method/Void.kt

@@ -1 +1,3 @@
+package test
+
 fun f() { }

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.java

@@ -1,3 +1,5 @@
+package test;
+
 class ExtendsB extends B {
     void test() {
         byte x = foo();

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.kt

@@ -1,3 +1,5 @@
+package test
+
 trait A<T> {
     fun foo(): T
 }

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.java

@@ -1,3 +1,5 @@
+package test;
+
 class Test {
     void test() {
         A<Integer> a = new B();

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.kt

@@ -1,3 +1,5 @@
+package test
+
 trait A<T> {
     fun foo(): T
 }

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.java

@@ -1,3 +1,5 @@
+package test;
+
 class Test {
     void test() {
         A<Integer> a = new B();

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.kt

@@ -1,3 +1,5 @@
+package test
+
 trait A<T> {
     fun foo(): T
 }

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.java

@@ -1,3 +1,5 @@
+package test;
+
 class Test extends B {
     void test() {
         int x = foo();

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.kt

@@ -1,3 +1,5 @@
+package test
+
 trait A {
     fun foo(): Any
 }

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.java

@@ -1,3 +1,5 @@
+package test;
+
 class Test extends B {
     void test() {
         A<Integer> a = new B();

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.kt

@@ -1,3 +1,5 @@
+package test
+
 trait A<T> {
     fun foo(): T
 }

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.java

@@ -1,3 +1,5 @@
+package test;
+
 class ExtendsB extends B {
     void test() {
         int x = foo();

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.kt

@@ -1,3 +1,5 @@
+package test
+
 trait A<T : Comparable<T>> {
     fun foo(): T
 }

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.java

@@ -1,3 +1,5 @@
+package test;
+
 class ExtendsB extends B {
     void test() {
         int x = foo();

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.kt

@@ -1,3 +1,5 @@
+package test
+
 trait A<T : Number> {
     fun foo(): T
 }

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.java

@@ -1,3 +1,5 @@
+package test;
+
 class ExtendsB extends B {
     void test() {
         int x = foo();

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.kt

@@ -1,3 +1,5 @@
+package test
+
 trait A<T> {
     fun foo(): T
 }

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.java

@@ -1,3 +1,5 @@
+package test;
+
 class ExtendsD extends D {
     void test() {
         int x = foo();

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.kt

@@ -1,3 +1,5 @@
+package test
+
 trait A<T> {
     fun foo(): T
 }

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.java

@@ -1,3 +1,5 @@
+package test;
+
 class ExtendsB extends B {
     void test() {
         int x = foo();

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.kt

@@ -1,3 +1,5 @@
+package test
+
 trait A<T> {
     fun foo(): T
 }

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.java

@@ -1,3 +1,5 @@
+package test;
+
 class ExtendsB extends B {
     @Override
     public Integer foo() {

compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.kt

@@ -1,3 +1,5 @@
+package test
+
 trait A<T> {
     fun foo(): T
 }

compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.java

@@ -1,3 +1,5 @@
+package test;
+
 class JavaClass {
     void testMethod() {
         Test test = new Test();

compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.kt

@@ -1,3 +1,5 @@
+package test
+
 class E1: Exception()
 class E2: Exception()
 

compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.java

@@ -1,3 +1,5 @@
+package test;
+
 class JavaClass {
     void testMethod() {
         new None();

compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt

@@ -1,3 +1,5 @@
+package test
+
 class E1: Exception()
 class E2: Exception()
 

compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.java

@@ -1,3 +1,5 @@
+package test;
+
 class JavaClass {
     void testMethod(One instance) {
         try {
@@ -21,12 +23,12 @@ class JavaClass {
         catch (E1 e) {}
 
         try {
-            _DefaultPackage.one(1);
+            TestPackage.one(1);
         }
         catch (E1 e) {}
 
         try {
-            _DefaultPackage.one$default(1, 0);
+            TestPackage.one$default(1, 0);
         }
         catch (E1 e) {}
     }

compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt

@@ -1,3 +1,5 @@
+package test
+
 class E1: Exception()
 
 throws(javaClass<E1>())

compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.java

@@ -1,3 +1,5 @@
+package test;
+
 class JavaClass {
     void testMethod() {
         Test test = new Test();

compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.kt

@@ -1,3 +1,5 @@
+package test
+
 class E1: Exception()
 class E2: Exception()
 

compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.java

@@ -1,3 +1,5 @@
+package test;
+
 class JavaClass {
     public static void main(String[] args) {
         try {

compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.kt

@@ -1,3 +1,5 @@
+package test
+
 class E1: Exception()
 
 trait Base<T> {

compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.java

@@ -1,14 +1,16 @@
+package test;
+
 class JavaClass {
     void testMethod() {
-        _DefaultPackage.none();
+        TestPackage.none();
 
         try {
-            _DefaultPackage.one();
+            TestPackage.one();
         }
         catch (E1 e) {}
 
         try {
-            _DefaultPackage.two();
+            TestPackage.two();
         }
         catch (E1 e) {}
         catch (E2 e) {}

compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.kt

@@ -1,3 +1,5 @@
+package test
+
 class E1: Exception()
 class E2: Exception()
 

compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.java

@@ -1,3 +1,5 @@
+package test;
+
 class JavaClass {
     void testMethod() {
         Test test = new Test();

compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.kt

@@ -1,3 +1,5 @@
+package test
+
 class E1: Exception()
 class E2: Exception()
 

compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.java

@@ -1,5 +1,7 @@
+package test;
+
 class GenericProperty {
     void foo() {
-        java.util.Map<?, ?> o = a.APackage.getTest();
+        java.util.Map<?, ?> o = TestPackage.getTest();
     }
 }

compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt

@@ -1,6 +1,6 @@
-// Tests that type variables of properties are written to the getter signature
+package test
 
-package a
+// Tests that type variables of properties are written to the getter signature
 
 val <K, V> test: Map<K, V>
     get() = java.util.HashMap()

compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.java

@@ -1,3 +1,5 @@
+package test;
+
 @AString(value = Test.vstring)
 @AChar(value = Test.vchar)
 @AInt(value = Test.vint)

compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt

@@ -1,3 +1,5 @@
+package test
+
 annotation class AString(val value: String)
 annotation class AChar(val value: Char)
 annotation class AInt(val value: Int)

compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.java

@@ -1,3 +1,5 @@
+package test;
+
 @AString(value = Test.vstring)
 @AChar(value = Test.vchar)
 @AInt(value = Test.vint)

compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt

@@ -1,3 +1,5 @@
+package test
+
 annotation class AString(val value: String)
 annotation class AChar(val value: Char)
 annotation class AInt(val value: Int)

compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.java

@@ -1,3 +1,5 @@
+package test;
+
 public class kt3698 {
 
     @interface Foo {

compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt

@@ -1,3 +1,5 @@
+package test
+
 class KotlinClass {
     class object {
         val FOO: Int = 10

compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.java

@@ -1,3 +1,5 @@
+package test;
+
 class staticClassProperty {
 
     public static void main(String[] args) {