Refactoring: Modify test for incompatible ABI version

This commit is contained in:
Nikolay Krasko
2014-11-10 18:17:01 +03:00
parent c242665cd3
commit 5555e28bfb
13 changed files with 18 additions and 17 deletions
@@ -1,5 +1,5 @@
$TESTDATA_DIR$/wrongAbiVersion.kt
-classpath
$TESTDATA_DIR$/wrongAbiVersionLib
$TESTDATA_DIR$/wrongAbiVersionLib/bin
-d
$TEMP_DIR$
@@ -1,5 +1,5 @@
ERROR: compiler/testData/cli/jvm/wrongAbiVersionLib/ClassWithWrongAbiVersion.class: (0, 0) Class 'ClassWithWrongAbiVersion' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is $ABI_VERSION$
ERROR: compiler/testData/cli/jvm/wrongAbiVersionLib/wrong/WrongPackage.class: (0, 0) Class 'wrong/WrongPackage' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is $ABI_VERSION$
ERROR: compiler/testData/cli/jvm/wrongAbiVersionLib/bin/ClassWithWrongAbiVersion.class: (0, 0) Class 'ClassWithWrongAbiVersion' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is $ABI_VERSION$
ERROR: compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/WrongPackage.class: (0, 0) Class 'wrong/WrongPackage' was compiled with an incompatible version of Kotlin. Its ABI version is -1, expected ABI version is $ABI_VERSION$
WARNING: compiler/testData/cli/jvm/wrongAbiVersion.kt: (3, 9) Parameter 'x' is never used
ERROR: compiler/testData/cli/jvm/wrongAbiVersion.kt: (4, 3) Unresolved reference: bar
COMPILATION_ERROR
@@ -1,13 +0,0 @@
/*
To regenerate this test:
1. Change JvmAbi.VERSION to -1
2. Run 'ant dist'
3. Rename this file and wrong-package: delete 'txt' extension
4. Compile two files with the newly built compiler from dist/
5. Rename files back: add 'txt' extension
6. Change JvmAbi.VERSION back to its old value
7. Run 'ant dist'
After these steps, the test should succeed
*/
class ClassWithWrongAbiVersion
@@ -0,0 +1,13 @@
/*
To regenerate this test:
1. Change JvmAbi.VERSION to -1
2. Run 'ant dist'
3. Compile files with the newly built compiler from dist/
cd compiler/testData/cli/jvm/wrongAbiVersionLib
../../../../../dist/kotlinc/bin/kotlinc -d bin src/*
4. Change JvmAbi.VERSION back to its old value
5. Run 'ant dist'
After these steps, the test should succeed
*/
@@ -0,0 +1 @@
class ClassWithWrongAbiVersion
@@ -33,7 +33,7 @@ import org.jetbrains.jet.plugin.decompiler.INCOMPATIBLE_ABI_VERSION_COMMENT
public class DecompiledTextForWrongAbiVersionTest : JetLightCodeInsightFixtureTestCase() {
override fun getProjectDescriptor(): LightProjectDescriptor {
return JetJdkAndLibraryProjectDescriptor(File(JetTestCaseBuilder.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib"))
return JetJdkAndLibraryProjectDescriptor(File(JetTestCaseBuilder.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin"))
}
fun testClassWithWrongAbiVersion() {