Fixed test data for ReadJavaBinaryClassTest, avoiding "package" visibility.

2012-06-15 22:43:08 +04:00
parent c389264a21
commit da1aceb090
83 changed files with 152 additions and 172 deletions
@@ -1,4 +1,4 @@
 package test;

-abstract class ClassDoesNotOverrideMethod extends java.util.Date {
+public abstract class ClassDoesNotOverrideMethod extends java.util.Date {
 }
@@ -1,4 +1,4 @@
 package test

-abstract class ClassDoesNotOverrideMethod() : java.util.Date() {
+public abstract class ClassDoesNotOverrideMethod() : java.util.Date() {
 }
@@ -1,4 +1,4 @@
 package test;

-final class ClassWithTypeParameter<P> {
+public final class ClassWithTypeP<P> {
 }
@@ -1,4 +1,4 @@
 package test

-class ClassWithTypeParameter<P>() : java.lang.Object() {
+public class ClassWithTypeP<P>() : java.lang.Object() {
 }
@@ -1,4 +1,4 @@
 package test;

-abstract class ClassTypeTypePRefSuper<P> implements java.lang.Iterable<P> {
+public abstract class ClassTypeTypePRefSuper<P> implements java.lang.Iterable<P> {
 }
@@ -1,4 +1,4 @@
 package test

-abstract class ClassTypeTypePRefSuper<P>() : java.lang.Iterable<P> {
+public abstract class ClassTypeTypePRefSuper<P>() : java.lang.Iterable<P> {
 }
@@ -1,4 +1,4 @@
 package test;

-final class ClassWithTypeParameter<P, Q extends P> {
+public final class ClassWithTypePP<P, Q extends P> {
 }
@@ -1,4 +1,4 @@
 package test

-class ClassWithTypeParameter<P, Q : P>() : java.lang.Object() {
+public class ClassWithTypePP<P, Q : P>() : java.lang.Object() {
 }
@@ -1,7 +1,4 @@
 package test;

-interface Foo<Q> {
-}
-
-class ClassWithTypePRefNext<R extends Foo<P>, P> {
+public class ClassWithTypePRefNext<R extends Iterable<P>, P> {
 }
@@ -1,5 +1,3 @@
 package test

-trait Foo<Q> : java.lang.Object
-
-open class ClassWithTypePRefNext<R : Foo<P>?, P>() : java.lang.Object()
+public open class ClassWithTypePRefNext<R : java.lang.Iterable<P>?, P>() : java.lang.Object()
@@ -1,4 +1,4 @@
 package test;

-final class ClassWithTypePRefSelf<P extends Enum<P>> {
+public final class ClassWithTypePRefSelf<P extends Enum<P>> {
 }
@@ -1,4 +1,4 @@
 package test

-class ClassWithTypePRefSelf<P : java.lang.Enum<P>?>() : java.lang.Object() {
+public class ClassWithTypePRefSelf<P : java.lang.Enum<P>?>() : java.lang.Object() {
 }
@@ -1,5 +1,5 @@
 package test;

-final class FieldAsVar {
+public final class FieldAsVar {
    public int f;
 }
@@ -1,5 +1,5 @@
 package test

-class FieldAsVar() : java.lang.Object() {
-    var f: Int = 1
+public class FieldAsVar() : java.lang.Object() {
+    public var f: Int = 1
 }
@@ -1,5 +1,5 @@
 package test;

-class FieldOfArrayType {
+public class FieldOfArrayType {
    public java.io.File[] files;
 }
@@ -1,5 +1,5 @@
 package test

-open class FieldOfArrayType() : java.lang.Object() {
-    var files: Array<java.io.File?>? = null
+public open class FieldOfArrayType() : java.lang.Object() {
+    public var files: Array<java.io.File?>? = null
 }
@@ -1,5 +1,5 @@
 package test;

-final class FinalFieldAsVal {
+public final class FinalFieldAsVal {
    public final int f = 1;
 }
@@ -1,5 +1,5 @@
 package test

-class FinalFieldAsVal() : java.lang.Object() {
-    val f: Int = 1
+public class FinalFieldAsVal() : java.lang.Object() {
+    public val f: Int = 1
 }
@@ -1,6 +1,6 @@
 package test;

-class Outer {
-    class Inner {
+public class InnerClass {
+    public class Inner {
    }
 }
@@ -1,5 +1,5 @@
 package test

-open class Outer() : java.lang.Object() {
-    open class Inner() : java.lang.Object()
+public open class InnerClass() : java.lang.Object() {
+    public open class Inner() : java.lang.Object()
 }
@@ -1,6 +1,6 @@
 package test;

-class Outer<P> {
-    class Inner<Q extends P> {
+public class InnerClassReferencesOuterTP<P> {
+    public class Inner<Q extends P> {
    }
 }
@@ -1,5 +1,5 @@
 package test

-open class Outer<P>() : java.lang.Object() {
-    open class Inner<Q : P>() : java.lang.Object()
+public open class InnerClassReferencesOuterTP<P>() : java.lang.Object() {
+    public open class Inner<Q : P>() : java.lang.Object()
 }
@@ -1,12 +1,14 @@
 package test;

-interface Trait<P> {
-}
+import java.lang.UnsupportedOperationException;

-class Outer<P, Q> {
-    class Inner {
+public class InnerClassesInGeneric<P, Q> {
+    public class Inner {
    }
    
-    class Inner2 extends Inner implements Trait<P> {
+    public class Inner2 extends Inner implements Iterable<P> {
+        public java.util.Iterator<P> iterator() {
+            throw new UnsupportedOperationException();
+        }
    }
 }
@@ -1,11 +1,12 @@
 package test

-trait Trait<P> : java.lang.Object
-
-open class Outer<P, Q>() : java.lang.Object() {
-    open class Inner() : java.lang.Object() {
+public open class InnerClassesInGeneric<P, Q>() : java.lang.Object() {
+    public open class Inner() : java.lang.Object() {
    }
    
-    open class Inner2() : Inner(), Trait<P> {
+    public open class Inner2() : Inner(), java.lang.Iterable<P> {
+        override fun iterator() : java.util.Iterator<P>? {
+            throw UnsupportedOperationException()
+        }
    }
 }
@@ -1,7 +1,7 @@
 package test;

-final class Outer<P> {
-    final class Inner {
-        final <Q extends P> void f() {}
+public final class MethodReferencesOuterClassTP<P> {
+    public final class Inner {
+        public final <Q extends P> void f() {}
    }
 }
@@ -1,7 +1,7 @@
 package test

-class Outer<P>() : java.lang.Object() {
-    class Inner() : java.lang.Object() {
-        fun f<Q : P>() {}
+public class MethodReferencesOuterClassTP<P>() : java.lang.Object() {
+    public class Inner() : java.lang.Object() {
+        public fun f<Q : P>() {}
    }
 }
@@ -1,7 +1,5 @@
 package test;

-interface Foo {}
-
-class MethodTypePOneUpperBound {
-    <T extends Foo> void bar() {}
+public class MethodTypePOneUpperBound {
+    public <T extends Cloneable> void bar() {}
 }
@@ -1,7 +1,5 @@
 package test

-trait Foo : java.lang.Object
-
-open class MethodTypePOneUpperBound() : java.lang.Object() {
-    open fun <T : Foo?> bar() = #()
+public open class MethodTypePOneUpperBound() : java.lang.Object() {
+    public open fun <T : Cloneable?> bar() : Unit = #()
 }
@@ -1,8 +1,5 @@
 package test;

-interface Foo {}
-interface Bar {}
-
-class MethodTypePTwoUpperBounds {
-    <T extends Foo & Bar> void foo() {}
+public class MethodTypePTwoUpperBounds {
+    public <T extends Cloneable & Runnable> void foo() {}
 }
@@ -1,10 +1,7 @@
 package test

-trait Foo : java.lang.Object
-trait Bar : java.lang.Object
-
-open class MethodTypePTwoUpperBounds() : java.lang.Object() {
-    open fun <T> foo(): Unit
-        where T : Foo?, T : Bar?
-    {}
+public open class MethodTypePTwoUpperBounds() : java.lang.Object() {
+    public open fun <T> foo(): Unit where T : Cloneable?, T : Runnable? {
+        override fun run() = throw UnsupportedOperationException()
+    }
 }
@@ -1,5 +1,5 @@
 package test;

-final class MethodWithTypeP {
+public final class MethodWithTypeP {
    public final <P> void f() {}
 }
@@ -1,5 +1,5 @@
 package test

-class MethodWithTypeP() : java.lang.Object() {
-    fun <P> f() = #()
+public class MethodWithTypeP() : java.lang.Object() {
+    public fun <P> f() : Unit = #()
 }
@@ -1,5 +1,5 @@
 package test;

-final class MethodWithTypePP {
+public final class MethodWithTypePP {
    public final <P, Q extends P> void f() {}
 }
@@ -1,5 +1,5 @@
 package test

-class MethodWithTypePP() : java.lang.Object() {
-    fun <P, Q : P> f() = #()
+public class MethodWithTypePP() : java.lang.Object() {
+    public fun <P, Q : P> f() : Unit = #()
 }
@@ -1,5 +1,5 @@
 package test;

-class MethodWithTypePRefClassP<P> {
+public class MethodWithTypePRefClassP<P> {
    public final <Q extends P> void f() {}
 }
@@ -1,5 +1,5 @@
 package test

-open class MethodWithTypePRefClassP<P>() : java.lang.Object() {
-    fun <Q : P> f() = #()
+public open class MethodWithTypePRefClassP<P>() : java.lang.Object() {
+    public fun <Q : P> f() : Unit = #()
 }
@@ -1,5 +1,5 @@
 package test;

-final class MethosWithPRefTP {
+public final class MethosWithPRefTP {
    public final <P> void f(P p) {}
 }
@@ -1,5 +1,5 @@
 package test

-final class MethosWithPRefTP() : java.lang.Object() {
-    fun <P> f(p0: P?) = #()
+public final class MethosWithPRefTP() : java.lang.Object() {
+    public fun <P> f(p0: P?) : Unit = #()
 }
@@ -2,6 +2,6 @@

 package test;

-class MyException {
-    MyException(String message, Throwable cause) {}
+public class MyException {
+    public MyException(String message, Throwable cause) {}
 }
@@ -1,3 +1,3 @@
 package test

-open class MyException(p0: String?, p1: Throwable?) : java.lang.Object()
+public open class MyException(p0: String?, p1: Throwable?) : java.lang.Object()
@@ -1,3 +1,3 @@
 package test

-class Simple() : java.lang.Object()
+public class Simple() : java.lang.Object()
@@ -1,6 +1,6 @@
 package test;

-final class TwoFields {
-    int a;
-    short b;
+public final class TwoFields {
+    public int a;
+    public short b;
 }
@@ -1,6 +1,6 @@
 package test

-class TwoFields() : java.lang.Object() {
-    var a: Int = 1
-    var b: Short = 2;
+public class TwoFields() : java.lang.Object() {
+    public var a: Int = 1
+    public var b: Short = 2;
 }
@@ -2,5 +2,5 @@ package test;

@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS)
@AnnotatedAnnotation
-@interface AnnotatedAnnotation {
+public @interface AnnotatedAnnotation {
 }
@@ -1,4 +1,4 @@
 package test

 [AnnotatedAnnotation]
-annotation class AnnotatedAnnotation
+public annotation class AnnotatedAnnotation
@@ -1,12 +1,6 @@
 package test;

-import java.lang.annotation.*;
-
-@Retention(RetentionPolicy.CLASS)
-@interface Aaa {
-}
-
-class HasAnnotatedMethod {
-    @Aaa
+public class AnnotatedMethod {
+    @Deprecated
    public void f() { }
 }
@@ -1,7 +1,5 @@
 package test

-annotation class Aaa
-
-open class HasAnnotatedMethod() : java.lang.Object() {
-    open Aaa fun f(): Unit { }
+public open class AnnotatedMethod() : java.lang.Object() {
+    public open Deprecated fun f(): Unit { }
 }
@@ -1,4 +1,4 @@
 package test;

-@interface SimpleAnnotation {
+public @interface SimpleAnnotation {
 }
@@ -1,3 +1,3 @@
 package test

-annotation class SimpleAnnotation
+public annotation class SimpleAnnotation
@@ -1,5 +1,5 @@
 package test;

-class ConstructorGenericDeep {
-    <P> ConstructorGenericDeep(java.lang.Class<P> cl) {}
+public class ConstructorGenericDeep {
+    public <P> ConstructorGenericDeep(java.lang.Class<P> cl) {}
 }
@@ -1,3 +1,3 @@
 package test

-open class ConstructorGenericDeep(p0: java.lang.Class<Any?>?) : java.lang.Object()
+public open class ConstructorGenericDeep(p0: java.lang.Class<Any?>?) : java.lang.Object()
@@ -1,5 +1,5 @@
 package test;

-class ConstructorGenericSimple {
-    <P> ConstructorGenericSimple(P p) {}
+public class ConstructorGenericSimple {
+    public <P> ConstructorGenericSimple(P p) {}
 }
@@ -1,3 +1,3 @@
 package test

-open class ConstructorGenericSimple(p0: Any?) : java.lang.Object()
+public open class ConstructorGenericSimple(p0: Any?) : java.lang.Object()
@@ -1,5 +1,5 @@
 package test;

-class ConstructorGenericUpperBound {
-    <P extends java.util.RandomAccess> ConstructorGenericUpperBound(P p) {}
+public class ConstructorGenericUpperBound {
+    public <P extends java.util.RandomAccess> ConstructorGenericUpperBound(P p) {}
 }
@@ -1,3 +1,3 @@
 package test

-open class ConstructorGenericUpperBound(p0: java.util.RandomAccess?) : java.lang.Object()
+public open class ConstructorGenericUpperBound(p0: java.util.RandomAccess?) : java.lang.Object()
@@ -1,6 +1,6 @@
 package test;

-class DifferentGetterAndSetter {
-    void setSomething(String color) { }
-    int getSomething() { return 17; }
+public class DifferentGetterAndSetter {
+    public void setSomething(String color) { }
+    public int getSomething() { return 17; }
 }
@@ -1,6 +1,6 @@
 package test

-open class DifferentGetterAndSetter() : java.lang.Object() {
-    open fun setSomething(p0: String?): Unit { }
-    open fun getSomething() = 17
+public open class DifferentGetterAndSetter() : java.lang.Object() {
+    public open fun setSomething(p0: String?): Unit { }
+    public open fun getSomething() : Int = 17
 }
@@ -1,5 +1,5 @@
 package test;

-interface JavaBeanAbstractGetter {
-    int getRed();
+public interface JavaBeanAbstractGetter {
+    public int getRed();
 }
@@ -1,6 +1,6 @@
 package test

-trait JavaBeanAbstractGetter : java.lang.Object {
+public trait JavaBeanAbstractGetter : java.lang.Object {
    //final val red: Int
-    abstract fun getRed(): Int
+    public abstract fun getRed(): Int
 }
@@ -1,5 +1,5 @@
 package test;

-class JavaBeanVal {
-    String getColor() { return ""; }
+public class JavaBeanVal {
+    public String getColor() { return ""; }
 }
@@ -1,6 +1,6 @@
 package test

-open class JavaBeanVal() : java.lang.Object() {
-    open fun getColor(): String? = ""
+public open class JavaBeanVal() : java.lang.Object() {
+    public open fun getColor(): String? = ""
    //val color: String? = ""
 }
@@ -1,6 +1,6 @@
 package test;

-class JavaBeanVal {
-    String getColor() { return ""; }
-    void setColor(String string) { }
+public class JavaBeanVar {
+    public String getColor() { return ""; }
+    public void setColor(String string) { }
 }
@@ -1,7 +1,7 @@
 package test

-open class JavaBeanVal() : java.lang.Object() {
-    open fun getColor(): String? = ""
-    open fun setColor(p0: String?): Unit { }
+public open class JavaBeanVar() : java.lang.Object() {
+    public open fun getColor(): String? = ""
+    public open fun setColor(p0: String?): Unit { }
    //var color: String? = ""
 }
@@ -2,7 +2,7 @@ package test;

 import java.util.ArrayList;

-class JavaBeanVarOfGenericType<P> {
-    ArrayList<P> getCharacters() { return null; }
-    void setCharacters(ArrayList<P> characters) { }
+public class JavaBeanVarOfGenericType<P> {
+    public ArrayList<P> getCharacters() { return null; }
+    public void setCharacters(ArrayList<P> characters) { }
 }
@@ -2,8 +2,8 @@ package test

 import java.util.ArrayList

-open class JavaBeanVarOfGenericType<P>() : java.lang.Object() {
-    open fun getCharacters(): ArrayList<P>? = null
-    open fun setCharacters(p0: ArrayList<P>?) { }
+public open class JavaBeanVarOfGenericType<P>() : java.lang.Object() {
+    public open fun getCharacters(): ArrayList<P>? = null
+    public open fun setCharacters(p0: ArrayList<P>?) { }
    //var characters: ArrayList<P>? = null
 }
@@ -1,6 +1,6 @@
 package test;

-class TwoSetters {
-    void setSize(String size) { }
-    void setSize(int size) { }
+public class TwoSetters {
+    public void setSize(String size) { }
+    public void setSize(int size) { }
 }
@@ -1,6 +1,6 @@
 package test

-open class TwoSetters() : java.lang.Object() {
-    open fun setSize(p0: String?) { }
-    open fun setSize(p0: Int) { }
+public open class TwoSetters() : java.lang.Object() {
+    public open fun setSize(p0: String?) { }
+    public open fun setSize(p0: Int) { }
 }
@@ -3,7 +3,7 @@ package test
 import java.util.*

 public open class MethodWithFunctionTypes : Object() {
-    open fun foo(p0 : (String?) -> String) : (String.() -> String?)? {
+    public open fun foo(p0 : (String?) -> String) : (String.() -> String?)? {
        throw UnsupportedOperationException()
    }
 }
@@ -3,5 +3,5 @@ package test
 import java.util.*

 public open class MethodWithGenerics : Object() {
-    open fun foo(p0 : String, p1 : List<Map.Entry<String?, String>?>) : String = ""
+    public open fun foo(p0 : String, p1 : List<Map.Entry<String?, String>?>) : String = ""
 }
@@ -3,7 +3,7 @@ package test
 import java.util.*

 public open class MethodWithTupleType : Object() {
-    open fun foo(p0 : Tuple2<String, String?>) { // writing Tuple2<..> instead of #(..), because the latter
+    public open fun foo(p0 : Tuple2<String, String?>) { // writing Tuple2<..> instead of #(..), because the latter
                                                 // adds unnecessary "out" keywords
    }
 }
@@ -3,6 +3,6 @@ package test
 import java.util.*

 public open class MethodWithTypeParameters : Object() {
-    open fun <erased A, erased B : Runnable> foo(p0 : A, p1 : List<out B>, p2: List<in String?>) where B : List<Cloneable> {
+    public open fun <erased A, erased B : Runnable> foo(p0 : A, p1 : List<out B>, p2: List<in String?>) where B : List<Cloneable> {
    }
 }
@@ -3,7 +3,7 @@ package test
 import java.util.*

 public open class MethodWithVararg : Object() {
-    open fun foo(vararg p0 : String) {
+    public open fun foo(vararg p0 : String) {
        throw UnsupportedOperationException()
    }
 }
@@ -3,7 +3,7 @@ package test
 import java.util.*

 public open class SyntaxError : Object() {
-    open fun foo() : Int? {
+    public open fun foo() : Int? {
        throw UnsupportedOperationException()
    }
 }
@@ -2,7 +2,7 @@ package test;

 import org.jetbrains.annotations.NotNull;

-class NotNullField {
+public class NotNullField {
    @NotNull
    public String hi;
 }
@@ -1,5 +1,5 @@
 package test;

-open class NotNullField() : java.lang.Object() {
-    var hi: String = "";
+public open class NotNullField() : java.lang.Object() {
+    public var hi: String = "";
 }
@@ -2,7 +2,7 @@ package test;

 import org.jetbrains.annotations.NotNull;

-class NotNullMethod {
+public class NotNullMethod {
    @NotNull
    public String hi() { return ""; }
 }
@@ -1,5 +1,5 @@
 package test

-open class NotNullMethod() : java.lang.Object() {
-    open fun hi(): String = ""
+public open class NotNullMethod() : java.lang.Object() {
+    public open fun hi(): String = ""
 }
@@ -2,6 +2,6 @@ package test;

 import org.jetbrains.annotations.NotNull;

-class NotNullParameter {
+public class NotNullParameter {
    public void hi(@NotNull String param) { }
 }
@@ -1,5 +1,5 @@
 package test

-open class NotNullParameter() : java.lang.Object() {
-    open fun hi(p0: String): Unit { }
+public open class NotNullParameter() : java.lang.Object() {
+    public open fun hi(p0: String): Unit { }
 }
@@ -1,5 +1,5 @@
 package test;

-class VarargInt {
-    void vararg(int... p) {}
+public class VarargInt {
+    public void vararg(int... p) {}
 }
@@ -1,5 +1,5 @@
 package test

-open class VarargInt() : java.lang.Object() {
-    open fun vararg(vararg p0: Int): Unit = #()
+public open class VarargInt() : java.lang.Object() {
+    public open fun vararg(vararg p0: Int): Unit = #()
 }
@@ -1,5 +1,5 @@
 package test;

-class VarargString {
-    void vararg(String... strings) {}
+public class VarargString {
+    public void vararg(String... strings) {}
 }
@@ -1,5 +1,5 @@
 package test

-open class VarargString() : java.lang.Object() {
-    open fun vararg(vararg p0: String?): Unit = #()
+public open class VarargString() : java.lang.Object() {
+    public open fun vararg(vararg p0: String?): Unit = #()
 }