mirrors
/
org.aspectj
mirror of https://github.com/eclipse/org.aspectj.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 139 Wiki Activity
Browse Source

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 <Alexander@Kriegisch.name>
tags/V1_9_22_1
Alexander Kriegisch 1 year ago
parent
a1a700fc6e
commit
afc8261977
6 changed files with 142 additions and 130 deletions
Unified View Show Diff Stats
  1. 18
    12
      tests/src/test/resources/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml
  2. 20
    20
      tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw.xml
  3. 2
    1
      tests/src/test/resources/org/aspectj/systemtest/ajc152/ajc152.xml
  4. 81
    80
      tests/src/test/resources/org/aspectj/systemtest/ajc152/synchronization.xml
  5. 19
    17
      tests/src/test/resources/org/aspectj/systemtest/ajc166/ajc166.xml
  6. 2
    0
      tests/src/test/resources/org/aspectj/systemtest/ajc172/ajc172.xml

+ 18
- 12
tests/src/test/resources/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml View File

options="-1.5"/> options="-1.5"/>
<run class="ataspectj.DumpTest" ltw="ataspectj/aop-dump.xml"/> <run class="ataspectj.DumpTest" ltw="ataspectj/aop-dump.xml"/>
</ajc-test> </ajc-test>
<ajc-test dir="java5/ataspectj" title="LTW DumpTest before and after"> <ajc-test dir="java5/ataspectj" title="LTW DumpTest before and after">
<compile <compile
files="ataspectj/EmptyAspect.aj" files="ataspectj/EmptyAspect.aj"
files="ataspectj/ltwlog/Aspect1.java" files="ataspectj/ltwlog/Aspect1.java"
options="-1.5 -XterminateAfterCompilation" options="-1.5 -XterminateAfterCompilation"
> >
</compile>
</compile>
<run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-silent.xml"> <run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-silent.xml">
<stdout> <stdout>
<line text="execution(Main.target())"/> <line text="execution(Main.target())"/>
files="ataspectj/ltwlog/Aspect1.java" files="ataspectj/ltwlog/Aspect1.java"
options="-1.5 -XterminateAfterCompilation" options="-1.5 -XterminateAfterCompilation"
> >
</compile>
</compile>
<run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-verbose.xml"> <run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-verbose.xml">
<stdout> <stdout>
<line text="execution(Main.target())"/> <line text="execution(Main.target())"/>
files="ataspectj/ltwlog/Aspect1.java" files="ataspectj/ltwlog/Aspect1.java"
options="-1.5 -XterminateAfterCompilation" options="-1.5 -XterminateAfterCompilation"
> >
</compile>
</compile>
<run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-verboseandshow.xml"> <run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-verboseandshow.xml">
<stdout> <stdout>
<line text="execution(Main.target())"/> <line text="execution(Main.target())"/>
<line text="info using"/> <line text="info using"/>
<line text="info register aspect ataspectj.ltwlog.Aspect1"/> <line text="info register aspect ataspectj.ltwlog.Aspect1"/>
<line text="debug weaving 'ataspectj.ltwlog.Main'"/> <line text="debug weaving 'ataspectj.ltwlog.Main'"/>
<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)"/>
<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)"/>
<line text="see also:"/>
<line text="debug weaving 'ataspectj.ltwlog.Aspect1'"/> <line text="debug weaving 'ataspectj.ltwlog.Aspect1'"/>
</stderr> </stderr>
</run> </run>
files="ataspectj/ltwlog/Aspect1.java" files="ataspectj/ltwlog/Aspect1.java"
options="-1.5 -XterminateAfterCompilation" options="-1.5 -XterminateAfterCompilation"
> >
</compile>
</compile>
<run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-messagehandler.xml"> <run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-messagehandler.xml">
<stdout> <stdout>
<line text="MessageHolder.MessageHolder()"/> <line text="MessageHolder.MessageHolder()"/>
<!--<run class="ataspectj.DeclareParentsInterfaceTest" ltw="ataspectj/aop-decptest.xml"/>--> <!--<run class="ataspectj.DeclareParentsInterfaceTest" ltw="ataspectj/aop-decptest.xml"/>-->
<ant file="ajc-ant.xml" target="ltw.Decp" verbose="true"> <ant file="ajc-ant.xml" target="ltw.Decp" verbose="true">
<stderr> <stderr>
<line text="weaveinfo Extending interface set for type 'ataspectj.DeclareParentsInterfaceTest$Target' (DeclareParentsInterfaceTest.java) to include 'ataspectj.DeclareParentsInterfaceTest$Marker' (DeclareParentsInterfaceTest.java)"/>
<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)"/>
<line text="weaveinfo Extending interface set for type 'ataspectj.DeclareParentsImplementsTest$Target' (DeclareParentsImplementsTest.java) to include 'ataspectj.DeclareParentsImplementsTest$Introduced' (DeclareParentsImplementsTest.java)"/>
<line text="weaveinfo Type 'ataspectj.DeclareParentsImplementsTest$Target' (DeclareParentsImplementsTest.java) has intertyped method from 'ataspectj.DeclareParentsImplementsTest$TestAspect' (DeclareParentsImplementsTest.java:'void ataspectj.DeclareParentsImplementsTest$Introduced.intro()')"/>
<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)"/>
<line text="Extending interface set for type 'ataspectj.DeclareParentsInterfaceTest$Target' (DeclareParentsInterfaceTest.java) to include 'ataspectj.DeclareParentsInterfaceTest$Marker' (DeclareParentsInterfaceTest.java)"/>
<line text="see also:"/>
<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)"/>
<line text="see also:"/>
<line text="Extending interface set for type 'ataspectj.DeclareParentsImplementsTest$Target' (DeclareParentsImplementsTest.java) to include 'ataspectj.DeclareParentsImplementsTest$Introduced' (DeclareParentsImplementsTest.java)"/>
<line text="see also:"/>
<line text="Type 'ataspectj.DeclareParentsImplementsTest$Target' (DeclareParentsImplementsTest.java) has intertyped method from 'ataspectj.DeclareParentsImplementsTest$TestAspect' (DeclareParentsImplementsTest.java:'void ataspectj.DeclareParentsImplementsTest$Introduced.intro()')"/>
<line text="see also:"/>
<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)"/>
<line text="see also:"/>
</stderr> </stderr>
</ant> </ant>
</ajc-test> </ajc-test>
</ajc-test> </ajc-test>




