From fdbd12e319a0c18c40906780b372fa3cfb573fe4 Mon Sep 17 00:00:00 2001 From: aclement Date: Mon, 12 Jul 2010 19:21:05 +0000 Subject: [PATCH] 319431: test+fix: reweavable state names and signatures --- tests/bugs1610/pr319431/Azpect.java | 5 + tests/bugs1610/pr319431/Azpect2.java | 5 + tests/bugs1610/pr319431/Code.java | 6 + tests/bugs1610/pr319431/builtWith168.jar | Bin 0 -> 1847 bytes .../org/aspectj/systemtest/AllTests16.java | 2 + .../systemtest/ajc1610/Ajc1610Tests.java | 8 +- .../aspectj/systemtest/ajc1610/ajc1610.xml | 407 +----------------- 7 files changed, 24 insertions(+), 409 deletions(-) create mode 100644 tests/bugs1610/pr319431/Azpect.java create mode 100644 tests/bugs1610/pr319431/Azpect2.java create mode 100644 tests/bugs1610/pr319431/Code.java create mode 100644 tests/bugs1610/pr319431/builtWith168.jar diff --git a/tests/bugs1610/pr319431/Azpect.java b/tests/bugs1610/pr319431/Azpect.java new file mode 100644 index 000000000..be0c69d50 --- /dev/null +++ b/tests/bugs1610/pr319431/Azpect.java @@ -0,0 +1,5 @@ +package com.foo.bar; + +public aspect Azpect { + before(): staticinitialization(*){} +} diff --git a/tests/bugs1610/pr319431/Azpect2.java b/tests/bugs1610/pr319431/Azpect2.java new file mode 100644 index 000000000..f7b03a856 --- /dev/null +++ b/tests/bugs1610/pr319431/Azpect2.java @@ -0,0 +1,5 @@ +package com.foo.bar; + +public aspect Azpect2 { + before(): staticinitialization(*) {} +} diff --git a/tests/bugs1610/pr319431/Code.java b/tests/bugs1610/pr319431/Code.java new file mode 100644 index 000000000..59e5c1bf0 --- /dev/null +++ b/tests/bugs1610/pr319431/Code.java @@ -0,0 +1,6 @@ +package com.foo.bar; + +public class Code { + public static void main(String[] argv) { + } +} diff --git a/tests/bugs1610/pr319431/builtWith168.jar b/tests/bugs1610/pr319431/builtWith168.jar new file mode 100644 index 0000000000000000000000000000000000000000..645b179fed54e7729cf36e41afee44ea36c3b4ac GIT binary patch literal 1847 zcmWIWW@Zs#-~htHxHmQoNI-;vg~8V~#8KDN&rRRg(a+P(H8@1i*X`da28PeRXHNTg z>*`(P_14uocjo-&AcHH$51tn3dHL#i`d%zuwI!%PN6*7o?_*HGx%0Xw&UorRdiv-o z6GMPEJIAIg;a!$Mi_C#I0B(H|n)MPu+2s6O{j~gi{iMVqeaEVT)Z`MqyOqa{gV=xa)yM>RGi+0oAo4K@$WrCm3*frD{s$t9_K(ocy*=_(A;_ z{x3`QZA=`q0w&(t9`;KAC3k(}w{vfV)Dstb)n*>`+HCy&+??w3_o~zWSA6}f&yaKG zxxtZuvZsfCEt~RHjQ>@)f7PK-%O#R-RyDJ)@4jPMS?3-7Y+E|H`fi=V zvp5@co-QRCz-g!7Wwy<~Mg^D+;w*|~QZLn~mt)Pib{c7zgU-Ex0e6-K|!^NlO zk^)xyAC#4@TQ3oGb!BMVmq~X7Tn+YQCrYT!^7WBirCPkfA^Lsf35D5*HQRzYmq@ft zw~b%(MSh!0f&Ql{)0dv!z1rr(7Fp}f+-jwQnm!Q{mv3HL^|qBKbnX^avs4AGBh_;& z)(gM?+EIRVB}d`a!u4k?c+yigq<#+gZT+q9!EL1t;^y0I|6VLRbkE#r>(gV`554`= zpzZ&Qd0j}~iw|>s+cv%mDLQ#hP4$gTiKF<7IjuHamNkb8Ci-1}d^vD#*po$u>re07 zU-)>UcGWCbx%qBdmfzO8&N=QHJ4efTZIuTzuV}#Z^{T6!%r{+lmN@0amT%E_FLSmf zIe%jgzw@Pp*(;DQ`gp<&pC223r$vc6ddT=|l+97$lv9nKv`?siN^5^X*yRG9J^hp7 z&Z9XL;`@ zX)q#=qz% z^QJt5Y2Mj>GkGF-e`wcD3ftMp&294T(1z>X{4eJ&pJ*m`HfvU!-|;@tC8<{K&ok*@dRl2`-3qCBS3SxSe?0wO zAGEnc$y(z{s?qz$r>E-AvNoy^__jm)P}&;(^t!v5T7s)K+Bh1*i$>xr8RPdGaJBP2H&7;%e* zonP{{$8?_C+s=s=yr+0KadL3-9q_zS!0J-UpWxhd<3dnrY53k%RiR&h-fs72VA)n9 z!f|@yJQnA*%>lC>OuQFv=anOSdM1z1%)X|*1#1@dJa~I7bIx6Lk?7mCPA8LAYb32~ zGqQ2oE4}>H&4(%>&vx<%yGFcx<)K!ane_XAqE0IN$1A`7t+}0e-{qL*!i!Zm=U#uG zs^;e|8y%csEL8NX>u1l=Y}NEr9m}<>FZ}Kgo#LUqIbwOS)SQ4>7kf5Tx!E~wUC!^j zWZsc!*Cs7h(CG>|>HUURck0{w9d;GTwsWQQ79RASQ}%O5(9zHswJlF9vf8p%^ky05 z9oWJ6n9XwC%{;Br^|E*GW?nCloyWV&@rKRf!{UBlr_L-YZ~404scPn#9aB%`P1zBe z$h}ARM(`8y{LcLO^^Dm`vHSk=O--&7Dd>A2m6uXGuXO6sVzGOMdJE32Nc|TY;ibbL zyUJQe%(-$_Wk98(>O-Zlm>19V`J~S=|9D^cmc_hZHb*Y6bN#L<*%9TPHr>mjzpi(W zw~+X8qu5|K^TExcHqjH$PkWnR>A2w7Ar`LxvkoNfU%vd~d^HFA*}wQesUztI-|Ab8 z3=D0+6cXUg$Rxsms8Wzidr*~v3UF00$fkg52ITYysu>WV9>~O1PoSHE>`qWxMF3-< Y!;nouq}%{+RyL42W+1!(qyxb`04#S5xBvhE literal 0 HcmV?d00001 diff --git a/tests/src/org/aspectj/systemtest/AllTests16.java b/tests/src/org/aspectj/systemtest/AllTests16.java index 71ac4143c..ce32370fe 100644 --- a/tests/src/org/aspectj/systemtest/AllTests16.java +++ b/tests/src/org/aspectj/systemtest/AllTests16.java @@ -8,6 +8,7 @@ import junit.framework.TestSuite; import org.aspectj.systemtest.ajc160.AllTestsAspectJ160; import org.aspectj.systemtest.ajc161.AllTestsAspectJ161; +import org.aspectj.systemtest.ajc1610.AllTestsAspectJ1610; import org.aspectj.systemtest.ajc162.AllTestsAspectJ162; import org.aspectj.systemtest.ajc163.AllTestsAspectJ163; import org.aspectj.systemtest.ajc164.AllTestsAspectJ164; @@ -31,6 +32,7 @@ public class AllTests16 { suite.addTest(AllTestsAspectJ166.suite()); suite.addTest(AllTestsAspectJ167.suite()); suite.addTest(AllTestsAspectJ169.suite()); + suite.addTest(AllTestsAspectJ1610.suite()); suite.addTest(AllTests15.suite()); // $JUnit-END$ return suite; diff --git a/tests/src/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java b/tests/src/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java index 020b0c5db..5ca583514 100644 --- a/tests/src/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc1610/Ajc1610Tests.java @@ -18,9 +18,9 @@ import org.aspectj.testing.XMLBasedAjcTestCase; public class Ajc1610Tests extends org.aspectj.testing.XMLBasedAjcTestCase { - // public void testMessyDecp_318241() { - // runTest("messy decp"); - // } + public void testLoadingOldCode_319431() { + runTest("loading old code"); + } // --- @@ -30,7 +30,7 @@ public class Ajc1610Tests extends org.aspectj.testing.XMLBasedAjcTestCase { @Override protected File getSpecFile() { - return new File("../tests/src/org/aspectj/systemtest/ajc169/ajc169.xml"); + return new File("../tests/src/org/aspectj/systemtest/ajc1610/ajc1610.xml"); } } \ No newline at end of file diff --git a/tests/src/org/aspectj/systemtest/ajc1610/ajc1610.xml b/tests/src/org/aspectj/systemtest/ajc1610/ajc1610.xml index 8e4eab525..b2dde3d5e 100644 --- a/tests/src/org/aspectj/systemtest/ajc1610/ajc1610.xml +++ b/tests/src/org/aspectj/systemtest/ajc1610/ajc1610.xml @@ -2,412 +2,9 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- 2.39.5