Skip to content

Commit afc8261

Browse files
kriegaexkriegaex
committed
Fix expected weave messages after previous changes
Remove leading "weaveInfo", add missing "see also:" to weave messages. Relates to #218. Signed-off-by: Alexander Kriegisch <[email protected]>
1 parent a1a700f commit afc8261

File tree

6 files changed

+142
-130
lines changed

6 files changed

+142
-130
lines changed

‎tests/src/test/resources/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
options="-1.5"/>
9696
<run class="ataspectj.DumpTest" ltw="ataspectj/aop-dump.xml"/>
9797
</ajc-test>
98-
98+
9999
<ajc-test dir="java5/ataspectj" title="LTW DumpTest before and after">
100100
<compile
101101
files="ataspectj/EmptyAspect.aj"
@@ -163,7 +163,7 @@
163163
files="ataspectj/ltwlog/Aspect1.java"
164164
options="-1.5 -XterminateAfterCompilation"
165165
>
166-
</compile>
166+
</compile>
167167
<run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-silent.xml">
168168
<stdout>
169169
<line text="execution(Main.target())"/>
@@ -182,7 +182,7 @@
182182
files="ataspectj/ltwlog/Aspect1.java"
183183
options="-1.5 -XterminateAfterCompilation"
184184
>
185-
</compile>
185+
</compile>
186186
<run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-verbose.xml">
187187
<stdout>
188188
<line text="execution(Main.target())"/>
@@ -207,7 +207,7 @@
207207
files="ataspectj/ltwlog/Aspect1.java"
208208
options="-1.5 -XterminateAfterCompilation"
209209
>
210-
</compile>
210+
</compile>
211211
<run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-verboseandshow.xml">
212212
<stdout>
213213
<line text="execution(Main.target())"/>
@@ -218,7 +218,8 @@
218218
<line text="info using"/>
219219
<line text="info register aspect ataspectj.ltwlog.Aspect1"/>
220220
<line text="debug weaving 'ataspectj.ltwlog.Main'"/>
221-
<line text="weaveinfo Join point 'method-execution(void ataspectj.ltwlog.Main.target())' in Type 'ataspectj.ltwlog.Main' (Main.java:22) advised by before advice from 'ataspectj.ltwlog.Aspect1' (Aspect1.java)"/>
221+
<line text="Join point 'method-execution(void ataspectj.ltwlog.Main.target())' in Type 'ataspectj.ltwlog.Main' (Main.java:22) advised by before advice from 'ataspectj.ltwlog.Aspect1' (Aspect1.java)"/>
222+
<line text="see also:"/>
222223
<line text="debug weaving 'ataspectj.ltwlog.Aspect1'"/>
223224
</stderr>
224225
</run>
@@ -233,7 +234,7 @@
233234
files="ataspectj/ltwlog/Aspect1.java"
234235
options="-1.5 -XterminateAfterCompilation"
235236
>
236-
</compile>
237+
</compile>
237238
<run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-messagehandler.xml">
238239
<stdout>
239240
<line text="MessageHolder.MessageHolder()"/>
@@ -257,11 +258,16 @@
257258
<!--<run class="ataspectj.DeclareParentsInterfaceTest" ltw="ataspectj/aop-decptest.xml"/>-->
258259
<ant file="ajc-ant.xml" target="ltw.Decp" verbose="true">
259260
<stderr>
260-
<line text="weaveinfo Extending interface set for type 'ataspectj.DeclareParentsInterfaceTest$Target' (DeclareParentsInterfaceTest.java) to include 'ataspectj.DeclareParentsInterfaceTest$Marker' (DeclareParentsInterfaceTest.java)"/>
261-
<line text="weaveinfo Join point 'method-execution(void ataspectj.DeclareParentsInterfaceTest$Target.target())' in Type 'ataspectj.DeclareParentsInterfaceTest$Target' (DeclareParentsInterfaceTest.java:27) advised by before advice from 'ataspectj.DeclareParentsInterfaceTest$TestAspect' (DeclareParentsInterfaceTest.java)"/>
262-
<line text="weaveinfo Extending interface set for type 'ataspectj.DeclareParentsImplementsTest$Target' (DeclareParentsImplementsTest.java) to include 'ataspectj.DeclareParentsImplementsTest$Introduced' (DeclareParentsImplementsTest.java)"/>
263-
<line text="weaveinfo Type 'ataspectj.DeclareParentsImplementsTest$Target' (DeclareParentsImplementsTest.java) has intertyped method from 'ataspectj.DeclareParentsImplementsTest$TestAspect' (DeclareParentsImplementsTest.java:'void ataspectj.DeclareParentsImplementsTest$Introduced.intro()')"/>
264-
<line text="weaveinfo Join point 'method-execution(void ataspectj.DeclareParentsImplementsTest$Implementation.intro())' in Type 'ataspectj.DeclareParentsImplementsTest$Implementation' (DeclareParentsImplementsTest.java:47) advised by before advice from 'ataspectj.DeclareParentsImplementsTest$TestAspect' (DeclareParentsImplementsTest.java)"/>
261+
<line text="Extending interface set for type 'ataspectj.DeclareParentsInterfaceTest$Target' (DeclareParentsInterfaceTest.java) to include 'ataspectj.DeclareParentsInterfaceTest$Marker' (DeclareParentsInterfaceTest.java)"/>
262+
<line text="see also:"/>
263+
<line text="Join point 'method-execution(void ataspectj.DeclareParentsInterfaceTest$Target.target())' in Type 'ataspectj.DeclareParentsInterfaceTest$Target' (DeclareParentsInterfaceTest.java:27) advised by before advice from 'ataspectj.DeclareParentsInterfaceTest$TestAspect' (DeclareParentsInterfaceTest.java)"/>
264+
<line text="see also:"/>
265+
<line text="Extending interface set for type 'ataspectj.DeclareParentsImplementsTest$Target' (DeclareParentsImplementsTest.java) to include 'ataspectj.DeclareParentsImplementsTest$Introduced' (DeclareParentsImplementsTest.java)"/>
266+
<line text="see also:"/>
267+
<line text="Type 'ataspectj.DeclareParentsImplementsTest$Target' (DeclareParentsImplementsTest.java) has intertyped method from 'ataspectj.DeclareParentsImplementsTest$TestAspect' (DeclareParentsImplementsTest.java:'void ataspectj.DeclareParentsImplementsTest$Introduced.intro()')"/>
268+
<line text="see also:"/>
269+
<line text="Join point 'method-execution(void ataspectj.DeclareParentsImplementsTest$Implementation.intro())' in Type 'ataspectj.DeclareParentsImplementsTest$Implementation' (DeclareParentsImplementsTest.java:47) advised by before advice from 'ataspectj.DeclareParentsImplementsTest$TestAspect' (DeclareParentsImplementsTest.java)"/>
270+
<line text="see also:"/>
265271
</stderr>
266272
</ant>
267273
</ajc-test>
@@ -346,4 +352,4 @@
346352
</ajc-test>
347353

