From 730bf5dfcd8f5c02cbe84866be11db87145ce095 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 11 Jan 2018 15:38:49 +0100 Subject: [PATCH] [java decompiler] corrects test data --- .../java/decompiler/SingleClassesTest.java | 2 +- .../classes/pkg/TestSuperInner$Inner.class | Bin 425 -> 0 bytes .../classes/pkg/TestSuperInner$Inner2.class | Bin 0 -> 439 bytes testData/classes/pkg/TestSuperInner.class | Bin 332 -> 283 bytes .../classes/pkg/TestSuperInner2$Inner2.class | Bin 487 -> 0 bytes testData/classes/pkg/TestSuperInner2.class | Bin 336 -> 0 bytes .../pkg/TestSuperInnerBase$Inner.class | Bin 0 -> 376 bytes testData/classes/pkg/TestSuperInnerBase.class | Bin 0 -> 287 bytes testData/results/TestSuperInner.dec | 19 ++++++++++++++++++ testData/results/TestSuperInner2.dec | 17 ---------------- testData/src/pkg/TestSuperInner.java | 9 ++++----- testData/src/pkg/TestSuperInner2.java | 4 ---- testData/src/pkg/TestSuperInnerBase.java | 7 +++++++ 13 files changed, 31 insertions(+), 27 deletions(-) delete mode 100644 testData/classes/pkg/TestSuperInner$Inner.class create mode 100644 testData/classes/pkg/TestSuperInner$Inner2.class delete mode 100644 testData/classes/pkg/TestSuperInner2$Inner2.class delete mode 100644 testData/classes/pkg/TestSuperInner2.class create mode 100644 testData/classes/pkg/TestSuperInnerBase$Inner.class create mode 100644 testData/classes/pkg/TestSuperInnerBase.class create mode 100644 testData/results/TestSuperInner.dec delete mode 100644 testData/results/TestSuperInner2.dec delete mode 100644 testData/src/pkg/TestSuperInner2.java create mode 100644 testData/src/pkg/TestSuperInnerBase.java diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java index 83db194..1808d14 100644 --- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java +++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java @@ -105,7 +105,7 @@ public class SingleClassesTest { @Test public void testPop2OneLongPop2() { doTest("pkg/TestPop2OneLongPop2"); } @Test public void testPop2TwoIntPop2() { doTest("pkg/TestPop2TwoIntPop2"); } @Test public void testPop2TwoIntTwoPop() { doTest("pkg/TestPop2TwoIntTwoPop"); } - @Test public void testSuperInner2() { doTest("pkg/TestSuperInner2", "pkg/TestSuperInner"); } + @Test public void testSuperInner() { doTest("pkg/TestSuperInner", "pkg/TestSuperInnerBase"); } // TODO: fix all below //@Test public void testPackageInfo() { doTest("pkg/package-info"); } diff --git a/testData/classes/pkg/TestSuperInner$Inner.class b/testData/classes/pkg/TestSuperInner$Inner.class deleted file mode 100644 index 1148567a037fcfdc2eef748a2cc629cc23740621..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 425 zcmZ8d%SyvQ6g@YYHa5mKHZ|%}=%QAzF5D?DEC@o-MN9XSIOvp^NFM%|3lUuS0e+Nt zC)GvEEbg2K=RUrFKED8*bf)g==U5eU8K=zjqdbx6LKfQKKT?=RgjN$y@R~YJWmzhw z!;J>R{~6p_UKfeF(Iz-pAMtc4U!{i@+8!M2J2)T=)-9_X-p*JjsmvZH_wiCC6~P{v zCA#Z=al{uAd@S;P6KsBr9c*#!FuI1t4{*mP@1XGqtT#p$T*Ebr%|3x`#^K5d4?RXk VH;Kfo&&a|qx(&;-V1OMVegPH#S%Clm diff --git a/testData/classes/pkg/TestSuperInner$Inner2.class b/testData/classes/pkg/TestSuperInner$Inner2.class new file mode 100644 index 0000000000000000000000000000000000000000..b7b9df55128f63e061ebaf58e748d8b4c69a3036 GIT binary patch literal 439 zcmZut!AiqG5Pg$wvo?)3O>1k>i`avbH}l>wGhg2yp8(F#si1^S4+2{ffkczwrjL>74hYTh>iOYhs!ck{Ryw(k zW1S4Sejde9dO>I(t`i*H62xeEuL-qr6ziL8G1JLZ&E}l(Cd(|j(^rutjsLBWpVW); zQHJY7q9xHLbcz#n^Epm=jz8e%U^G|8Xd|&h*elvDmC?UeLOC}OcGoRng+seUSZqRQ z6_eH=_W6v0FG@jRH?WAg#0JL-vjaH%fNHP*2I}?S;k@P|kAIg%V7Y@TM+ZJajv=EG NYN!jrwFb6@_yK6EXBhwh literal 0 HcmV?d00001 diff --git a/testData/classes/pkg/TestSuperInner.class b/testData/classes/pkg/TestSuperInner.class index 52fd2e2dbe20e435a5be391d9e0b48c4796397a7..0629d9c950afe0870b7bbe9624e42aaa53a86156 100644 GIT binary patch delta 199 zcmX@ZG@D8B)W2Q(7#J8#83ef)m>GE48Ti;4_}Li*7#Y|+^YT)Qj3z2rPVCUA7b?h3 z*AGc8E(tCzNG$?OF*1l@3OXegr!q1~VoIn$jAKw>U; o)!NR$xDhPP1ti(Pg3MAtUEDw}69W%Wh=G9%D9i%nv9hoL08Ahz761SM literal 332 zcmY*VK~BRk5S(q320~~{+Ycad01o8B4b)2|q)JgawCddnD{vJYei0FSD= zwz$NWX1z1BW7&VlpI-ovn8oO09N{X$B*K&sE{$PJNPJzCs;;>v44$>o&79D`z1tFk zMfJvnQKk*A+RvQrM&+e2ldLLKxm8xX{+|q*4=owvY{PZ4Zok<2@FzmNu3B60i*~cq zuKci5dzB!<8DZF!B+H3usmy!&n(w%12(zx|#@~T!^yGzZk!%SQJeMx@JrLf1gAPLU e5DN~3cGe5Q#GgZ{mtG%w9Ek_wl~0hFFbGcdsYU_- diff --git a/testData/classes/pkg/TestSuperInner2$Inner2.class b/testData/classes/pkg/TestSuperInner2$Inner2.class deleted file mode 100644 index ef383b8301fddb6a9e52f4d7f076bc881779f7bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 487 zcmZWl%Syvg5IvLLCN_;tn#Nim8=(trK}6hDbWsq5;HIVfv|cb0lah!3k=x zD9AF&{Gi@q_&0|+ONw+Q??R>R)#f~Z4qgKbP3RU392htx^lLdADFa7a^;L+_EV~hU z^;IWoQ@bWe==^7J!lxB{WpW%fi}Dy7*x|p$=oT73pgkJDgGS>IXm1QPm~3@UQhu9l hzeT5|NJAGL{$2JO@UY8G1lJ6N_yuT{Yn=c9 diff --git a/testData/classes/pkg/TestSuperInner2.class b/testData/classes/pkg/TestSuperInner2.class deleted file mode 100644 index 340b4de1bca97c26dd9a591d1d3f5a503a9cd5ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 336 zcmZ9I&1%9x6ot>#XxcPtwc@%97qyED(w(K7K%o%2QQVI@;FL6xN#c9C61wOE_)yZ5 z#ElNzd(V9LkD24?_Yc4;`X1`IchPmxbMYW(e#Wu36MlWh!Vbi=t$vsu2?w%Rfkc(Ww8EB#@L z=KfXwnDQfWOn9-6Z_DRY=VO&-T#=)BnNRe!sl@Kz5hpYC zq9Qa9L+M7gX*5 literal 0 HcmV?d00001 diff --git a/testData/classes/pkg/TestSuperInnerBase.class b/testData/classes/pkg/TestSuperInnerBase.class new file mode 100644 index 0000000000000000000000000000000000000000..2295e71ad667a939fe0d82af6089b46b0886f29c GIT binary patch literal 287 zcmZvXF>k^!6ol`Qgp?2pUD~Bc3=C}tGO-~BA|WB6b^vvE;0XnSL2<(W>Qsq=AJ89# zc=1Xt+2{M-`6T~c&ldngJOyyj^6}`S?W05RW?FMj2(8AMGKLMIK1y|3j0w)$`!~Uj z4{Ij0=c(q;a-VR%R7oZzSRBfH#nZGhFH1JXqC9eL%O=Y3V5?3lgpUWp^KrL{?jwXw z6^b&YH_=zJ4SJmU7XC+`6I_@jiY*KXx3*S+~%UM@?}xghGHo Js4LEM-5Ui%J^%m! literal 0 HcmV?d00001 diff --git a/testData/results/TestSuperInner.dec b/testData/results/TestSuperInner.dec new file mode 100644 index 0000000..840aa69 --- /dev/null +++ b/testData/results/TestSuperInner.dec @@ -0,0 +1,19 @@ +package pkg; + +class TestSuperInner extends TestSuperInnerBase { + protected abstract class Inner2 extends TestSuperInnerBase.Inner { + protected Inner2() { + super();// 4 + } + } +} + +class 'pkg/TestSuperInner$Inner2' { + method ' (Lpkg/TestSuperInner;)V' { + 7 5 + a 6 + } +} + +Lines mapping: +4 <-> 6 diff --git a/testData/results/TestSuperInner2.dec b/testData/results/TestSuperInner2.dec deleted file mode 100644 index 81fbd8e..0000000 --- a/testData/results/TestSuperInner2.dec +++ /dev/null @@ -1,17 +0,0 @@ -class TestSuperInner2 extends TestSuperInner { - protected class Inner2 extends TestSuperInner.Inner { - protected Inner2() { - super();// 2 - } - } -} - -class 'TestSuperInner2$Inner2' { - method ' (LTestSuperInner2;)V' { - 7 3 - a 4 - } -} - -Lines mapping: -2 <-> 4 diff --git a/testData/src/pkg/TestSuperInner.java b/testData/src/pkg/TestSuperInner.java index fed5da8..b5251ba 100644 --- a/testData/src/pkg/TestSuperInner.java +++ b/testData/src/pkg/TestSuperInner.java @@ -1,6 +1,5 @@ -public class TestSuperInner { - protected abstract class Inner { - protected Inner() { - } - } +package pkg; + +class TestSuperInner extends TestSuperInnerBase { + protected abstract class Inner2 extends Inner { } } \ No newline at end of file diff --git a/testData/src/pkg/TestSuperInner2.java b/testData/src/pkg/TestSuperInner2.java deleted file mode 100644 index a16ba8e..0000000 --- a/testData/src/pkg/TestSuperInner2.java +++ /dev/null @@ -1,4 +0,0 @@ -class TestSuperInner2 extends TestSuperInner { - protected class Inner2 extends Inner { - } -} \ No newline at end of file diff --git a/testData/src/pkg/TestSuperInnerBase.java b/testData/src/pkg/TestSuperInnerBase.java new file mode 100644 index 0000000..e53ec09 --- /dev/null +++ b/testData/src/pkg/TestSuperInnerBase.java @@ -0,0 +1,7 @@ +package pkg; + +class TestSuperInnerBase { + protected abstract class Inner { + protected Inner() { } + } +} \ No newline at end of file