From 5555e28bfbf67e02ab1a76bed0ddc92a345e6694 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 10 Nov 2014 18:17:01 +0300 Subject: [PATCH] Refactoring: Modify test for incompatible ABI version --- compiler/testData/cli/jvm/wrongAbiVersion.args | 2 +- compiler/testData/cli/jvm/wrongAbiVersion.out | 4 ++-- .../ClassWithWrongAbiVersion.class | Bin 497 -> 0 bytes .../ClassWithWrongAbiVersion.kt.txt | 13 ------------- .../bin/ClassWithWrongAbiVersion.class | Bin 0 -> 795 bytes .../WrongPackage$wrong-package$0984b5e5.class | Bin 0 -> 396 bytes .../bin/wrong/WrongPackage.class | Bin 0 -> 733 bytes .../cli/jvm/wrongAbiVersionLib/readme.txt | 13 +++++++++++++ .../src/ClassWithWrongAbiVersion.kt | 1 + .../wrong-package.kt} | 0 .../WrongPackage$src$wrong-package$f7694eb0.class | Bin 183 -> 0 bytes .../wrongAbiVersionLib/wrong/WrongPackage.class | Bin 462 -> 0 bytes .../DecompiledTextForWrongAbiVersionTest.kt | 2 +- 13 files changed, 18 insertions(+), 17 deletions(-) delete mode 100644 compiler/testData/cli/jvm/wrongAbiVersionLib/ClassWithWrongAbiVersion.class delete mode 100644 compiler/testData/cli/jvm/wrongAbiVersionLib/ClassWithWrongAbiVersion.kt.txt create mode 100644 compiler/testData/cli/jvm/wrongAbiVersionLib/bin/ClassWithWrongAbiVersion.class create mode 100644 compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/WrongPackage$wrong-package$0984b5e5.class create mode 100644 compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/WrongPackage.class create mode 100644 compiler/testData/cli/jvm/wrongAbiVersionLib/readme.txt create mode 100644 compiler/testData/cli/jvm/wrongAbiVersionLib/src/ClassWithWrongAbiVersion.kt rename compiler/testData/cli/jvm/wrongAbiVersionLib/{wrong-package.kt.txt => src/wrong-package.kt} (100%) delete mode 100644 compiler/testData/cli/jvm/wrongAbiVersionLib/wrong/WrongPackage$src$wrong-package$f7694eb0.class delete mode 100644 compiler/testData/cli/jvm/wrongAbiVersionLib/wrong/WrongPackage.class diff --git a/compiler/testData/cli/jvm/wrongAbiVersion.args b/compiler/testData/cli/jvm/wrongAbiVersion.args index 0cc655dfe8c..ffcc7fd32de 100644 --- a/compiler/testData/cli/jvm/wrongAbiVersion.args +++ b/compiler/testData/cli/jvm/wrongAbiVersion.args @@ -1,5 +1,5 @@ $TESTDATA_DIR$/wrongAbiVersion.kt -classpath -$TESTDATA_DIR$/wrongAbiVersionLib +$TESTDATA_DIR$/wrongAbiVersionLib/bin -d $TEMP_DIR$ diff --git a/compiler/testData/cli/jvm/wrongAbiVersion.out b/compiler/testData/cli/jvm/wrongAbiVersion.out index a3fa7102b1c..eb70f2c153a 100644 --- a/compiler/testData/cli/jvm/wrongAbiVersion.out +++ b/compiler/testData/cli/jvm/wrongAbiVersion.out @@ -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 \ No newline at end of file diff --git a/compiler/testData/cli/jvm/wrongAbiVersionLib/ClassWithWrongAbiVersion.class b/compiler/testData/cli/jvm/wrongAbiVersionLib/ClassWithWrongAbiVersion.class deleted file mode 100644 index d5448096e0bbcb0186d69a64c050bb7f9791506b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 497 zcmZ`$T}whi5S?-F)vh1qM^Lf>TPd$*Mk04PeBj; zfPPdp3iakLoWq=%of*!4eSdrcz&6YyEF8Jq_nT5bGzXsQ+AY}-17CV71c(st@n>Fk zx$2fLT0PO$Az%oxp3vnpq5mWkAvdYbR$n6o_ob5h0D%=tjVMfk6$S&s2!?);K0?-+ z^n4E?;f%(ed)k$1Tt-@$|L@6u=uoE)*Bn7@rg^5ebyL;lwbdy#SADu$iWW9=8~38_ zywn$i2CF*77Vg~3^@?50?e^qra`_M~md@CSHOycsj|^j&KxB4|MNHeuM}p>wVQ2GJ zAjtAoqHhOGqhL`z%{}ru0wL*mZSFSsK=PI=u17#yUU|boTO7+#khvTxEgwZg`jWD? zQl93TjP{`d0kVT^qEA7(J?V2(INxoOg7 MP9YA7TRcDvi`UhsDr zA2dGr1N>3ybW1Uspm&qGcV^C<+4=bX`VT@IdwVbUwI-_YczJZ35lJE$btpKL=5wUm^zaoVadMkA2_Ty z%kXCfQB_eGV@z??3jHS^WNhee8O!;NxLYXnqH z8f(P{8MIrdQkP6ULp+Md|7uF>atg0RZz%ds5(_-LVN}Xq;E(pB$_U#f`}aVng_dWn z_+PUvEFy2>4wfvKm@}YZnS0XoPaHzl_ItwZh(L<2>%5r=?%-v?l~BBAA*xIj0}m6F&QG{`H#MaAGuXPqT8{6@F|yhh6h7hZ$4KSPxq_@Q rWCDsm`ivVBH(`~fH8tWU(yVE?7s(`weBWYUhHcpvKX1PSg~S6ot<;wbfW{?XLSSte_FGP;nK4ilk_0OI*q%9qQy~B9lqQ$8zh!2k@cP z+u+8Xv$(_g&YZ(=Kfm5T0Gy%EFnZC2S~(A!8SpseD>1Cm@$;`by_lRwV=-=nG4v9? z=1#^bavvokHf>l$|0GUQ!(c^R(>xr73`f(nFqu?Nvd$f;jL?c_j$gC+t1?f*$k@wx zSza>OJd&Z%r7V>7O^2bGO0{Hg{@pV4DL_@7!1a9h=ISwUXAA1_ilt!aPNfoeRUQew z;88}zo)?vl#kJgs!K_k7<|34(B-d4{Fx=2@N*thpCM^!2XJ~;of_+khnh|}gtuD9^DOWQ5fhG-6pkj3mdxv9qj!8fU{`U literal 0 HcmV?d00001 diff --git a/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/WrongPackage.class b/compiler/testData/cli/jvm/wrongAbiVersionLib/bin/wrong/WrongPackage.class new file mode 100644 index 0000000000000000000000000000000000000000..816be83a03e4fe707d5165475473f340fc7dee11 GIT binary patch literal 733 zcma)4U2oE06n+jAI#^*8L@aK8AQ!6(t5avh>5_%Sg^A2egBM2uEWo{y*R_a9%s0l1G_gyJmly`l9sK3|FcSPZ2KA{0jA zL|Cri+@U>^{YXWUqjPrS_>8zYjtEOn`>x|T(JmpmZuSWI`q+;+w5Ue7+c^tZf&Acd zC2Mptu^cawfhSz+#e&zK9J@P&jel|5i%S=SX1V|PqS3SU&hM#Pt_Z^&^Z$Em(2&bw z8F>v$$YhW}fp@Y+KrsJSseVa{`n~4khxWGIR#DPWgqp<_lnHmv`(NJqPl0&ptgxM) z3_{2El0Vr9%0NVd;5N%Sz4CG`o!WTP**{Dw?)#%brMsH0TL+(pUe&bsH?>)#TKXt= zqgg|1p5v`h)as4ygGYv`Q;X87PE;h7mK(Q;T`g74P;t*xIIh|@Im6Q@}D0{!zG8nI#vN=%DQImOjDOIYJGJ-gOZ^wfQGyr6!lKGcW^1QFQ2KmoPFgCnXjENe#^~Mg|t={FGEi2Cm@z y(xT*4x6GVW20;cU1{R<@7#J8CBpKKkfQB=00C~J%F`(#1FoThS6G$^LumS+Re<-K` diff --git a/compiler/testData/cli/jvm/wrongAbiVersionLib/wrong/WrongPackage.class b/compiler/testData/cli/jvm/wrongAbiVersionLib/wrong/WrongPackage.class deleted file mode 100644 index a3d8100a7be8bfacd0af66a28ee101cdf655d0f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 462 zcmZWl%TB^T6g{^TiYO`|5aS~uVxlpMg3*X8(?p}9C>o5g(KAs4(B^pu#5yqS1Q54#Ov#QaQW}qR& z?x4Ng`6;fn0z$|T9^=Adov{4>vApk@`9HVv51SiX>(W@&5FJ4TS`0&o5mJ?=3<`&C z(6*f4Nwx_wVOVwP`IhU1zW5N-dl3kNT~5an*`t|Ac&S|3tLjSYuy)>+nR4fLR?XO# z8%8ygFI8`g^X|cO!@0_K_0gNGeN~!2x+_jZk4vUlJIzs88II?O<|t0-%N=6UhZYm8 zYa07Gox&uhCV3&M?%qqnSjBSWanClScP@-JJFzpj=b3WX>Wj%*&j~DB)-B)SbjNYr zKm^A2y9W6f F{{~PJXoCO% diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt index 0b8022582f7..c7fff149d4d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt @@ -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() {