</suite>
</suite>

+ 20
- 20
tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw.xml View File

<line text="Main.test2" /> <line text="Main.test2" />
</stdout> </stdout>
<stderr> <stderr>
<line
text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
<line
text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
<line text="Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
<line text="see also:" />
<line text="Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
<line text="see also:" />
<line text="Aspect1.before_test1" /> <line text="Aspect1.before_test1" />
<line text="Aspect2.before_test2" /> <line text="Aspect2.before_test2" />
</stderr> </stderr>
<line text="TestITDMethod.main" /> <line text="TestITDMethod.main" />
</stdout> </stdout>
<stderr> <stderr>
<line
text="weaveinfo Type 'TestITDMethod' (TestITDMethod.java) has intertyped method from 'AbstractAspect' (AbstractAspect.aj:'void TestITDMethod.test()')" />
<line text="Type 'TestITDMethod' (TestITDMethod.java) has intertyped method from 'AbstractAspect' (AbstractAspect.aj:'void TestITDMethod.test()')" />
<line text="see also:" />
<line text="AbstractAspect_TestITDMethod.test" /> <line text="AbstractAspect_TestITDMethod.test" />
</stderr> </stderr>
</run> </run>
<line text="T call" /> <line text="T call" />
</stdout> </stdout>
<stderr> <stderr>
<line
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)" />
<line
text="weaveinfo Extending interface set for type 'util.A' (A.aj) to include 'util.T' (Advisor.aj)" />
<line
text="weaveinfo Extending interface set for type 'child.Advisor' (Advisor.aj) to include 'util.T' (Advisor.aj)" />
<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)" />
<line text="see also:" />
<line text="Extending interface set for type 'util.A' (A.aj) to include 'util.T' (Advisor.aj)" />
<line text="see also:" />
<line text="Extending interface set for type 'child.Advisor' (Advisor.aj) to include 'util.T' (Advisor.aj)" />
<line text="see also:" />
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<line text="Main.test2" /> <line text="Main.test2" />
</stdout> </stdout>
<stderr> <stderr>
<line
text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
<line
text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
<line text="Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
<line text="see also:" />
<line text="Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
<line text="see also:" />
<line text="Aspect1.before_test1" /> <line text="Aspect1.before_test1" />
<line text="Aspect2.before_test2" /> <line text="Aspect2.before_test2" />
</stderr> </stderr>
<line text="Main.test2" /> <line text="Main.test2" />
</stdout> </stdout>
<stderr> <stderr>
<line
text="weaveinfo Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
<line
text="weaveinfo Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
<line text="Join point 'method-execution(void Main.test1())' in Type 'Main' (Main.java:17) advised by before advice from 'Aspect1' (Aspect1.aj:16)" />
<line text="see also:" />
<line text="Join point 'method-execution(void Main.test2())' in Type 'Main' (Main.java:21) advised by before advice from 'Aspect2' (Aspect2.aj:16)" />
<line text="see also:" />
<line text="Aspect1.before_test1" /> <line text="Aspect1.before_test1" />
<line text="Aspect2.before_test2" /> <line text="Aspect2.before_test2" />
</stderr> </stderr>

+ 2
- 1
tests/src/test/resources/org/aspectj/systemtest/ajc152/ajc152.xml View File

<compile files="AnAspect.java" options="-1.4"/> <compile files="AnAspect.java" options="-1.4"/>
<run class="BigHorribleClass" ltw="aop1.xml"> <run class="BigHorribleClass" ltw="aop1.xml">
<stderr> <stderr>
<line text="weaveinfo Join point 'staticinitialization(void BigHorribleClass.&lt;clinit&gt;())'"/>
<line text="Join point 'staticinitialization(void BigHorribleClass.&lt;clinit&gt;())'"/>
<line text="see also:" />
<line text="SerialVersionUID is "/> <line text="SerialVersionUID is "/>
</stderr> </stderr>
</run> </run>

+ 81
- 80
tests/src/test/resources/org/aspectj/systemtest/ajc152/synchronization.xml View File



