Revert "enhance tests (mostly codegen)" temporarily
This reverts commit 95f9bcbacb.
This commit is contained in:
Stepan Koltsov
@@ -16,8 +16,6 @@
|
||||
|
||||
package org.jetbrains.jet.codegen;
|
||||
|
||||
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Method;
|
||||
import java.lang.reflect.Modifier;
|
||||
@@ -28,14 +26,7 @@ import java.util.List;
|
||||
* @author alex.tkachman
|
||||
*/
|
||||
public class ClassGenTest extends CodegenTestCase {
|
||||
|
||||
@Override
|
||||
protected void setUp() throws Exception {
|
||||
super.setUp();
|
||||
}
|
||||
|
||||
public void testPSVMClass() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
loadFile("classes/simpleClass.jet");
|
||||
|
||||
final Class aClass = loadClass("SimpleClass", generateClassesInFile());
|
||||
@@ -46,7 +37,6 @@ public class ClassGenTest extends CodegenTestCase {
|
||||
}
|
||||
|
||||
public void testArrayListInheritance() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
loadFile("classes/inheritingFromArrayList.jet");
|
||||
// System.out.println(generateToText());
|
||||
final Class aClass = loadClass("Foo", generateClassesInFile());
|
||||
@@ -54,37 +44,30 @@ public class ClassGenTest extends CodegenTestCase {
|
||||
}
|
||||
|
||||
public void testInheritanceAndDelegation_DelegatingDefaultConstructorProperties() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/inheritance.jet");
|
||||
}
|
||||
|
||||
public void testInheritanceAndDelegation2() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/delegation2.kt");
|
||||
}
|
||||
|
||||
public void testFunDelegation() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/funDelegation.jet");
|
||||
}
|
||||
|
||||
public void testPropertyDelegation() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/propertyDelegation.jet");
|
||||
}
|
||||
|
||||
public void testDiamondInheritance() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/diamondInheritance.jet");
|
||||
}
|
||||
|
||||
public void testRightHandOverride() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/rightHandOverride.jet");
|
||||
}
|
||||
|
||||
public void testNewInstanceExplicitConstructor() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
loadFile("classes/newInstanceDefaultConstructor.jet");
|
||||
// System.out.println(generateToText());
|
||||
final Method method = generateFunction("test");
|
||||
@@ -93,22 +76,18 @@ public class ClassGenTest extends CodegenTestCase {
|
||||
}
|
||||
|
||||
public void testInnerClass() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/innerClass.jet");
|
||||
}
|
||||
|
||||
public void testInheritedInnerClass() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/inheritedInnerClass.jet");
|
||||
}
|
||||
|
||||
public void testInitializerBlock() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/initializerBlock.jet");
|
||||
}
|
||||
|
||||
public void testAbstractMethod() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
loadText("abstract class Foo { abstract fun x(): String; fun y(): Int = 0 }");
|
||||
|
||||
final ClassFileFactory codegens = generateClassesInFile();
|
||||
@@ -118,42 +97,34 @@ public class ClassGenTest extends CodegenTestCase {
|
||||
}
|
||||
|
||||
public void testInheritedMethod() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/inheritedMethod.jet");
|
||||
}
|
||||
|
||||
public void testInitializerBlockDImpl() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/initializerBlockDImpl.jet");
|
||||
}
|
||||
|
||||
public void testPropertyInInitializer() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/propertyInInitializer.jet");
|
||||
}
|
||||
|
||||
public void testOuterThis() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/outerThis.jet");
|
||||
}
|
||||
|
||||
public void testSecondaryConstructors() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/secondaryConstructors.jet");
|
||||
}
|
||||
|
||||
public void testExceptionConstructor() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/exceptionConstructor.jet");
|
||||
}
|
||||
|
||||
public void testSimpleBox() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/simpleBox.jet");
|
||||
}
|
||||
|
||||
public void testAbstractClass() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
loadText("abstract class SimpleClass() { }");
|
||||
|
||||
final Class aClass = createClassLoader(generateClassesInFile()).loadClass("SimpleClass");
|
||||
@@ -161,18 +132,15 @@ public class ClassGenTest extends CodegenTestCase {
|
||||
}
|
||||
|
||||
public void testClassObject() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/classObject.jet");
|
||||
}
|
||||
|
||||
public void testClassObjectMethod() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
// todo to be implemented after removal of type info
|
||||
// blackBoxFile("classes/classObjectMethod.jet");
|
||||
}
|
||||
|
||||
public void testClassObjectInterface() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
loadFile("classes/classObjectInterface.jet");
|
||||
final Method method = generateFunction();
|
||||
Object result = method.invoke(null);
|
||||
@@ -180,32 +148,26 @@ public class ClassGenTest extends CodegenTestCase {
|
||||
}
|
||||
|
||||
public void testOverloadBinaryOperator() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/overloadBinaryOperator.jet");
|
||||
}
|
||||
|
||||
public void testOverloadUnaryOperator() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/overloadUnaryOperator.jet");
|
||||
}
|
||||
|
||||
public void testOverloadPlusAssign() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/overloadPlusAssign.jet");
|
||||
}
|
||||
|
||||
public void testOverloadPlusAssignReturn() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/overloadPlusAssignReturn.jet");
|
||||
}
|
||||
|
||||
public void testOverloadPlusToPlusAssign() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/overloadPlusToPlusAssign.jet");
|
||||
}
|
||||
|
||||
public void testEnumClass() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
loadText("enum class Direction { NORTH; SOUTH; EAST; WEST }");
|
||||
final Class direction = createClassLoader(generateClassesInFile()).loadClass("Direction");
|
||||
// System.out.println(generateToText());
|
||||
@@ -215,7 +177,6 @@ public class ClassGenTest extends CodegenTestCase {
|
||||
}
|
||||
|
||||
public void testEnumConstantConstructors() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
loadText("enum class Color(val rgb: Int) { RED: Color(0xFF0000); GREEN: Color(0x00FF00); }");
|
||||
final Class colorClass = createClassLoader(generateClassesInFile()).loadClass("Color");
|
||||
final Field redField = colorClass.getField("RED");
|
||||
@@ -225,25 +186,21 @@ public class ClassGenTest extends CodegenTestCase {
|
||||
}
|
||||
|
||||
public void testClassObjFields() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
loadText("class A() { class object { val value = 10 } }\n" +
|
||||
"fun box() = if(A.value == 10) \"OK\" else \"fail\"");
|
||||
blackBox();
|
||||
}
|
||||
|
||||
public void testKt249() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt249.jet");
|
||||
}
|
||||
|
||||
public void testKt48 () throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt48.jet");
|
||||
// System.out.println(generateToText());
|
||||
}
|
||||
|
||||
public void testKt309 () throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
loadText("fun box() = null");
|
||||
final Method method = generateFunction("box");
|
||||
assertEquals(method.getReturnType().getName(), "java.lang.Object");
|
||||
@@ -251,73 +208,60 @@ public class ClassGenTest extends CodegenTestCase {
|
||||
}
|
||||
|
||||
public void testKt343 () throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt343.jet");
|
||||
// System.out.println(generateToText());
|
||||
}
|
||||
|
||||
public void testKt508 () throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
loadFile("regressions/kt508.jet");
|
||||
// System.out.println(generateToText());
|
||||
blackBox();
|
||||
}
|
||||
|
||||
public void testKt504 () throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
loadFile("regressions/kt504.jet");
|
||||
// System.out.println(generateToText());
|
||||
blackBox();
|
||||
}
|
||||
|
||||
public void testKt501 () throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt501.jet");
|
||||
}
|
||||
|
||||
public void testKt496 () throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt496.jet");
|
||||
// System.out.println(generateToText());
|
||||
}
|
||||
|
||||
public void testKt500 () throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt500.jet");
|
||||
}
|
||||
|
||||
public void testKt694 () throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
// blackBoxFile("regressions/kt694.jet");
|
||||
}
|
||||
|
||||
public void testKt285 () throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
// blackBoxFile("regressions/kt285.jet");
|
||||
}
|
||||
|
||||
public void testKt707 () throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt707.jet");
|
||||
}
|
||||
|
||||
public void testKt857 () throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
// blackBoxFile("regressions/kt857.jet");
|
||||
}
|
||||
|
||||
public void testKt903 () throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt903.jet");
|
||||
}
|
||||
|
||||
public void testKt940 () throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt940.kt");
|
||||
}
|
||||
|
||||
public void testKt1018 () throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt1018.kt");
|
||||
}
|
||||
|
||||
@@ -332,58 +276,47 @@ public class ClassGenTest extends CodegenTestCase {
|
||||
}
|
||||
|
||||
public void testKt1134() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt1134.kt");
|
||||
}
|
||||
|
||||
public void testKt1157() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt1157.kt");
|
||||
}
|
||||
|
||||
public void testKt471() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt471.kt");
|
||||
}
|
||||
|
||||
public void testKt1213() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
// blackBoxFile("regressions/kt1213.kt");
|
||||
}
|
||||
|
||||
public void testKt723() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt723.kt");
|
||||
}
|
||||
|
||||
public void testKt725() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt725.kt");
|
||||
}
|
||||
|
||||
public void testKt633() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt633.kt");
|
||||
}
|
||||
|
||||
|
||||
public void testKt1345() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt1345.kt");
|
||||
}
|
||||
|
||||
public void testKt1538() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt1538.kt");
|
||||
}
|
||||
|
||||
public void testKt1759() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("regressions/kt1759.kt");
|
||||
}
|
||||
|
||||
public void testResolveOrder() throws Exception {
|
||||
createEnvironmentWithMockJdk(CompilerSpecialMode.JDK_HEADERS);
|
||||
blackBoxFile("classes/resolveOrder.jet");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user