348354

349-
</suite>
355+
</suite>

‎tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
<line text="Main.test2" />
2424
</stdout>
2525
<stderr>
26-
<line
27-
text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
28-
<line
29-
text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
26+
<line text="Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
27+
<line text="see also:" />
28+
<line text="Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
29+
<line text="see also:" />
3030
<line text="Aspect1.before_test1" />
3131
<line text="Aspect2.before_test2" />
3232
</stderr>
@@ -249,8 +249,8 @@
249249
<line text="TestITDMethod.main" />
250250
</stdout>
251251
<stderr>
252-
<line
253-
text="weaveinfo Type 'TestITDMethod' (TestITDMethod.java) has intertyped method from 'AbstractAspect' (AbstractAspect.aj:'void TestITDMethod.test()')" />
252+
<line text="Type 'TestITDMethod' (TestITDMethod.java) has intertyped method from 'AbstractAspect' (AbstractAspect.aj:'void TestITDMethod.test()')" />
253+
<line text="see also:" />
254254
<line text="AbstractAspect_TestITDMethod.test" />
255255
</stderr>
256256
</run>
@@ -359,12 +359,12 @@
359359
<line text="T call" />
360360
</stdout>
361361
<stderr>
362-
<line
363-
text="weaveinfo Join point 'method-call(void util.A.foo())' in Type 'child.Executor' (Executor.aj:18) advised by before advice from 'child.Advisor' (Advisor.aj:20)" />
364-
<line
365-
text="weaveinfo Extending interface set for type 'util.A' (A.aj) to include 'util.T' (Advisor.aj)" />
366-
<line
367-
text="weaveinfo Extending interface set for type 'child.Advisor' (Advisor.aj) to include 'util.T' (Advisor.aj)" />
362+
<line text="Join point 'method-call(void util.A.foo())' in Type 'child.Executor' (Executor.aj:18) advised by before advice from 'child.Advisor' (Advisor.aj:20)" />
363+
<line text="see also:" />
364+
<line text="Extending interface set for type 'util.A' (A.aj) to include 'util.T' (Advisor.aj)" />
365+
<line text="see also:" />
366+
<line text="Extending interface set for type 'child.Advisor' (Advisor.aj) to include 'util.T' (Advisor.aj)" />
367+
<line text="see also:" />
368368
</stderr>
369369
</run>
370370
</ajc-test>
@@ -464,10 +464,10 @@
464464
<line text="Main.test2" />
465465
</stdout>
466466
<stderr>
467-
<line
468-
text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
469-
<line
470-
text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
467+
<line text="Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
468+
<line text="see also:" />
469+
<line text="Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
470+
<line text="see also:" />
471471
<line text="Aspect1.before_test1" />
472472
<line text="Aspect2.before_test2" />
473473
</stderr>
@@ -491,10 +491,10 @@
491491
<line text="Main.test2" />
492492
</stdout>
493493
<stderr>
494-
<line
495-
text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
496-
<line
497-
text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
494+
<line text="Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
495+
<line text="see also:" />
496+
<line text="Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
497+
<line text="see also:" />
498498
<line text="Aspect1.before_test1" />
499499
<line text="Aspect2.before_test2" />
500500
</stderr>

‎tests/src/test/resources/org/aspectj/systemtest/ajc152/ajc152.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,8 @@
442442
<compile files="AnAspect.java" options="-1.4"/>
443443
<run class="BigHorribleClass" ltw="aop1.xml">
444444
<stderr>
445-
<line text="weaveinfo Join point 'staticinitialization(void BigHorribleClass.&lt;clinit&gt;())'"/>
445+
<line text="Join point 'staticinitialization(void BigHorribleClass.&lt;clinit&gt;())'"/>
446+
<line text="see also:" />
446447
<line text="SerialVersionUID is "/>
447448
</stderr>
448449
</run>

0 commit comments

Comments
 (0)