<!-- AspectJ v1.5.1 Tests --> <!-- AspectJ v1.5.1 Tests -->
<suite> <suite>
<ajc-test dir="features152/synchronization" title="basic"> <ajc-test dir="features152/synchronization" title="basic">
<compile files="Basic.java" options="-1.5 -showWeaveInfo -Xjoinpoints:synchronization"> <compile files="Basic.java" options="-1.5 -showWeaveInfo -Xjoinpoints:synchronization">
</compile> </compile>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="basic - within"> <ajc-test dir="features152/synchronization" title="basic - within">
<compile files="Basic2.java" options="-1.5 -Xjoinpoints:synchronization"> <compile files="Basic2.java" options="-1.5 -Xjoinpoints:synchronization">
</compile> </compile>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="basic - within plus args"> <ajc-test dir="features152/synchronization" title="basic - within plus args">
<compile files="Basic3.java" options="-1.5 -Xjoinpoints:synchronization"> <compile files="Basic3.java" options="-1.5 -Xjoinpoints:synchronization">
</compile> </compile>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="basic - within plus this"> <ajc-test dir="features152/synchronization" title="basic - within plus this">
<compile files="Basic4.java" options="-1.5 -Xjoinpoints:synchronization"> <compile files="Basic4.java" options="-1.5 -Xjoinpoints:synchronization">
</compile> </compile>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="basic - within plus target"> <ajc-test dir="features152/synchronization" title="basic - within plus target">
<compile files="Basic5.java" options="-1.5 -Xjoinpoints:synchronization"> <compile files="Basic5.java" options="-1.5 -Xjoinpoints:synchronization">
</compile> </compile>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="parsing - lock"> <ajc-test dir="features152/synchronization" title="parsing - lock">
<compile files="Parsing1.java" options="-1.5 -Xjoinpoints:synchronization"> <compile files="Parsing1.java" options="-1.5 -Xjoinpoints:synchronization">
<message kind="warning" line="5" text="advice defined in Parsing1 has not been applied [Xlint:adviceDidNotMatch]"/> <message kind="warning" line="5" text="advice defined in Parsing1 has not been applied [Xlint:adviceDidNotMatch]"/>
</compile> </compile>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="parsing - unlock"> <ajc-test dir="features152/synchronization" title="parsing - unlock">
<compile files="Parsing2.java" options="-1.5 -Xjoinpoints:synchronization"> <compile files="Parsing2.java" options="-1.5 -Xjoinpoints:synchronization">
<message kind="warning" line="5" text="advice defined in Parsing2 has not been applied [Xlint:adviceDidNotMatch]"/> <message kind="warning" line="5" text="advice defined in Parsing2 has not been applied [Xlint:adviceDidNotMatch]"/>
</compile> </compile>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="parsing - error - lock"> <ajc-test dir="features152/synchronization" title="parsing - error - lock">
<compile files="Parsing1.java" options="-1.5"> <compile files="Parsing1.java" options="-1.5">
<message kind="warning" line="5" text="advice defined in Parsing1 has not been applied [Xlint:adviceDidNotMatch]"/> <message kind="warning" line="5" text="advice defined in Parsing1 has not been applied [Xlint:adviceDidNotMatch]"/>
<message kind="warning" line="5" text="lock() pointcut designator cannot be used without the option -Xjoinpoints:synchronization"/> <message kind="warning" line="5" text="lock() pointcut designator cannot be used without the option -Xjoinpoints:synchronization"/>
</compile> </compile>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="parsing - error - unlock"> <ajc-test dir="features152/synchronization" title="parsing - error - unlock">
<compile files="Parsing2.java" options="-1.5"> <compile files="Parsing2.java" options="-1.5">
<message kind="warning" line="5" text="advice defined in Parsing2 has not been applied [Xlint:adviceDidNotMatch]"/> <message kind="warning" line="5" text="advice defined in Parsing2 has not been applied [Xlint:adviceDidNotMatch]"/>
<message kind="warning" line="5" text="unlock() pointcut designator cannot be used without the option -Xjoinpoints:synchronization"/> <message kind="warning" line="5" text="unlock() pointcut designator cannot be used without the option -Xjoinpoints:synchronization"/>
</compile> </compile>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="parsing and matching - lock and static context"> <ajc-test dir="features152/synchronization" title="parsing and matching - lock and static context">
<compile files="ParsingAndMatching1.java" options="-1.5 -Xjoinpoints:synchronization"/> <compile files="ParsingAndMatching1.java" options="-1.5 -Xjoinpoints:synchronization"/>
<run class="ParsingAndMatching1"> <run class="ParsingAndMatching1">
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="using lock with LTW - missing flag"> <ajc-test dir="features152/synchronization" title="using lock with LTW - missing flag">
<compile files="LockAspect1.java" options="-1.5"> <compile files="LockAspect1.java" options="-1.5">
<message kind="warning" line="6" text="lock() pointcut designator cannot be used without the option -Xjoinpoints:synchronization"/> <message kind="warning" line="6" text="lock() pointcut designator cannot be used without the option -Xjoinpoints:synchronization"/>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization/transformed" title="transform with LTW"> <ajc-test dir="features152/synchronization/transformed" title="transform with LTW">
<compile files="CaptureLock.aj" options="-1.5"/> <compile files="CaptureLock.aj" options="-1.5"/>
<compile files="Program.java" options="-1.5"/> <compile files="Program.java" options="-1.5"/>
</stdout> </stdout>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="using lock with LTW"> <ajc-test dir="features152/synchronization" title="using lock with LTW">
<compile files="LockAspect1.java" options="-1.5 -Xjoinpoints:synchronization"/>
<compile files="BasicProgram1.java" options="-1.5 -Xjoinpoints:synchronization"/>
<run class="BasicProgram1" ltw="aop3.xml">
<stderr>
<line text="weaveinfo Join point 'lock(void java.lang.Object.&lt;lock&gt;(java.lang.Object))' in Type 'BasicProgram1' (BasicProgram1.java:11) advised by before advice from 'LockAspect1' (LockAspect1.java:6)"/>
<line text="weaveinfo Join point 'lock(void java.lang.Object.&lt;lock&gt;(java.lang.Object))' in Type 'BasicProgram1' (BasicProgram1.java:17) advised by before advice from 'LockAspect1' (LockAspect1.java:6)"/>
<line text="Lock advice running at BasicProgram1.java:17"/>
<line text="nonstatic method running"/>
<line text="Lock advice running at BasicProgram1.java:11"/>
<line text="static method running"/>
</stderr>
</run>
<compile files="LockAspect1.java" options="-1.5 -Xjoinpoints:synchronization"/>
<compile files="BasicProgram1.java" options="-1.5 -Xjoinpoints:synchronization"/>
<run class="BasicProgram1" ltw="aop3.xml">
<stderr>
<line text="Join point 'lock(void java.lang.Object.&lt;lock&gt;(java.lang.Object))' in Type 'BasicProgram1' (BasicProgram1.java:11) advised by before advice from 'LockAspect1' (LockAspect1.java:6)"/>
<line text="see also:"/>
<line text="Join point 'lock(void java.lang.Object.&lt;lock&gt;(java.lang.Object))' in Type 'BasicProgram1' (BasicProgram1.java:17) advised by before advice from 'LockAspect1' (LockAspect1.java:6)"/>
<line text="see also:"/>
<line text="Lock advice running at BasicProgram1.java:17"/>
<line text="nonstatic method running"/>
<line text="Lock advice running at BasicProgram1.java:11"/>
<line text="static method running"/>
</stderr>
</run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="using unlock with LTW"> <ajc-test dir="features152/synchronization" title="using unlock with LTW">
<compile files="UnlockAspect1.java" options="-1.5 -Xjoinpoints:synchronization"/>
<compile files="BasicProgram1.java" options="-1.5 -Xjoinpoints:synchronization"/>
<run class="BasicProgram1" ltw="aop4.xml">
<stderr>
<line text="weaveinfo Join point 'unlock(void java.lang.Object.&lt;unlock&gt;(java.lang.Object))' in Type 'BasicProgram1' (BasicProgram1.java:11) advised by before advice from 'UnlockAspect1' (UnlockAspect1.java:6)"/>
<line text="weaveinfo Join point 'unlock(void java.lang.Object.&lt;unlock&gt;(java.lang.Object))' in Type 'BasicProgram1' (BasicProgram1.java:17) advised by before advice from 'UnlockAspect1' (UnlockAspect1.java:6)"/>
<line text="nonstatic method running"/>
<line text="Unlock advice running at BasicProgram1.java:17"/>
<line text="static method running"/>
<line text="Unlock advice running at BasicProgram1.java:11"/>
</stderr>
</run>
<compile files="UnlockAspect1.java" options="-1.5 -Xjoinpoints:synchronization"/>
<compile files="BasicProgram1.java" options="-1.5 -Xjoinpoints:synchronization"/>
<run class="BasicProgram1" ltw="aop4.xml">
<stderr>
<line text="Join point 'unlock(void java.lang.Object.&lt;unlock&gt;(java.lang.Object))' in Type 'BasicProgram1' (BasicProgram1.java:11) advised by before advice from 'UnlockAspect1' (UnlockAspect1.java:6)"/>
<line text="see also:"/>
<line text="Join point 'unlock(void java.lang.Object.&lt;unlock&gt;(java.lang.Object))' in Type 'BasicProgram1' (BasicProgram1.java:17) advised by before advice from 'UnlockAspect1' (UnlockAspect1.java:6)"/>
<line text="see also:"/>
<line text="nonstatic method running"/>
<line text="Unlock advice running at BasicProgram1.java:17"/>
<line text="static method running"/>
<line text="Unlock advice running at BasicProgram1.java:11"/>
</stderr>
</run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="using unlock with LTW - missing flag"> <ajc-test dir="features152/synchronization" title="using unlock with LTW - missing flag">
<compile files="UnlockAspect1.java" options="-1.5"> <compile files="UnlockAspect1.java" options="-1.5">
<message kind="warning" line="6" text="unlock() pointcut designator cannot be used without the option -Xjoinpoints:synchronization"/> <message kind="warning" line="6" text="unlock() pointcut designator cannot be used without the option -Xjoinpoints:synchronization"/>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="parsing and matching - lock and non-static context"> <ajc-test dir="features152/synchronization" title="parsing and matching - lock and non-static context">
<compile files="ParsingAndMatching3.java" options="-1.5 -Xjoinpoints:synchronization"/> <compile files="ParsingAndMatching3.java" options="-1.5 -Xjoinpoints:synchronization"/>
<run class="ParsingAndMatching3"> <run class="ParsingAndMatching3">
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="a useful program - with lock"> <ajc-test dir="features152/synchronization" title="a useful program - with lock">
<compile files="Useful2.java" options="-1.5 -showWeaveInfo -Xjoinpoints:synchronization"> <compile files="Useful2.java" options="-1.5 -showWeaveInfo -Xjoinpoints:synchronization">
<message kind="weave" text="Join point 'method-execution(void Useful2.main(java.lang.String[]))' in Type 'Useful2' (Useful2.java:33) advised by afterReturning advice from 'LockMonitor' (Useful2.java:25)"/> <message kind="weave" text="Join point 'method-execution(void Useful2.main(java.lang.String[]))' in Type 'Useful2' (Useful2.java:33) advised by afterReturning advice from 'LockMonitor' (Useful2.java:25)"/>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="combining pcds - lock and this"> <ajc-test dir="features152/synchronization" title="combining pcds - lock and this">
<compile files="CombiningPCDs1.java" options="-1.5 -Xjoinpoints:synchronization"/> <compile files="CombiningPCDs1.java" options="-1.5 -Xjoinpoints:synchronization"/>
<run class="CombiningPCDs1"> <run class="CombiningPCDs1">
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="combining pcds - unlock and this"> <ajc-test dir="features152/synchronization" title="combining pcds - unlock and this">
<compile files="CombiningPCDs2.java" options="-1.5 -Xjoinpoints:synchronization"/> <compile files="CombiningPCDs2.java" options="-1.5 -Xjoinpoints:synchronization"/>
<run class="CombiningPCDs2"> <run class="CombiningPCDs2">
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="thisjoinpoint - monitor entry"> <ajc-test dir="features152/synchronization" title="thisjoinpoint - monitor entry">
<compile files="ThisJoinPointLock.java" options="-1.5 -Xjoinpoints:synchronization"/> <compile files="ThisJoinPointLock.java" options="-1.5 -Xjoinpoints:synchronization"/>
<run class="ThisJoinPointLock"> <run class="ThisJoinPointLock">
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="thisjoinpoint - monitor exit"> <ajc-test dir="features152/synchronization" title="thisjoinpoint - monitor exit">
<compile files="ThisJoinPointUnlock.java" options="-1.5 -Xjoinpoints:synchronization"/> <compile files="ThisJoinPointUnlock.java" options="-1.5 -Xjoinpoints:synchronization"/>
<run class="ThisJoinPointUnlock"> <run class="ThisJoinPointUnlock">
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="prevent double unlock weaving messages and model contents"> <ajc-test dir="features152/synchronization" title="prevent double unlock weaving messages and model contents">
<compile files="ThisJoinPointUnlock.java" options="-1.5 -Xjoinpoints:synchronization -showWeaveInfo -emacssym"> <compile files="ThisJoinPointUnlock.java" options="-1.5 -Xjoinpoints:synchronization -showWeaveInfo -emacssym">
<message kind="weave" text="Join point 'lock(void java.lang.Object.&lt;lock&gt;(java.lang.Object))' in Type 'ThisJoinPointUnlock' (ThisJoinPointUnlock.java:38) advised by before advice from 'TJPAspect' (ThisJoinPointUnlock.java:4)"/> <message kind="weave" text="Join point 'lock(void java.lang.Object.&lt;lock&gt;(java.lang.Object))' in Type 'ThisJoinPointUnlock' (ThisJoinPointUnlock.java:38) advised by before advice from 'TJPAspect' (ThisJoinPointUnlock.java:4)"/>
<message kind="weave" text="Join point 'unlock(void java.lang.Object.&lt;unlock&gt;(java.lang.Object))' in Type 'ThisJoinPointUnlock' (ThisJoinPointUnlock.java:38) advised by before advice from 'TJPAspect' (ThisJoinPointUnlock.java:4)"/> <message kind="weave" text="Join point 'unlock(void java.lang.Object.&lt;unlock&gt;(java.lang.Object))' in Type 'ThisJoinPointUnlock' (ThisJoinPointUnlock.java:38) advised by before advice from 'TJPAspect' (ThisJoinPointUnlock.java:4)"/>
</compile> </compile>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="before advice - lock"> <ajc-test dir="features152/synchronization" title="before advice - lock">
<compile files="BeforeLock.java" options="-1.5 -Xjoinpoints:synchronization"/> <compile files="BeforeLock.java" options="-1.5 -Xjoinpoints:synchronization"/>
<run class="BeforeLock"> <run class="BeforeLock">
<line text="non-static method running"/> <line text="non-static method running"/>
</stderr> </stderr>
</run> </run>
</ajc-test>
</ajc-test>
<ajc-test dir="features152/synchronization" title="before advice - unlock"> <ajc-test dir="features152/synchronization" title="before advice - unlock">
<compile files="BeforeUnlock.java" options="-1.5 -Xjoinpoints:synchronization"/> <compile files="BeforeUnlock.java" options="-1.5 -Xjoinpoints:synchronization"/>
<run class="BeforeUnlock"> <run class="BeforeUnlock">
<line text="before() unlock: advice running at BeforeUnlock.java:21"/> <line text="before() unlock: advice running at BeforeUnlock.java:21"/>
</stderr> </stderr>
</run> </run>
</ajc-test>
</ajc-test>
<ajc-test dir="features152/synchronization" title="after advice - lock"> <ajc-test dir="features152/synchronization" title="after advice - lock">
<compile files="AfterLock.java" options="-1.5 -Xjoinpoints:synchronization"/> <compile files="AfterLock.java" options="-1.5 -Xjoinpoints:synchronization"/>
<run class="AfterLock"> <run class="AfterLock">
<line text="non-static method running"/> <line text="non-static method running"/>
</stderr> </stderr>
</run> </run>
</ajc-test>
</ajc-test>
<ajc-test dir="features152/synchronization" title="after advice - unlock"> <ajc-test dir="features152/synchronization" title="after advice - unlock">
<compile files="AfterUnlock.java" options="-1.5 -Xjoinpoints:synchronization"/> <compile files="AfterUnlock.java" options="-1.5 -Xjoinpoints:synchronization"/>
<run class="AfterUnlock"> <run class="AfterUnlock">
<line text="after() unlock: advice running at AfterUnlock.java:21"/> <line text="after() unlock: advice running at AfterUnlock.java:21"/>
</stderr> </stderr>
</run> </run>
</ajc-test>
</ajc-test>
<ajc-test dir="features152/synchronization" title="around advice - lock"> <ajc-test dir="features152/synchronization" title="around advice - lock">
<compile files="AroundLock.java" options="-1.5 -Xjoinpoints:synchronization"> <compile files="AroundLock.java" options="-1.5 -Xjoinpoints:synchronization">
<message kind="warning" line="11" text="Around advice is not supported on the lock and unlock join points (compiler limitation)"/> <message kind="warning" line="11" text="Around advice is not supported on the lock and unlock join points (compiler limitation)"/>
<line text="non-static method running"/> <line text="non-static method running"/>
</stderr> </stderr>
</run> </run>
</ajc-test>
</ajc-test>
<ajc-test dir="features152/synchronization" title="around advice - unlock"> <ajc-test dir="features152/synchronization" title="around advice - unlock">
<compile files="AroundUnlock.java" options="-1.5 -Xjoinpoints:synchronization"> <compile files="AroundUnlock.java" options="-1.5 -Xjoinpoints:synchronization">
<message kind="warning" line="5" text="Around advice is not supported on the lock and unlock join points (compiler limitation)"/> <message kind="warning" line="5" text="Around advice is not supported on the lock and unlock join points (compiler limitation)"/>
<line text="non-static method running"/> <line text="non-static method running"/>
</stderr> </stderr>
</run> </run>
</ajc-test>
</ajc-test>
<ajc-test dir="features152/synchronization/transformed" title="investigation"> <ajc-test dir="features152/synchronization/transformed" title="investigation">
<compile files="Investigation.java"> <compile files="Investigation.java">
</compile> </compile>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization/transformed" title="One"> <ajc-test dir="features152/synchronization/transformed" title="One">
<compile files="One.java -Xjoinpoints:synchronization"> <compile files="One.java -Xjoinpoints:synchronization">
</compile> </compile>
<run class="One"/><!-- will check verification ... --> <run class="One"/><!-- will check verification ... -->
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization/transformed" title="Two"> <ajc-test dir="features152/synchronization/transformed" title="Two">
<compile files="Two.java -Xjoinpoints:synchronization"> <compile files="Two.java -Xjoinpoints:synchronization">
<message kind="warning" line="14" text="advice matching the synchronized method shadow 'method-execution(void C.ma())' will be executed outside the lock rather than inside (compiler limitation) [Xlint"/>
<message kind="warning" line="14" text="advice matching the synchronized method shadow 'method-execution(void C.ma())' will be executed outside the lock rather than inside (compiler limitation) [Xlint"/>
</compile> </compile>
<run class="Two"> <run class="Two">
<stderr> <stderr>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization/transformed" title="Two - xlintoff"> <ajc-test dir="features152/synchronization/transformed" title="Two - xlintoff">
<compile files="Two.java -Xjoinpoints:synchronization -Xlint:ignore"/> <compile files="Two.java -Xjoinpoints:synchronization -Xlint:ignore"/>
<run class="Two"> <run class="Two">
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization/transformed" title="Three"> <ajc-test dir="features152/synchronization/transformed" title="Three">
<compile files="Three.java -Xjoinpoints:synchronization"> <compile files="Three.java -Xjoinpoints:synchronization">
<message kind="warning" line="20" text="advice matching the synchronized method shadow 'method-execution(void C.m3())' will be executed outside the lock rather than inside (compiler limitation) [Xlint"/>
<message kind="warning" line="24" text="advice matching the synchronized method shadow 'method-execution(void C.m32())' will be executed outside the lock rather than inside (compiler limitation) [Xlint"/>
<message kind="warning" line="20" text="advice matching the synchronized method shadow 'method-execution(void C.m3())' will be executed outside the lock rather than inside (compiler limitation) [Xlint"/>
<message kind="warning" line="24" text="advice matching the synchronized method shadow 'method-execution(void C.m32())' will be executed outside the lock rather than inside (compiler limitation) [Xlint"/>
</compile> </compile>
<run class="Three"> <run class="Three">
<stderr> <stderr>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization/transformed" title="Four"> <ajc-test dir="features152/synchronization/transformed" title="Four">
<compile files="Four.java -Xjoinpoints:synchronization"> <compile files="Four.java -Xjoinpoints:synchronization">
<message kind="warning" line="16" text="advice matching the synchronized method shadow 'method-execution(void C.m())' will be executed outside the lock rather than inside (compiler limitation) [Xlint"/> <message kind="warning" line="16" text="advice matching the synchronized method shadow 'method-execution(void C.m())' will be executed outside the lock rather than inside (compiler limitation) [Xlint"/>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization/transformed" title="Five - Java5"> <ajc-test dir="features152/synchronization/transformed" title="Five - Java5">
<compile files="Five.java -1.5 -Xjoinpoints:synchronization"> <compile files="Five.java -1.5 -Xjoinpoints:synchronization">
</compile> </compile>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization/transformed" title="Six - preJava5"> <ajc-test dir="features152/synchronization/transformed" title="Six - preJava5">
<compile files="Six.java -Xjoinpoints:synchronization"> <compile files="Six.java -Xjoinpoints:synchronization">
</compile> </compile>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization/transformed" title="lock pcd on transformed non-static method"> <ajc-test dir="features152/synchronization/transformed" title="lock pcd on transformed non-static method">
<compile files="Seven.java -Xjoinpoints:synchronization"> <compile files="Seven.java -Xjoinpoints:synchronization">
</compile> </compile>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization/transformed" title="lock pcd on transformed static method - J5"> <ajc-test dir="features152/synchronization/transformed" title="lock pcd on transformed static method - J5">
<compile files="Nine.java -1.5 -Xjoinpoints:synchronization"> <compile files="Nine.java -1.5 -Xjoinpoints:synchronization">
</compile> </compile>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization/transformed" title="lock pcd on transformed static method - preJ5"> <ajc-test dir="features152/synchronization/transformed" title="lock pcd on transformed static method - preJ5">
<compile files="Eleven.java -Xjoinpoints:synchronization"> <compile files="Eleven.java -Xjoinpoints:synchronization">
</compile> </compile>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>

