use kotlin Iterable/Iterator

instead of java Iterable/Iterator
in Kotlin code in tests
This commit is contained in:
Svetlana Isakova
2012-08-14 15:06:02 +04:00
parent 701295fc04
commit df93a26839
14 changed files with 25 additions and 30 deletions
@@ -1,4 +1,4 @@
package test
public abstract class ClassWithTypePExtendsIterableP<P>() : java.lang.Iterable<P> {
public abstract class ClassWithTypePExtendsIterableP<P>() : jet.Iterable<P> {
}
@@ -1,6 +1,6 @@
namespace test
public abstract class test.ClassWithTypePExtendsIterableP</*0*/ P : jet.Any?> : java.lang.Iterable<P> {
public abstract class test.ClassWithTypePExtendsIterableP</*0*/ P : jet.Any?> : jet.Iterable<P> {
public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypePExtendsIterableP<P>
public abstract override /*1*/ fun iterator(): java.util.Iterator<P>?
public abstract override /*1*/ fun iterator(): jet.Iterator<P>
}
@@ -1,3 +1,3 @@
package test
public open class ClassWithTypePRefNext<R : java.lang.Iterable<P>?, P>() : java.lang.Object()
public open class ClassWithTypePRefNext<R : jet.Iterable<P>?, P>() : java.lang.Object()
@@ -1,5 +1,5 @@
namespace test
public open class test.ClassWithTypePRefNext</*0*/ R : java.lang.Iterable<P>?, /*1*/ P : jet.Any?> : java.lang.Object {
public final /*constructor*/ fun </*0*/ R : java.lang.Iterable<P>?, /*1*/ P : jet.Any?><init>(): test.ClassWithTypePRefNext<R, P>
public open class test.ClassWithTypePRefNext</*0*/ R : jet.Iterable<P>?, /*1*/ P : jet.Any?> : java.lang.Object {
public final /*constructor*/ fun </*0*/ R : jet.Iterable<P>?, /*1*/ P : jet.Any?><init>(): test.ClassWithTypePRefNext<R, P>
}
@@ -6,7 +6,7 @@ public class InnerClassesInGeneric<P, Q> {
public class Inner {
}
public class Inner2 extends Inner implements Iterable<P> {
public class Inner2 extends Inner {
public java.util.Iterator<P> iterator() {
throw new UnsupportedOperationException();
}
@@ -4,8 +4,8 @@ public open class InnerClassesInGeneric<P, Q>() : java.lang.Object() {
public open class Inner() : java.lang.Object() {
}
public open class Inner2() : Inner(), java.lang.Iterable<P> {
override fun iterator() : java.util.Iterator<P>? {
public open class Inner2() : Inner() {
public open fun iterator() : jet.Iterator<P>? {
throw UnsupportedOperationException()
}
}
@@ -5,8 +5,8 @@ public open class test.InnerClassesInGeneric</*0*/ P : jet.Any?, /*1*/ Q : jet.A
public open class test.InnerClassesInGeneric.Inner : java.lang.Object {
public final /*constructor*/ fun <init>(): test.InnerClassesInGeneric.Inner
}
public open class test.InnerClassesInGeneric.Inner2 : test.InnerClassesInGeneric.Inner, java.lang.Iterable<P> {
public open class test.InnerClassesInGeneric.Inner2 : test.InnerClassesInGeneric.Inner {
public final /*constructor*/ fun <init>(): test.InnerClassesInGeneric.Inner2
public open override /*1*/ fun iterator(): java.util.Iterator<P>?
public open fun iterator(): jet.Iterator<P>?
}
}
@@ -12,7 +12,7 @@ public open class test.ModalityOfFakeOverrides : java.util.AbstractList<jet.Stri
public open override /*1*/ fun get(/*0*/ p0: jet.Int): jet.String?
public open override /*1*/ fun indexOf(/*0*/ p0: jet.Any?): jet.Int
public open override /*1*/ fun isEmpty(): jet.Boolean
public open override /*1*/ fun iterator(): java.util.Iterator<jet.String>?
public open override /*1*/ fun iterator(): jet.Iterator<jet.String>?
public open override /*1*/ fun lastIndexOf(/*0*/ p0: jet.Any?): jet.Int
public open override /*1*/ fun listIterator(): java.util.ListIterator<jet.String>?
public open override /*1*/ fun listIterator(/*0*/ p0: jet.Int): java.util.ListIterator<jet.String>?