Update test data that mentioned old JvmAbi constants
This commit is contained in:
@@ -2,16 +2,16 @@ public final class ClassObjectField implements kotlin.jvm.internal.KObject {
|
||||
@org.jetbrains.annotations.Nullable
|
||||
public static final java.lang.String x = "";
|
||||
private static final java.lang.String y = "";
|
||||
public static final ClassObjectField.object OBJECT$;
|
||||
public static final ClassObjectField.Default Default;
|
||||
|
||||
public ClassObjectField() { /* compiled code */ }
|
||||
|
||||
public static final class object implements kotlin.jvm.internal.KObject {
|
||||
public static final class Default implements kotlin.jvm.internal.KObject {
|
||||
@org.jetbrains.annotations.Nullable
|
||||
public final java.lang.String getX() { /* compiled code */ }
|
||||
|
||||
private final java.lang.String getY() { /* compiled code */ }
|
||||
|
||||
private object() { /* compiled code */ }
|
||||
private Default() { /* compiled code */ }
|
||||
}
|
||||
}
|
||||
}
|
||||
+4
-4
@@ -1,9 +1,9 @@
|
||||
public interface TraitClassObjectField {
|
||||
TraitClassObjectField.object OBJECT$;
|
||||
TraitClassObjectField.Default Default;
|
||||
@org.jetbrains.annotations.Nullable
|
||||
java.lang.String x = "";
|
||||
|
||||
static final class object implements kotlin.jvm.internal.KObject {
|
||||
static final class Default implements kotlin.jvm.internal.KObject {
|
||||
@org.jetbrains.annotations.Nullable
|
||||
private final java.lang.String x = "";
|
||||
private final java.lang.String y = "";
|
||||
@@ -13,6 +13,6 @@ public interface TraitClassObjectField {
|
||||
|
||||
private final java.lang.String getY() { /* compiled code */ }
|
||||
|
||||
private object() { /* compiled code */ }
|
||||
private Default() { /* compiled code */ }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
class SomeClass { class object }
|
||||
|
||||
fun box() =
|
||||
if ((SomeClass.toString() as java.lang.String).matches("SomeClass\\\$object@[0-9a-fA-F]+"))
|
||||
if ((SomeClass.toString() as java.lang.String).matches("SomeClass\\\$Default@[0-9a-fA-F]+"))
|
||||
"OK"
|
||||
else
|
||||
"Fail: $SomeClass"
|
||||
|
||||
@@ -39,8 +39,8 @@ fun box(): String {
|
||||
return check({defaultGetter}, "_DefaultPackage.getDefaultGetter()I")
|
||||
?: check({defaultSetter = 1}, "_DefaultPackage.setDefaultSetter(I)V")
|
||||
|
||||
?: check({C.defaultGetter}, "C\$object.getDefaultGetter()I")
|
||||
?: check({C.defaultSetter = 1}, "C\$object.setDefaultSetter(I)V")
|
||||
?: check({C.defaultGetter}, "C\$Default.getDefaultGetter()I")
|
||||
?: check({C.defaultSetter = 1}, "C\$Default.setDefaultSetter(I)V")
|
||||
|
||||
?: check({C().defaultGetter}, "C.getDefaultGetter()I")
|
||||
?: check({C().defaultSetter = 1}, "C.setDefaultSetter(I)V")
|
||||
|
||||
@@ -4,5 +4,5 @@ class A {
|
||||
}
|
||||
}
|
||||
|
||||
// CLASS: A$object$Foo
|
||||
// CLASS: A$Default$Foo
|
||||
// HAS_DEFAULT_CONSTRUCTOR: true
|
||||
|
||||
@@ -4,7 +4,7 @@ import java.lang.Object;
|
||||
|
||||
class Foo {
|
||||
|
||||
class object { }
|
||||
class Default { }
|
||||
|
||||
class InnerClass { }
|
||||
|
||||
|
||||
@@ -23,6 +23,7 @@ import com.intellij.psi.PsiModifier;
|
||||
import com.intellij.psi.search.GlobalSearchScope;
|
||||
import junit.framework.ComparisonFailure;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.kotlin.name.SpecialNames;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
@@ -206,6 +207,6 @@ public class KotlinLightClassCoherenceTest extends KotlinAsJavaTestBase {
|
||||
}
|
||||
|
||||
public void testClassObject() throws Exception {
|
||||
doTest("test.WithClassObject.object");
|
||||
doTest("test.WithClassObject." + SpecialNames.DEFAULT_NAME_FOR_DEFAULT_OBJECT.asString());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,6 +25,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
|
||||
import org.jetbrains.kotlin.config.CompilerConfiguration;
|
||||
import org.jetbrains.kotlin.name.SpecialNames;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Arrays;
|
||||
@@ -139,7 +140,7 @@ public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase
|
||||
}
|
||||
|
||||
public void testInClassObjectActual() throws Exception {
|
||||
checkMethodGenericParameter("test.PlatformStaticClass.object", "inClassObject", 0, "T");
|
||||
checkMethodGenericParameter("test.PlatformStaticClass." + SpecialNames.DEFAULT_NAME_FOR_DEFAULT_OBJECT.asString(), "inClassObject", 0, "T");
|
||||
}
|
||||
|
||||
public void testInClass() throws Exception {
|
||||
|
||||
@@ -23,6 +23,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.kotlin.backend.common.output.OutputFile;
|
||||
import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
|
||||
import org.jetbrains.kotlin.name.SpecialNames;
|
||||
import org.jetbrains.kotlin.test.ConfigurationKind;
|
||||
import org.jetbrains.org.objectweb.asm.ClassReader;
|
||||
import org.jetbrains.org.objectweb.asm.ClassVisitor;
|
||||
@@ -43,7 +44,7 @@ public class OuterClassGenTest extends CodegenTestCase {
|
||||
}
|
||||
|
||||
public void testClassObject() throws Exception {
|
||||
doTest("foo.Foo$object", "outerClassInfo");
|
||||
doTest("foo.Foo$" + SpecialNames.DEFAULT_NAME_FOR_DEFAULT_OBJECT.asString(), "outerClassInfo");
|
||||
}
|
||||
|
||||
public void testInnerClass() throws Exception {
|
||||
|
||||
Reference in New Issue
Block a user