From 7656bbdd681612e9b0d02337263fb3f08549f549 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 19 Oct 2018 21:14:52 +0200 Subject: [PATCH] [tests] extends Java decompiler test data; drops duplicated test --- .../java/decompiler/SingleClassesTest.java | 1 - .../classes/pkg/TestInnerLocal$1Inner.class | Bin 400 -> 569 bytes .../classes/pkg/TestInnerLocal$2Inner.class | Bin 461 -> 648 bytes .../classes/pkg/TestInnerLocal$Inner1.class | Bin 416 -> 603 bytes ...InnerLocal$Inner1Static$Inner2Static.class | Bin 430 -> 622 bytes .../pkg/TestInnerLocal$Inner1Static.class | Bin 430 -> 609 bytes testData/classes/pkg/TestInnerLocal.class | Bin 795 -> 906 bytes .../pkg/TestInnerLocalPkg$1Inner.class | Bin 417 -> 0 bytes .../pkg/TestInnerLocalPkg$2Inner.class | Bin 492 -> 0 bytes .../pkg/TestInnerLocalPkg$Inner1.class | Bin 447 -> 0 bytes ...erLocalPkg$Inner1Static$Inner2Static.class | Bin 454 -> 0 bytes .../pkg/TestInnerLocalPkg$Inner1Static.class | Bin 454 -> 0 bytes testData/classes/pkg/TestInnerLocalPkg.class | Bin 847 -> 0 bytes .../pkg/TestInnerSignature$Inner.class | Bin 610 -> 941 bytes .../pkg/TestInnerSignature$InnerStatic.class | Bin 637 -> 962 bytes testData/classes/pkg/TestInnerSignature.class | Bin 683 -> 988 bytes testData/results/TestInnerLocal.dec | 152 +++++++++--------- testData/results/TestInnerLocalPkg.dec | 135 ---------------- testData/results/TestInnerSignature.dec | 94 +++++------ testData/src/pkg/TestInnerLocal.java | 26 +-- testData/src/pkg/TestInnerLocalPkg.java | 65 -------- testData/src/pkg/TestInnerSignature.java | 22 +-- 22 files changed, 135 insertions(+), 360 deletions(-) delete mode 100644 testData/classes/pkg/TestInnerLocalPkg$1Inner.class delete mode 100644 testData/classes/pkg/TestInnerLocalPkg$2Inner.class delete mode 100644 testData/classes/pkg/TestInnerLocalPkg$Inner1.class delete mode 100644 testData/classes/pkg/TestInnerLocalPkg$Inner1Static$Inner2Static.class delete mode 100644 testData/classes/pkg/TestInnerLocalPkg$Inner1Static.class delete mode 100644 testData/classes/pkg/TestInnerLocalPkg.class delete mode 100644 testData/results/TestInnerLocalPkg.dec delete mode 100644 testData/src/pkg/TestInnerLocalPkg.java diff --git a/test/org/jetbrains/java/decompiler/SingleClassesTest.java b/test/org/jetbrains/java/decompiler/SingleClassesTest.java index f2b28b9..607c9a5 100644 --- a/test/org/jetbrains/java/decompiler/SingleClassesTest.java +++ b/test/org/jetbrains/java/decompiler/SingleClassesTest.java @@ -66,7 +66,6 @@ public class SingleClassesTest { @Test public void testAnonymousClass() { doTest("pkg/TestAnonymousClass"); } @Test public void testThrowException() { doTest("pkg/TestThrowException"); } @Test public void testInnerLocal() { doTest("pkg/TestInnerLocal"); } - @Test public void testInnerLocalPkg() { doTest("pkg/TestInnerLocalPkg"); } @Test public void testInnerSignature() { doTest("pkg/TestInnerSignature"); } @Test public void testAnonymousSignature() { doTest("pkg/TestAnonymousSignature"); } @Test public void testLocalsSignature() { doTest("pkg/TestLocalsSignature"); } diff --git a/testData/classes/pkg/TestInnerLocal$1Inner.class b/testData/classes/pkg/TestInnerLocal$1Inner.class index 61aecb2cd131bd3b320f5a681ec63ca71c2dff03..5169762dc193628f86661f804dba8bc3de6c33da 100644 GIT binary patch delta 359 zcmZ`!!AiqG6r4?>F)>z+T1~1R#8W+lg5aSiMG8Vdk=lc|ZCvWsWK)v0N58>*iU$!r z_yOV%c@bag!ILb^&ag9Y_C1=fR`~J#_730>yDltjIxw+iBd`%x;Z^9zdBW2HFC-tP zqF)1prEg_feFoR9cyc$2`l8flN{M3T-S5nJmtpVnUTK+$fh;BEE_lH+p+#}5RIa&} zxhff&@t99}lyWtSPQ|1U3D@GLTV+SRmWOTZc(7}j!#qRqZym$R-<> z$%6rhR_wu`1Gw!Mu=c?-j3-hCT*3ye4QjHmKwbxnq?*5OcvvPyx%v~JCgL_DvP#5+ WPiSBb>vUV#pjd;LOYil_CEy3tjY|{& delta 197 zcmXX=I|{-;6r7ijA?q5yn`mmQSP5DSS_zh>mLTau1lPt}7;+K|5iLA`hYG#~c`zT| zz|70Knc=s3e*i2n5wOs6VWRI~;6N2&TvW@IFA-oY;nZNGMNs=xU$%Lko_D8Xl1=B0 zCfI+L4R5kU>r|HqQsk9aTE_&Jn<5x|fQX);X!d|{XGai>9=8LEhxnWg*tOXkkmxX5 O{O@AKN^rhT4uK!|a2`tl diff --git a/testData/classes/pkg/TestInnerLocal$2Inner.class b/testData/classes/pkg/TestInnerLocal$2Inner.class index 87289e1956769d2d3031fe0e3bbfea11e958c39f..9f50cadf09fbf54850e2e019c1ba627f6323f4e1 100644 GIT binary patch literal 648 zcmZuv%T60H6g^G`0%1yqgz_jYFR>s25md1QAyqsiq_k88vUes{FibpX#zFiR3xw1K zAJC6N9J@%g3X7S0?(-a9`_J?5CjdKG9Y=sqWsG3Kq0c3JDPd7S+zC`$SMpXi6KQ(Q zGn;AC+Z7nKmpWhD7MO0`T=$yiDz_)bsH~O7GI9AmZM5ANsIR|QFg&u}76=Z~t`exU zv{63>{f^4cWhY^z>c_Tark(#944edk5zi|SdV7$_JXZ`ayhFS8)z?to>aT&Zy06+g z*PQrMX0orW%Dx$sT4{A^IAZ1>m51skQ?azF%kJ`7I>=&mtev*n|7YKF%izqVb4AWAg#Ud*Awj|4E;&v2~jGBR_Ds rZ$SlBdTjQig-4F8fEqE+#@9hmWSdhmgIU@DbC|~zQJMLGHUeG%;kuE{ delta 247 zcmW-byGq1h5Ju0R%f^J5jhE7}|DZ2Ro6>$8OG<1MU*qlnty=uBaE_X@w`O{wcTuN7gT z-*j5)>N&lCD)Moo2&Qv&`zV|8R*Hcs>?bEPR5Hg%PG^`O5-FCY2Hkicm!bH9bb+J> SeL|td3abpnJlVH|oA3|6CMbIV diff --git a/testData/classes/pkg/TestInnerLocal$Inner1.class b/testData/classes/pkg/TestInnerLocal$Inner1.class index 145dc8921152824e2511bb4ca158d8be4c02c3e1..adf59a89b28701b86732f7ba41a8b8c8d2724605 100644 GIT binary patch literal 603 zcmZuu%Sr=55Uk0=HE}g@<2!1i$*FgCF2W zi9MsB5)V6F-91&++w=bM`UYShl^imd&m)TkgBBf>9V|1jCkD^&@<-kXx#~1-bSzcp zfMHDE%cQo;Fyr?hI*nVA=yRn+>_-6)P5)3TsgD>oH~zaYD!JKY$ecuN!BFs}5*LGB zOT@Rl6;j2svP~XKlYbX8W(0DwzIzO=1t%d-5<&IyKfblEyENbW^+0La6HS>&lDy(E z?+Gp9W2GX^wTu)=%>5ekRP=>sR0x8Vea}LuK L^Hj}XiRQv5n9PSw delta 228 zcmcc3vVd9s)W2Q(7#J8#7^FBESQrGj7+4tuK`bG51`&1!@rm*(@&Y~~sl_Fpd3mWt zKKaRsIo6B}Y&MyBnI(3N45}JF6SM3lTQF*cO7JkSF|e~UNHQ{rqH0h9>oo*wgE4r( z4CkE0;^Nd|Mh1bb#Ii*FoW#6zegCAa)Z`LI24)S-Fh&Nx$;%lH*%=vlfKJq(e4kND rpOJwV$mU~U29mlAoD6zEwmt(BkYoUo{0w41nu~!E=mTK}Q3eJ8IHD}j diff --git a/testData/classes/pkg/TestInnerLocal$Inner1Static$Inner2Static.class b/testData/classes/pkg/TestInnerLocal$Inner1Static$Inner2Static.class index b2262f5d6be86dd25b5045a82610851c045a9288..cf258df43ff97ee96f7bcc31a4077b5023730da3 100644 GIT binary patch delta 321 zcmX9(!AiqG6r4?BV`8H=YSh#!c(IMO0rA#@2;wOR5zT$AOI=NqlB}NmiQo_T1%d|= zJa`sA#;Z5+#qeO>%wyi{zGwa0@V|cFKL8wH(}n@hf{s-aYbMr9|DxkY*@!1G&n3T1 z#CZh_hPsx8iFWxJHU`o3b{v*Z-NPZn_Ss#kkmNk&IiCn6@}o4(6jw4!3kEN` z;rBdDcsdS`#WWWquEf=_oa{IoP0XOd(62Lt@~35+=rC;6gSNw2o@q(2$p&nk034sJ2UXH z^9?S3@%cTTz=}ykKqtf}F?0?6y4X7_^LP-`plKKhW&JAa)6yL!iv_=|4u-KXb!VAL z;@(p2gizmEJQYOtj@ZQw@2X9R^d>q1YhBwYyH&2O-6JMf&o!kC$!IB;(j)u>`9&0& diff --git a/testData/classes/pkg/TestInnerLocal$Inner1Static.class b/testData/classes/pkg/TestInnerLocal$Inner1Static.class index f82d0eaadde560b79db1d24526dac28bd8608039..a2449252b95102f761a2e46f754f57e4791e7b63 100644 GIT binary patch delta 314 zcmXw!%SyvQ6o&tki)n(^8g10nYZq3l5D|A-h#;=A5RvZ3cBrFiQqs|tFA-e(3W5s} zT=)RKg=^nIJgv&WKi>!EoSE}vep=zj_uD&wL#%nQ5V$b0=wR7FScV(aDC1t!Px7uv zJEBnHGL;wOAXxfJjR>2`@TMO<5H*fsLi7AK(`q0)YNWX8OcY`uwJeUaEZ0J-JmZ!i zxfXXKN=4R>PUNtVU7=+!E+1R9m1(%}9IO)7|L2xpb$jnm_HBPc2efle zwO>K)-4__oYzC^FRo(^I;q1g~~sBjSXCnfJl) zzOT82`RDg|0UM?sL*EgST85Ua%I7kw_Q!fAi+CL4@Ro^CRPUlbNhZq%&I(EWl+{7# tsHh~+0bkyca(yGXY7!FNiOQQQ!&YrO{p)HD=+V}jDuoPa5n+`g+#j`T6oLQ% diff --git a/testData/classes/pkg/TestInnerLocal.class b/testData/classes/pkg/TestInnerLocal.class index cc89241c2027be4d769d1d5ca14edaceb3a05bdf..bd2bf75d16c87e34acf61611ae1cc6cead951a80 100644 GIT binary patch delta 427 zcmZvY!Ae3w6o&sZcAXrpg{h^MTHQ*ohDZ{KE$+4uS|mZ6;3k*4Bo=y~qD3IHXwg%& z3R?64?Rt*hAv$*qS|kJKoH_IT{~6A6{6V@O-*4{#+Gr>&qa;yYL`6YhQ({ZOit@IC zjPi~`0=p7>3dtx}C2CXmqLuF54ZPvGHx9h3q2G@JVIjN;CWK7y{`R`r_b1`;XylI# z*_}R}oaX=c?UrF8E%Pa?z#)|9a0Y9gg4J6XI)k&xnmy@_!EJ5D4TglM2J9R(c~9EJl>5p7A8Bcwt~kpm#k zzy-JiVpb!)H+u8)-kbdx_FsRyJ#fv^F~VD>2h1FX%5v%$M6Mk+@|h#!+;ZVKjNDk- zb^pBnevmvAQl|^ShkKbxr|840R65v5k#<6^Ql1E-@FTZL(>;dT+_iH=3kIuCWUGxZ zQH%lLh?Fa}JPz-s_l2q@V>}g8-8<1<-|F5|_%%1`9WN&u85#}P>TE$x$BL!?D^xd> K;U&3D=4Ag!lOAmV diff --git a/testData/classes/pkg/TestInnerLocalPkg$1Inner.class b/testData/classes/pkg/TestInnerLocalPkg$1Inner.class deleted file mode 100644 index eedffa20d12fcd09587129c47507995b0a431940..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 417 zcmZutO-sW-5Pg%Tjg8UPYHJG~Ja}j$7zA&Mm!crV4@l{KlP)oB+(@z&|CR?4Jop3r zQQ{;D9x4m-wQt_Mna{8H4*(|^*f7y{{ykY-XY7U>AJ{R%z;J5cVDyvA05Sa9r^b>c8Hp{5TawAqztLZ=2h2 zE+fr5{7b}8&FTUzbQ1ljAk>DVDfan9CZCKErIIQl7PiKfCTA`Tet_-1f!xDa7%vsZ iX1mF~;7v^Q89U%?opS>YHrSi|-@*<@HglE8ZQvVdKU!n} diff --git a/testData/classes/pkg/TestInnerLocalPkg$2Inner.class b/testData/classes/pkg/TestInnerLocalPkg$2Inner.class deleted file mode 100644 index 5a1dcc4781e9ab6efe9d2a011613318ef7baa77a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 492 zcmZ`#%TB^j5Iw`IQY%yx@PUbmm;e%Mj601RqKQd;BoOwc+(4n;n)YJ+Ef>VZg&*KY z8K>361-O|rGk509x##oi{R6-m_VUPJLq`^yaaPt)(XdUR7edLNIM0sdJ91=oRp`ml zIU%RUUQ|CJRPCqf$m)qm-AE}yJ8&KUVVaCwc+yjsgm&YfnMLAepOEPULqRCoo)mYp z$AJiY&cNr6-VJ7jf0_v9Rs_l8CXHyfF5T#XoT8Q z;q}wxAB5~L8VPoMCyGQwF#pWBA54U+2<4?jtXHusKOzX}MzfE7_BP9gr(nh!0Mm?B zafhvDX{#I!t}LENGZtG%b5QFIsaAWA^lLJ>#<7q*AMk3O^Fyu*+)bg##NZ?AC}E2; Koe49HRp1-R18sx= diff --git a/testData/classes/pkg/TestInnerLocalPkg$Inner1.class b/testData/classes/pkg/TestInnerLocalPkg$Inner1.class deleted file mode 100644 index 9d548f11d7c6c7f69253492d20f9ce1f15b47aec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 447 zcmZ`#!AiqG5Ph4Zjg7I1)wU`gJoHdwF)esgyc7f>sLl<}!`X z8S3SuEP6wRZty&h{i!I*>ogU4kVQPXn^%+znac8#VbK4FvnqUi&tQzR2f^S3G8H$A zr%>cm9wyYWCfOp7#FbP#$e(9nmVkz^=eJ;YA?| z2KR66+i)hLl0ok)gYC6?IHJSV=$aZ_H5zbTWrjL*M{=}D(Wc5LhECb>PL^QaJ2Y>w hg#K0$w?f36F^0q^<@B9m*ET7}!A@_yGqFV;KMd diff --git a/testData/classes/pkg/TestInnerLocalPkg$Inner1Static$Inner2Static.class b/testData/classes/pkg/TestInnerLocalPkg$Inner1Static$Inner2Static.class deleted file mode 100644 index 54d59e36bd87cc1e43e3370614d4ab0386032f76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 454 zcmaiw!AiqG5QhJ0YGYz-YqV95iib9WLGfnor634Jg_hnoaS3VTwj^8ewLFO6!3Xf6 z#7Rn3s2~fw^UeJK4l^I0Z|?xkv2UY{O$!F9Ch8`32=qj7`(yDa{6wh8ALukz(FLK> ziB+t-ghp$%+#V6iz3IIq)cUcKH}i);rb7`VoUsSfc^b;AIEUs?X8Kwwnf9llNbV-l zN#4wXiH3tUR7~s={MjV(SCmJE?{uJrj>83+J^N7=k#fu diff --git a/testData/classes/pkg/TestInnerLocalPkg$Inner1Static.class b/testData/classes/pkg/TestInnerLocalPkg$Inner1Static.class deleted file mode 100644 index 262b686c30da2d1cca9da82d1ee68d954ca1d39d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 454 zcmah_!AiqG5Ph4(rirnw(Nw*Oc&HH!im0G?DF{MPA;tS9E+K82NU{}w%Yz6W`~W{n zoJ68X1zFggH~Zeqn|c3ueFJca4HFuc4XChntm<$WtjjDD#eN{UOri!3Q(l&$)X{G; z2MvKeGT8o@KX5PQS?mR}NV52pp>>vIi9Ba;2J_!Lw+z}azY`2yKgq<^Y#NGU#KV*_ zW{}T{NL(Zp=#NAxYfpY2@$_aA?^Vq#EMm=q0aM31!`A&I_U4$|zh~+FxV#R>B9aW= z|GKXt-}9=2%DeNY4x6+|jW)~BtE|-#Bc~Q+mI%2}=m4hs0_N^MLwTw>9lATD1&&C6 aOxhFTbqOm}sYS0%k%|>8pbed(HjGaLyJ?94 diff --git a/testData/classes/pkg/TestInnerLocalPkg.class b/testData/classes/pkg/TestInnerLocalPkg.class deleted file mode 100644 index 7535849415a902d2493e0be9fb679db723b44f00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 847 zcmah{+fKqj5Iqaj(u$%eUQt9*3mA#UH;peOCMI}EFcKdNZm^2QK=r?TGLgg&@S}`p zTfrD>+)Z~bd*dHQ(Y zklhQr(WYm@lRYmWJ(1o`=UTv2uAx!uJa(J%$Wh>#3*Pt-R69+(eSX*4zO|q11g0=8 zka@Ukm46}fJ6{>a6s>}83ao}hgCYhcmj4Ik{fON`M9`z5`A0&#evrz<`ZMVu6M=MS z4s4sMyWF$XM=2<^ z;tRwx75)vLYJ@;ojH6{>b_lO9T&-*$k*ien1+jV`ny-ye(|s*o|0YV20$3zrh9pZ^ z<`$S664rRH-Y@lGToo0g`GavZa3(^@XE@-%Cdb)gF$Juk$X#OY^YllsfCk=x3pWKw52W9YAaRP*5ZS2HccwV#Dw@&!uvocI29JMEGGUZUwj}Y zKKKLtQO0wpLe!SThrM&|-E;4pduQgy&u`xWJi$>G3)o+RkNbkkVh+SS@KNzmRZv=? z(74neb*-nPZtZpZ(sYui3fXhpjdU`OjY7J4#)xVQdM2nNs7|zyytkwBV}-58@I$xO zG^6BY6q$IIESwV?+2mB=ZDk(mx`6+QR9gyOeQ-gAxrU9*t8u?=;-+r*7%4Oc9o=i` z*oyx<=!sl~jMJzPxV7HXqmf~FcaFTWqp_3X-!(rCr**4yGEX=-PK={EJ)RZ`Dzl(8 zu>WoxCAM!`c4R5^jgEESBqlzKqCuh)JBX;P_{TV&n_+A^Ix!biv~)fg#~t&+O3Rzq z$A2s*8z7I>00o2r7Lg4Qh`EKVk3)r>n-A`)X@&g1cY{Y?5#hy~^RUP3<@5G={J0w^ zk|>2`T5de^SLjp2%+KZXqLWcxFp6D68te2vGdIJv6dq2X!mmh$M-!yOM-zDAwl_iM z3;(9EL0fdpHCA0`?G4r_VjG*Z@)}$fdL??S=XO&LiO!TmqA=}{X!CHJICQ;~n7Knw pG8fs+l)p0L=g7P2^$vE)Tb4o!cO{4Pd(Q4r5J=;@z(Z_7{Q}=H#<2hZ delta 197 zcmW-bIS#@w5JkVuVjLL?2q9((kVQ&53c3g(LWe>Z(a}1JkLJX$mK$sII^b4d8K b8K8#{8WAi?Ikg;vzqvF6N*O)oVFvaCYE2nX diff --git a/testData/classes/pkg/TestInnerSignature$InnerStatic.class b/testData/classes/pkg/TestInnerSignature$InnerStatic.class index 2bd775bc27a377081b540e9fd09e821d9a4dd787..7d51b40b09a60a800a144072ed46783fa3aa9f47 100644 GIT binary patch literal 962 zcma)4+int36kUg*P++7L>(sl2qSEogi!Ul6p%@brqD>*ZAEqaGD$J0X!Nh;@Cww3# zKKKEClyMz~A_|Fpn0?m1uf1pg{Pq0@faf^MBZGq+woo>rV#Hw<53+bDAf!O4b1py0 z`bhf2`uoAT^5Rzlxvn1iGM^!*0NRMjo(F z8AViZ4Tt;yH_68y_NlSbf{#IlNosC094y=*{u6)GgwNyiY@3#H>v)FqSm?umM{TsRdXE0|P^wumEcys>S5o zlbhW4?&_Tk9-r$Cn9<9Srec$#8lx7Yu4pRSr{J7(`q3hcmSMCC2RnTc2e0FxupF{6 za#)J4prtpmb9(xEFKfcpN4Zs!f_X64FWFuTT;rZO4MUQQuo;tQLXoL)kj4^!D^dP6 N9xam@gxNLlvA+rs7cl?; diff --git a/testData/classes/pkg/TestInnerSignature.class b/testData/classes/pkg/TestInnerSignature.class index e2f948978059ff410185daba9e079b7247c94fee..18b96efd6263d2fc8b90f987e01b0ee9e97846c4 100644 GIT binary patch delta 504 zcmZ`#Jx>Bb5Pf^cd3>v24pbBb^#Dz1>`qMp6JtVQ^g_Sl22bH2$6;b4f53*&+FRIK zS@;9&?ffSu#<}w=7G{$-Z)V@@yq$aHRn?#0AD;khVKa;=6hct2>cN@^>nd~=MHQv7 zo@M3n{@p0i=(TvK$sLQIbcE>vL%=<=1`O#&|Ds(n#lStVZQ&eSZJWD8M;Hv+-?pp% zcWdFFo^7*gm^H(!8@tpVEq0H}e*yR zYn<~-Ug>bVUD*?TN3^&rPL1)~b!sDuC}L5}c#uGh#GduZ4bzpp&mLG#$@uJraaD#! zOS+xxNZFB$6mgB#0|XI3h)x)BM3AIM(^M@}6_~?37ASg*hJpEvCPMNVjfIRw;=lR~ yWuN-#AN}l)K1up`l>`!&uuL%`6EI{6;oT8R$YI5gdGZDNoCKA;27Q+bxnv*VJ6#h1 delta 202 zcmXYqOAf(M6o&tMsH=4=(k9h=NS9adlu&0U0nh`E6USc9z)=O!lK z|HwJ{-|}kZukYgtV1cQF1_m}P3=Lv~L?V?KNsOyJ5m~jnxN26eigI0)n__;{cX9S7 z3JR`5$H0Rt;OQ;pBGxBLMaT^GjrNid@X%6!C^-mp*#|sfSm$ITL>m!&^jHDnT>HC- TJJa;}3OqrO{MqE>u(lw6e{mPa diff --git a/testData/results/TestInnerLocal.dec b/testData/results/TestInnerLocal.dec index 6ca3a7e..af4fb30 100644 --- a/testData/results/TestInnerLocal.dec +++ b/testData/results/TestInnerLocal.dec @@ -1,133 +1,135 @@ +package pkg; + public class TestInnerLocal { public static void testStaticMethod() { class Inner { final String x; - public Inner(String var1) { - this.x = var1;// 22 - }// 23 + public Inner(@Deprecated String x) { + this.x = x;// 8 + }// 9 } - new Inner("test");// 25 - new TestInnerLocal.Inner1Static("test");// 26 - new TestInnerLocal.Inner1Static.Inner2Static("test");// 27 - }// 28 + new Inner("test");// 11 + new TestInnerLocal.Inner1Static("test");// 12 + new TestInnerLocal.Inner1Static.Inner2Static("test");// 13 + }// 14 public void testMethod() { class Inner { final String x; - public Inner(String var2) { - this.x = var2;// 34 - }// 35 + public Inner(@Deprecated String x) { + this.x = x;// 20 + }// 21 } - new Inner("test");// 37 - new TestInnerLocal.Inner1Static("test");// 38 - new TestInnerLocal.Inner1("test");// 39 - new TestInnerLocal.Inner1Static.Inner2Static("test");// 40 - }// 41 + new Inner("test");// 23 + new TestInnerLocal.Inner1Static("test");// 24 + new TestInnerLocal.Inner1("test");// 25 + new TestInnerLocal.Inner1Static.Inner2Static("test");// 26 + }// 27 static class Inner1Static { final String x; - public Inner1Static(String var1) { - this.x = var1;// 53 - }// 54 + public Inner1Static(@Deprecated String x) { + this.x = x;// 39 + }// 40 public static class Inner2Static { final String x; - public Inner2Static(String var1) { - this.x = var1;// 59 - }// 60 + public Inner2Static(@Deprecated String x) { + this.x = x;// 45 + }// 46 } } class Inner1 { final String x; - public Inner1(String var2) { - this.x = var2;// 46 - }// 47 + public Inner1(@Deprecated String x) { + this.x = x;// 32 + }// 33 } } -class 'TestInnerLocal$1Inner' { +class 'pkg/TestInnerLocal$1Inner' { method ' (Ljava/lang/String;)V' { - 6 6 - 9 7 + 6 8 + 9 9 } } -class 'TestInnerLocal' { +class 'pkg/TestInnerLocal' { method 'testStaticMethod ()V' { - 4 10 - e 11 - 18 12 - 1e 13 + 4 12 + e 13 + 18 14 + 1e 15 } method 'testMethod ()V' { - 5 24 - f 25 - 1a 26 - 24 27 - 2a 28 + 5 26 + f 27 + 1a 28 + 24 29 + 2a 30 } } -class 'TestInnerLocal$2Inner' { - method ' (LTestInnerLocal;Ljava/lang/String;)V' { - b 20 - e 21 +class 'pkg/TestInnerLocal$2Inner' { + method ' (Lpkg/TestInnerLocal;Ljava/lang/String;)V' { + b 22 + e 23 } } -class 'TestInnerLocal$Inner1Static' { +class 'pkg/TestInnerLocal$Inner1Static' { method ' (Ljava/lang/String;)V' { - 6 34 - 9 35 + 6 36 + 9 37 } } -class 'TestInnerLocal$Inner1Static$Inner2Static' { +class 'pkg/TestInnerLocal$Inner1Static$Inner2Static' { method ' (Ljava/lang/String;)V' { - 6 41 - 9 42 + 6 43 + 9 44 } } -class 'TestInnerLocal$Inner1' { - method ' (LTestInnerLocal;Ljava/lang/String;)V' { - b 50 - e 51 +class 'pkg/TestInnerLocal$Inner1' { + method ' (Lpkg/TestInnerLocal;Ljava/lang/String;)V' { + b 52 + e 53 } } Lines mapping: -22 <-> 7 -23 <-> 8 -25 <-> 11 -26 <-> 12 -27 <-> 13 -28 <-> 14 -34 <-> 21 -35 <-> 22 -37 <-> 25 -38 <-> 26 -39 <-> 27 -40 <-> 28 -41 <-> 29 -46 <-> 51 -47 <-> 52 -53 <-> 35 -54 <-> 36 -59 <-> 42 -60 <-> 43 +8 <-> 9 +9 <-> 10 +11 <-> 13 +12 <-> 14 +13 <-> 15 +14 <-> 16 +20 <-> 23 +21 <-> 24 +23 <-> 27 +24 <-> 28 +25 <-> 29 +26 <-> 30 +27 <-> 31 +32 <-> 53 +33 <-> 54 +39 <-> 37 +40 <-> 38 +45 <-> 44 +46 <-> 45 Not mapped: -21 -33 -45 -52 -58 +7 +19 +31 +38 +44 diff --git a/testData/results/TestInnerLocalPkg.dec b/testData/results/TestInnerLocalPkg.dec deleted file mode 100644 index 7cafa41..0000000 --- a/testData/results/TestInnerLocalPkg.dec +++ /dev/null @@ -1,135 +0,0 @@ -package pkg; - -public class TestInnerLocalPkg { - public static void testStaticMethod() { - class Inner { - final String x; - - public Inner(String var1) { - this.x = var1;// 24 - }// 25 - } - - new Inner("test");// 27 - new TestInnerLocalPkg.Inner1Static("test");// 28 - new TestInnerLocalPkg.Inner1Static.Inner2Static("test");// 29 - }// 30 - - public void testMethod() { - class Inner { - final String x; - - public Inner(String var2) { - this.x = var2;// 36 - }// 37 - } - - new Inner("test");// 39 - new TestInnerLocalPkg.Inner1Static("test");// 40 - new TestInnerLocalPkg.Inner1("test");// 41 - new TestInnerLocalPkg.Inner1Static.Inner2Static("test");// 42 - }// 43 - - static class Inner1Static { - final String x; - - public Inner1Static(String var1) { - this.x = var1;// 55 - }// 56 - - public static class Inner2Static { - final String x; - - public Inner2Static(String var1) { - this.x = var1;// 61 - }// 62 - } - } - - class Inner1 { - final String x; - - public Inner1(String var2) { - this.x = var2;// 48 - }// 49 - } -} - -class 'pkg/TestInnerLocalPkg$1Inner' { - method ' (Ljava/lang/String;)V' { - 6 8 - 9 9 - } -} - -class 'pkg/TestInnerLocalPkg' { - method 'testStaticMethod ()V' { - 4 12 - e 13 - 18 14 - 1e 15 - } - - method 'testMethod ()V' { - 5 26 - f 27 - 1a 28 - 24 29 - 2a 30 - } -} - -class 'pkg/TestInnerLocalPkg$2Inner' { - method ' (Lpkg/TestInnerLocalPkg;Ljava/lang/String;)V' { - b 22 - e 23 - } -} - -class 'pkg/TestInnerLocalPkg$Inner1Static' { - method ' (Ljava/lang/String;)V' { - 6 36 - 9 37 - } -} - -class 'pkg/TestInnerLocalPkg$Inner1Static$Inner2Static' { - method ' (Ljava/lang/String;)V' { - 6 43 - 9 44 - } -} - -class 'pkg/TestInnerLocalPkg$Inner1' { - method ' (Lpkg/TestInnerLocalPkg;Ljava/lang/String;)V' { - b 52 - e 53 - } -} - -Lines mapping: -24 <-> 9 -25 <-> 10 -27 <-> 13 -28 <-> 14 -29 <-> 15 -30 <-> 16 -36 <-> 23 -37 <-> 24 -39 <-> 27 -40 <-> 28 -41 <-> 29 -42 <-> 30 -43 <-> 31 -48 <-> 53 -49 <-> 54 -55 <-> 37 -56 <-> 38 -61 <-> 44 -62 <-> 45 -Not mapped: -23 -35 -47 -54 -60 diff --git a/testData/results/TestInnerSignature.dec b/testData/results/TestInnerSignature.dec index bb18d0d..b2e4d0f 100644 --- a/testData/results/TestInnerSignature.dec +++ b/testData/results/TestInnerSignature.dec @@ -1,24 +1,26 @@ +package pkg; + public class TestInnerSignature { A a; B b; C c; - public TestInnerSignature(A var1, B var2, C var3) { - this.a = var1;// 23 - this.b = var2;// 24 - this.c = var3;// 25 - }// 26 + public TestInnerSignature(A a, @Deprecated B b, C c) { + this.a = a;// 9 + this.b = b;// 10 + this.c = c;// 11 + }// 12 public static class InnerStatic { A a; B b; C c; - public InnerStatic(A var1, B var2, C var3) { - this.a = var1;// 46 - this.b = var2;// 47 - this.c = var3;// 48 - }// 49 + public InnerStatic(A a, @Deprecated B b, C c) { + this.a = a;// 32 + this.b = b;// 33 + this.c = c;// 34 + }// 35 } public class Inner { @@ -26,55 +28,55 @@ public class TestInnerSignature { B b; C c; - public Inner(A var2, B var3, C var4) { - this.a = var2;// 34 - this.b = var3;// 35 - this.c = var4;// 36 - }// 37 + public Inner(A a, @Deprecated B b, C c) { + this.a = a;// 20 + this.b = b;// 21 + this.c = c;// 22 + }// 23 } } -class 'TestInnerSignature' { +class 'pkg/TestInnerSignature' { method ' (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' { - 6 6 - b 7 - 10 8 - 13 9 + 6 8 + b 9 + 10 10 + 13 11 } } -class 'TestInnerSignature$InnerStatic' { +class 'pkg/TestInnerSignature$InnerStatic' { method ' (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' { - 6 17 - b 18 - 10 19 - 13 20 + 6 19 + b 20 + 10 21 + 13 22 } } -class 'TestInnerSignature$Inner' { - method ' (LTestInnerSignature;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' { - b 29 - 10 30 - 16 31 - 19 32 +class 'pkg/TestInnerSignature$Inner' { + method ' (Lpkg/TestInnerSignature;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V' { + b 31 + 10 32 + 16 33 + 19 34 } } Lines mapping: -23 <-> 7 -24 <-> 8 -25 <-> 9 -26 <-> 10 -34 <-> 30 -35 <-> 31 -36 <-> 32 -37 <-> 33 -46 <-> 18 -47 <-> 19 -48 <-> 20 -49 <-> 21 +9 <-> 9 +10 <-> 10 +11 <-> 11 +12 <-> 12 +20 <-> 32 +21 <-> 33 +22 <-> 34 +23 <-> 35 +32 <-> 20 +33 <-> 21 +34 <-> 22 +35 <-> 23 Not mapped: -22 -33 -45 +8 +19 +31 diff --git a/testData/src/pkg/TestInnerLocal.java b/testData/src/pkg/TestInnerLocal.java index f0e9565..1d961fd 100644 --- a/testData/src/pkg/TestInnerLocal.java +++ b/testData/src/pkg/TestInnerLocal.java @@ -1,24 +1,10 @@ -/* - * Copyright 2000-2014 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +package pkg; public class TestInnerLocal { public static void testStaticMethod() { class Inner { final String x; - public Inner(String x) { + public Inner(@Deprecated String x) { this.x = x; } } @@ -30,7 +16,7 @@ public class TestInnerLocal { public void testMethod() { class Inner { final String x; - public Inner(String x) { + public Inner(@Deprecated String x) { this.x = x; } } @@ -42,20 +28,20 @@ public class TestInnerLocal { class Inner1 { final String x; - public Inner1(String x) { + public Inner1(@Deprecated String x) { this.x = x; } } static class Inner1Static { final String x; - public Inner1Static(String x) { + public Inner1Static(@Deprecated String x) { this.x = x; } public static class Inner2Static { final String x; - public Inner2Static(String x) { + public Inner2Static(@Deprecated String x) { this.x = x; } } diff --git a/testData/src/pkg/TestInnerLocalPkg.java b/testData/src/pkg/TestInnerLocalPkg.java deleted file mode 100644 index cc3b2b4..0000000 --- a/testData/src/pkg/TestInnerLocalPkg.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2000-2014 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package pkg; - -public class TestInnerLocalPkg { - public static void testStaticMethod() { - class Inner { - final String x; - public Inner(String x) { - this.x = x; - } - } - new Inner("test"); - new Inner1Static("test"); - new Inner1Static.Inner2Static("test"); - } - - public void testMethod() { - class Inner { - final String x; - public Inner(String x) { - this.x = x; - } - } - new Inner("test"); - new Inner1Static("test"); - new Inner1("test"); - new Inner1Static.Inner2Static("test"); - } - - class Inner1 { - final String x; - public Inner1(String x) { - this.x = x; - } - } - - static class Inner1Static { - final String x; - public Inner1Static(String x) { - this.x = x; - } - - public static class Inner2Static { - final String x; - public Inner2Static(String x) { - this.x = x; - } - } - } -} \ No newline at end of file diff --git a/testData/src/pkg/TestInnerSignature.java b/testData/src/pkg/TestInnerSignature.java index d69f0b3..4da4162 100644 --- a/testData/src/pkg/TestInnerSignature.java +++ b/testData/src/pkg/TestInnerSignature.java @@ -1,25 +1,11 @@ -/* - * Copyright 2000-2014 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +package pkg; public class TestInnerSignature { A a; B b; C c; - public TestInnerSignature(A a,B b,C c) { + public TestInnerSignature(A a, @Deprecated B b,C c) { this.a = a; this.b = b; this.c = c; @@ -30,7 +16,7 @@ public class TestInnerSignature { B b; C c; - public Inner(A a, B b, C c) { + public Inner(A a, @Deprecated B b, C c) { this.a = a; this.b = b; this.c = c; @@ -42,7 +28,7 @@ public class TestInnerSignature { B b; C c; - public InnerStatic(A a, B b, C c) { + public InnerStatic(A a, @Deprecated B b, C c) { this.a = a; this.b = b; this.c = c;