<ajc-test dir="features152/synchronization/transformed" title="transform static method - preJ5"> <ajc-test dir="features152/synchronization/transformed" title="transform static method - preJ5">
<compile files="Fifteen.java" options="-Xjoinpoints:synchronization -1.4"> <compile files="Fifteen.java" options="-Xjoinpoints:synchronization -1.4">
</compile> </compile>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>

<ajc-test dir="features152/synchronization/transformed" title="transform static method - packages - preJ5"> <ajc-test dir="features152/synchronization/transformed" title="transform static method - packages - preJ5">
<compile files="Sixteen.java" options="-Xjoinpoints:synchronization -1.4"> <compile files="Sixteen.java" options="-Xjoinpoints:synchronization -1.4">
</compile> </compile>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization" title="obtaining locked object through getArgs"> <ajc-test dir="features152/synchronization" title="obtaining locked object through getArgs">
<compile files="LockingWithTJP.java" options="-Xjoinpoints:synchronization"> <compile files="LockingWithTJP.java" options="-Xjoinpoints:synchronization">
</compile> </compile>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="features152/synchronization/transformed" title="other targeters"> <ajc-test dir="features152/synchronization/transformed" title="other targeters">
<compile files="OtherTargeters.java" options="-Xjoinpoints:synchronization"> <compile files="OtherTargeters.java" options="-Xjoinpoints:synchronization">
<message kind="warning" line="8" text="advice matching the synchronized "/> <message kind="warning" line="8" text="advice matching the synchronized "/>
</stderr> </stderr>
</run> </run>
</ajc-test> </ajc-test>

