From a7bca9af787487e8539b65c7c9e2888c1e1e0049 Mon Sep 17 00:00:00 2001 From: aclement Date: Thu, 18 Sep 2008 17:31:17 +0000 Subject: [PATCH] binary handles testcase - commented out --- tests/bugs162/IntoBinary/Asp.java | 3 ++ tests/bugs162/IntoBinary/Clazz.java | 3 ++ tests/bugs162/IntoBinary/binaryaspect.jar | Bin 0 -> 1127 bytes .../systemtest/ajc162/Ajc162Tests.java | 33 ++++++++++++++++++ .../org/aspectj/systemtest/ajc162/ajc162.xml | 4 +++ 5 files changed, 43 insertions(+) create mode 100644 tests/bugs162/IntoBinary/Asp.java create mode 100644 tests/bugs162/IntoBinary/Clazz.java create mode 100644 tests/bugs162/IntoBinary/binaryaspect.jar diff --git a/tests/bugs162/IntoBinary/Asp.java b/tests/bugs162/IntoBinary/Asp.java new file mode 100644 index 000000000..8614a5175 --- /dev/null +++ b/tests/bugs162/IntoBinary/Asp.java @@ -0,0 +1,3 @@ +public aspect Asp { + before(): execution(* foo(..)) {} +} diff --git a/tests/bugs162/IntoBinary/Clazz.java b/tests/bugs162/IntoBinary/Clazz.java new file mode 100644 index 000000000..4de725d92 --- /dev/null +++ b/tests/bugs162/IntoBinary/Clazz.java @@ -0,0 +1,3 @@ +public class Clazz { + public void foo() {} +} diff --git a/tests/bugs162/IntoBinary/binaryaspect.jar b/tests/bugs162/IntoBinary/binaryaspect.jar new file mode 100644 index 0000000000000000000000000000000000000000..6580ec8c8bc02d989b9e4d887469a77017e5b2c8 GIT binary patch literal 1127 zcmWIWW@Zs#-~hq}MTV9PNI-;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;awn`%z-!nr}dmbS;yi6z2uz4;^Mm@vHrr2BDR;`Pt)p9_`w^oRV3H7 zvr9-htn&z0r>TUmu<>2KlG&--Z_aJ{$5;F1uDBdavcaquv(^47&A(#3SzG?ru_NNb zvwhOv&8>cCS^PeCe@*pwMhCgag)I_?F2@=7aX9-oum8|=^zG6^HCq*VPF^@J?RIR7 zujOIi)la*W@++Gb?%yI?wf~*f>OEPVt9ed-3XZosBiW#rxl32+^|Ipy0TaWHE_&R> z!+EwR{YOe@h`PGo<++dbp66=-S7dpXd23?fbnnX> zw;#Ru`|pFFu5A@%CK{(UmhtqiJ+w-QXZb`2qdsAt<(j($Tz*fTQM_zx<>AbmTciDX zE{1I3YzdM$sQLBMWuBdH`uL_T^|sx0YuoZw+9$2P|CzJPzdxjzO)@BT`BSN+V{^xXY8)ww>$7&eQ8b4HP)!ZThv5K z9OU~hlsj$K_P64=(zCzoQ2rvP6#1iuxB6dKv+i%{u;b53cwt<1FZoGgej2mwY>S^0 zW7eDGJm39``J2iniMvy^#4jx4_|AFpL{!CEWviuiKSN~qd)~G@_C@!?SGhM2)mGR$ zzm}cs^7XOvm8+Yj(%`*|PsUdi+^b z)8=L9wCHIj>A8nRPam3gXVsZomv$!Jx>FnV)AD;&z@JHemu4NZd{iHJZIWQsva{y( zrZa^drLBF_esldvbgFNCGw)ix$wKSrh0!A1E`Q^NrG7pa{>2Q+R0_ueC(1E1FtBrg zG8H3}2m>NlBWE~Ju0{p8@;JIF$Tom7Cj!(1neeO{;LXYgl41hFS|EJ|=qLsT037|) AUjP6A literal 0 HcmV?d00001 diff --git a/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java b/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java index 0085ffe99..268e2224f 100644 --- a/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java @@ -11,14 +11,47 @@ package org.aspectj.systemtest.ajc162; import java.io.File; +import java.io.PrintWriter; import junit.framework.Test; +import org.aspectj.asm.AsmManager; import org.aspectj.testing.XMLBasedAjcTestCase; public class Ajc162Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // AspectJ1.6.2 + + // When faulting in the binary hierarchy: + // [java source file] + // Clazz.java [java source file] C:\temp\ajcSandbox\aspectj16_2\ajcTest3344.tmp\Clazz.java:1::0 + // import declarations [import reference] + // Clazz [class] C:\temp\ajcSandbox\aspectj16_2\ajcTest3344.tmp\Clazz.java:1::13 + // foo() [method] C:\temp\ajcSandbox\aspectj16_2\ajcTest3344.tmp\Clazz.java:2::36 + // Asp.class (binary) [class] C:\temp\ajcSandbox\aspectj16_2\ajcTest3344.tmp\binaryaspect.jar!Asp.class:1::0 + // import declarations [import reference] + // Asp [aspect] C:\temp\ajcSandbox\aspectj16_2\ajcTest3344.tmp\binaryaspect.jar!Asp.class:1::0 + // before(): [advice] C:\temp\ajcSandbox\aspectj16_2\ajcTest3344.tmp\binaryaspect.jar!Asp.class:2::0 + // Hid:1:(targets=1) [Asp.class (binary)}Asp&before (advises) {Clazz.java[Clazz~foo + // Hid:2:(targets=1) {Clazz.java[Clazz~foo (advised by) [Asp.class (binary)}Asp&before + + // without faulting in the model they stop at the top level (the class level) + + // Hid:1:(targets=1) "{Clazz.java[Clazz~foo" (advised by) "{Asp.class" + // Hid:2:(targets=1) "{Asp.class" (advises) "{Clazz.java[Clazz~foo" + + // what I want for the hid is: + + // "[Asp.class}Asp&before" +/* + public void testBinaryAspectModeling() throws Exception { + runTest("binary aspects model"); + AsmManager.dumptree(AsmManager.getDefault().getHierarchy().getRoot(), 0); + PrintWriter pw = new PrintWriter(System.out); + AsmManager.getDefault().dumprels(pw); + pw.flush(); + } +*/ public void testPerClause() { runTest("ltw perclause"); } diff --git a/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml b/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml index f096322b2..c1054ee34 100644 --- a/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml +++ b/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml @@ -3,6 +3,10 @@ + + + + -- 2.39.5