azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update test data that mentioned old JvmAbi constants

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-01-21 20:07:00 +03:00
parent be5f00ad1c
commit a1f4c06a49
22 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java
+2 -1
View File
@@ -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());
}
}
compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java
+2 -1
View File
@@ -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 {
compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java
+2 -1
View File
@@ -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 {