<ajc-test dir="features152/synchronization/transformed" title="joinpoints enabled but no lock"> <ajc-test dir="features152/synchronization/transformed" title="joinpoints enabled but no lock">
<compile files="Fourteen.java" options="-Xjoinpoints:synchronization"> <compile files="Fourteen.java" options="-Xjoinpoints:synchronization">
<!--message kind="warning" line="8" text="advice matching the synchronized "/--> <!--message kind="warning" line="8" text="advice matching the synchronized "/-->

+ 19
- 17
tests/src/test/resources/org/aspectj/systemtest/ajc166/ajc166.xml View File

</stdout> </stdout>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="bugs166/pr286473" title="parents ltw - ltw"> <ajc-test dir="bugs166/pr286473" title="parents ltw - ltw">
<compile files="Anno.java Top.java Middle.java Bottom.java" outjar="code.jar" options="-1.5 -Xlint:ignore"/> <compile files="Anno.java Top.java Middle.java Bottom.java" outjar="code.jar" options="-1.5 -Xlint:ignore"/>
<compile files="Mark.java LTWTest.java" classpath="code.jar" options="-1.5"> <compile files="Mark.java LTWTest.java" classpath="code.jar" options="-1.5">
<run class="LTWTest" ltw="aop.xml"> <run class="LTWTest" ltw="aop.xml">
<stderr> <stderr>
<line text="Extending interface set for type 'Top' (Top.java) to include 'Mark$IMarker' (Mark.java)"/> <line text="Extending interface set for type 'Top' (Top.java) to include 'Mark$IMarker' (Mark.java)"/>
<line text="see also:"/>
<line text="Type 'Top' (Top.java) has intertyped method from 'Mark' (Mark.java:'java.lang.String Mark$IMarker.markMethod()')"/> <line text="Type 'Top' (Top.java) has intertyped method from 'Mark' (Mark.java:'java.lang.String Mark$IMarker.markMethod()')"/>
<line text="see also:"/>
<line text="Type 'Mark$IMarker' (Mark.java) has intertyped method from 'Mark' (Mark.java:'java.lang.String Mark$IMarker.markMethod()')"/> <line text="Type 'Mark$IMarker' (Mark.java) has intertyped method from 'Mark' (Mark.java:'java.lang.String Mark$IMarker.markMethod()')"/>
<line text="see also:"/>
<!-- <!--
<line text="Extending interface set for type 'Bottom' (Bottom.java) to include 'Mark$IMarker' (Mark.java)"/> <line text="Extending interface set for type 'Bottom' (Bottom.java) to include 'Mark$IMarker' (Mark.java)"/>
<line text="Type 'Bottom' (Bottom.java) has intertyped method from 'Mark' (Mark.java:'java.lang.String Mark$IMarker.markMethod()')"/> <line text="Type 'Bottom' (Bottom.java) has intertyped method from 'Mark' (Mark.java:'java.lang.String Mark$IMarker.markMethod()')"/>
<ajc-test dir="bugs166/pr290227" title="npe for javac built"> <ajc-test dir="bugs166/pr290227" title="npe for javac built">
<compile files="" inpath="javacCode.jar" options="-1.5 -Xlint:ignore"/> <compile files="" inpath="javacCode.jar" options="-1.5 -Xlint:ignore"/>
</ajc-test> </ajc-test>
<ajc-test dir="bugs166/pr288049" title="itd decanno"> <ajc-test dir="bugs166/pr288049" title="itd decanno">
<compile files="org/othtests/MyClass.java org/othtests/MySubClass.java org/othtests/AddSomeAnnotation.java" options="-1.5 -showWeaveInfo"> <compile files="org/othtests/MyClass.java org/othtests/MySubClass.java org/othtests/AddSomeAnnotation.java" options="-1.5 -showWeaveInfo">
<message kind="weave" text="'public java.lang.String org.othtests.MySubClass.doOne()' (MySubClass.java:5) is annotated with"/> <message kind="weave" text="'public java.lang.String org.othtests.MySubClass.doOne()' (MySubClass.java:5) is annotated with"/>
<message kind="weave" text="'public java.lang.String org.othtests.MySubClass.doTwo()' (MySubClass.java:9) is annotated with"/> <message kind="weave" text="'public java.lang.String org.othtests.MySubClass.doTwo()' (MySubClass.java:9) is annotated with"/>
</compile> </compile>
</ajc-test> </ajc-test>
<ajc-test dir="bugs166/pr288712" title="verifyerror anno style"> <ajc-test dir="bugs166/pr288712" title="verifyerror anno style">
<compile files="answers/Answer2h.java figures/FigureElement.java figures/Line.java figures/Point.java figures/ShapeFigureElement.java Main.java" options="-1.5"/> <compile files="answers/Answer2h.java figures/FigureElement.java figures/Line.java figures/Point.java figures/ShapeFigureElement.java Main.java" options="-1.5"/>
<run class="Main"/> <run class="Main"/>
</ajc-test> </ajc-test>
<ajc-test dir="bugs166/pr288635" title="munger cce - 2"> <ajc-test dir="bugs166/pr288635" title="munger cce - 2">
<compile files="AddAnnotation.java MakeItd.java InterceptTraceds.java TestClass.java Anno.java" options="-1.5 -XterminateAfterCompilation"/> <compile files="AddAnnotation.java MakeItd.java InterceptTraceds.java TestClass.java Anno.java" options="-1.5 -XterminateAfterCompilation"/>
<run class="TestClass" ltw="aop1.xml"> <run class="TestClass" ltw="aop1.xml">
</stdout> </stdout>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="bugs166/pr288635" title="munger cce"> <ajc-test dir="bugs166/pr288635" title="munger cce">
<compile files="org/tests/atann/AddAnnotations.aj org/tests/atann/AddITDDoMethod.aj org/tests/atann/InterceptTraceds.aj org/tests/atann/TestClass.java org/tests/atann/Traced.java" options="-1.5"/> <compile files="org/tests/atann/AddAnnotations.aj org/tests/atann/AddITDDoMethod.aj org/tests/atann/InterceptTraceds.aj org/tests/atann/TestClass.java org/tests/atann/Traced.java" options="-1.5"/>
<run class="org.tests.atann.TestClass"> <run class="org.tests.atann.TestClass">
</stdout> </stdout>
</run> </run>
</ajc-test> </ajc-test>
<ajc-test dir="bugs166/pr286375" title="npe on bad aspect decl"> <ajc-test dir="bugs166/pr286375" title="npe on bad aspect decl">
<compile files="DatabaseOperationMonitor.java" options="-1.5" outjar="wibble.jar"/> <compile files="DatabaseOperationMonitor.java" options="-1.5" outjar="wibble.jar"/>
<compile files="" inpath="wibble.jar" options="-1.5"/> <compile files="" inpath="wibble.jar" options="-1.5"/>
</ajc-test> </ajc-test>

