Enabled ClassWithTypePExtendsIterableP in ReadJavaBinaryClassTest, disabled attaching jdk-headers in lazy resolve tests.

This commit is contained in:
Evgeny Gerashchenko
2012-06-20 20:26:03 +04:00
parent edb293eca9
commit aed160e02a
5 changed files with 10 additions and 10 deletions
@@ -0,0 +1,4 @@
package test;
public abstract class ClassWithTypePExtendsIterableP<P> implements java.lang.Iterable<P> {
}
@@ -1,4 +0,0 @@
package test;
public abstract class ClassTypeTypePRefSuper<P> implements java.lang.Iterable<P> {
}
@@ -1,4 +1,4 @@
package test package test
public abstract class ClassTypeTypePRefSuper<P>() : java.lang.Iterable<P> { public abstract class ClassWithTypePExtendsIterableP<P>() : java.lang.Iterable<P> {
} }
@@ -1,6 +1,6 @@
namespace test namespace test
public abstract class test.ClassTypeTypePRefSuper</*0*/ P : jet.Any?> : java.lang.Iterable<P> { public abstract class test.ClassWithTypePExtendsIterableP</*0*/ P : jet.Any?> : java.lang.Iterable<P> {
public abstract override /*1*/ fun iterator(): java.util.Iterator<P> public abstract override /*1*/ fun iterator(): java.util.Iterator<P>?
public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassTypeTypePRefSuper<P> public final /*constructor*/ fun </*0*/ P : jet.Any?><init>(): test.ClassWithTypePExtendsIterableP<P>
} }
@@ -40,7 +40,7 @@ import java.util.Collections;
/** /**
* @author abreslav * @author abreslav
*/ */
public class AbstractLazyResolveTest { public abstract class AbstractLazyResolveTest {
private final Disposable rootDisposable = new Disposable() { private final Disposable rootDisposable = new Disposable() {
@Override @Override
public void dispose() { public void dispose() {
@@ -48,7 +48,7 @@ public class AbstractLazyResolveTest {
}; };
protected final CompilerDependencies protected final CompilerDependencies
compilerDependencies = CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.REGULAR, true); compilerDependencies = CompileCompilerDependenciesTest.compilerDependenciesForTests(CompilerSpecialMode.JDK_HEADERS, true);
protected final JetCoreEnvironment jetCoreEnvironment = new JetCoreEnvironment(rootDisposable, compilerDependencies); protected final JetCoreEnvironment jetCoreEnvironment = new JetCoreEnvironment(rootDisposable, compilerDependencies);
protected final Project project = jetCoreEnvironment.getProject(); protected final Project project = jetCoreEnvironment.getProject();