<ajc-test dir="bugs166/pr290087" title="binary decp super rewrite"> <ajc-test dir="bugs166/pr290087" title="binary decp super rewrite">
<compile files="Bean.java BeanChild.java GenericParent.java" options="-1.5" outjar="base.jar"/> <compile files="Bean.java BeanChild.java GenericParent.java" options="-1.5" outjar="base.jar"/>
<compile files="Interface.java InterfaceParent.java BeanHasInterface.java" inpath="base.jar" options="-1.5"/> <compile files="Interface.java InterfaceParent.java BeanHasInterface.java" inpath="base.jar" options="-1.5"/>
<run class="BeanChild"/> <run class="BeanChild"/>
</ajc-test> </ajc-test>
<ajc-test dir="bugs166/pr287597" title="anno modifier ordering - 1"> <ajc-test dir="bugs166/pr287597" title="anno modifier ordering - 1">
<compile files="A.java" options="-1.5 -showWeaveInfo"> <compile files="A.java" options="-1.5 -showWeaveInfo">
<message kind="weave" text="foo"/> <message kind="weave" text="foo"/>
</compile> </compile>
</ajc-test> </ajc-test>
<ajc-test dir="bugs166/pr287613" title="dec anno compound expressions"> <ajc-test dir="bugs166/pr287613" title="dec anno compound expressions">
<compile files="DeclareAnnot.java" options="-1.5"/> <compile files="DeclareAnnot.java" options="-1.5"/>
</ajc-test> </ajc-test>
<ajc-test dir="bugs166/pr284862" title="npe hasmember"> <ajc-test dir="bugs166/pr284862" title="npe hasmember">
<compile files="InterfaceToAdd.java AnnotatedMethodImpl.aj AspectToMatch.aj AnnotatedMethodInterface.java Entity.java EntityClass.java PresentAnnotation.java SearchAnnotation.java" options="-1.5 -XhasMember"/> <compile files="InterfaceToAdd.java AnnotatedMethodImpl.aj AspectToMatch.aj AnnotatedMethodInterface.java Entity.java EntityClass.java PresentAnnotation.java SearchAnnotation.java" options="-1.5 -XhasMember"/>
</ajc-test> </ajc-test>
<ajc-test dir="bugs166/pr284862" title="npe hasmember - 2"> <ajc-test dir="bugs166/pr284862" title="npe hasmember - 2">
<compile files="AnnotatedMethodInterface.java InterfaceToAdd.java AnnotatedMethodImpl.aj AspectToMatch.aj Entity.java EntityClass.java PresentAnnotation.java SearchAnnotation.java" options="-1.5 -XhasMember"/> <compile files="AnnotatedMethodInterface.java InterfaceToAdd.java AnnotatedMethodImpl.aj AspectToMatch.aj Entity.java EntityClass.java PresentAnnotation.java SearchAnnotation.java" options="-1.5 -XhasMember"/>
</ajc-test> </ajc-test>
<ajc-test dir="bugs166/pr284862" title="npe hasmember - 3"> <ajc-test dir="bugs166/pr284862" title="npe hasmember - 3">
<compile files="AnnotatedMethodInterface.java InterfaceToAdd.java AnnotatedMethodImpl.aj AspectToMatch.aj Entity.java EntityClass.java PresentAnnotation.java SearchAnnotation.java" options="-Xset:pipelineCompilation=false -1.5 -XhasMember"/> <compile files="AnnotatedMethodInterface.java InterfaceToAdd.java AnnotatedMethodImpl.aj AspectToMatch.aj Entity.java EntityClass.java PresentAnnotation.java SearchAnnotation.java" options="-Xset:pipelineCompilation=false -1.5 -XhasMember"/>
</ajc-test> </ajc-test>
<ajc-test dir="bugs165/pr279983" title="generics bridge"> <ajc-test dir="bugs165/pr279983" title="generics bridge">
<compile files="X.java" options="-1.5"/> <compile files="X.java" options="-1.5"/>
<run class="X"/> <run class="X"/>
<ajc-test dir="bugs166/pr282299" title="generics and decp"> <ajc-test dir="bugs166/pr282299" title="generics and decp">
<compile files="Code.java" options="-1.5"/> <compile files="Code.java" options="-1.5"/>
</ajc-test> </ajc-test>
<ajc-test dir="bugs166/pr284297" title="generic signature problem"> <ajc-test dir="bugs166/pr284297" title="generic signature problem">
<compile files="DomainLogic.java DomainObject.java FancyDomainLogic.java" options="-1.5" outjar="code.jar"/> <compile files="DomainLogic.java DomainObject.java FancyDomainLogic.java" options="-1.5" outjar="code.jar"/>
<compile files="FancyDomainLogicImpl.java" options="-1.5" classpath="code.jar"/> <compile files="FancyDomainLogicImpl.java" options="-1.5" classpath="code.jar"/>
<line text="if method: public static final boolean X.ajc$if$165()"/> <line text="if method: public static final boolean X.ajc$if$165()"/>
</stdout> </stdout>
--> -->
</run>
</run>
</ajc-test> </ajc-test>


</suite>
</suite>

+ 2
- 0
tests/src/test/resources/org/aspectj/systemtest/ajc172/ajc172.xml View File

<line text="register aspect AspectD"/> <line text="register aspect AspectD"/>
<line text="deactivating aspect 'AspectD' as it requires type 'a.b.c.Anno2' which cannot be found on the classpath"/> <line text="deactivating aspect 'AspectD' as it requires type 'a.b.c.Anno2' which cannot be found on the classpath"/>
<line text="Join point 'method-execution(void Code.main(java.lang.String[]))' in Type 'Code' (Code.java:7) advised by before advice from 'AspectC'"/> <line text="Join point 'method-execution(void Code.main(java.lang.String[]))' in Type 'Code' (Code.java:7) advised by before advice from 'AspectC'"/>
<line text="see also:"/>
<line text="Join point 'staticinitialization(void Code.&lt;clinit&gt;())' in Type 'Code' (Code.java) advised by before advice from 'AspectB'"/> <line text="Join point 'staticinitialization(void Code.&lt;clinit&gt;())' in Type 'Code' (Code.java) advised by before advice from 'AspectB'"/>
<line text="see also:"/>
<line text="processing reweavable"/> <line text="processing reweavable"/>
<line text="processing reweavable"/> <line text="processing reweavable"/>
</stderr> </stderr>

Write Preview
Loading…
Cancel
Save