diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ltw/aop-missingaspect.xml | 5 | ||||
| -rw-r--r-- | tests/ltw/pakkage/EmptyAspect.aj | 3 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc152/ajc152.xml | 6 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java | 4 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc153/ajc153.xml | 16 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/tracing/tracing.xml | 6 |
6 files changed, 36 insertions, 4 deletions
diff --git a/tests/ltw/aop-missingaspect.xml b/tests/ltw/aop-missingaspect.xml new file mode 100644 index 000000000..27235c38b --- /dev/null +++ b/tests/ltw/aop-missingaspect.xml @@ -0,0 +1,5 @@ +<aspectj> + <aspects> + <aspect name="EmptyAspect"/> + </aspects> +</aspectj>
\ No newline at end of file diff --git a/tests/ltw/pakkage/EmptyAspect.aj b/tests/ltw/pakkage/EmptyAspect.aj new file mode 100644 index 000000000..e24bad3e8 --- /dev/null +++ b/tests/ltw/pakkage/EmptyAspect.aj @@ -0,0 +1,3 @@ +public aspect EmptyAspect { + +}
\ No newline at end of file diff --git a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml index 812d15830..3e7b08082 100644 --- a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml +++ b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml @@ -483,7 +483,8 @@ <run class="HelloWorld" ltw="aop-tracing.xml"> <stderr> <line text="error Abstract method 'void ConcreteMethods.foo(int)' cannot be concretized in XML:"/> - <line text="warning register definition failed"/> + <line text="error Concrete-aspect 'TraceHelloWorld' could not be registered"/> + <line text="warning failure(s) registering aspects. Disabling weaver for class loader"/> </stderr> <stdout> <line text="Hello World!"/> @@ -497,7 +498,8 @@ <run class="HelloWorld" ltw="aop-tracing.xml"> <stderr> <line text="error Abstract method 'void AbstractMethods.test()' cannot be concretized in XML"/> - <line text="warning register definition failed"/> + <line text="error Concrete-aspect 'TraceHelloWorld' could not be registered"/> + <line text="warning failure(s) registering aspects. Disabling weaver for class loader"/> </stderr> <stdout> <line text="Hello World!"/> diff --git a/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java b/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java index b366d6798..9ae265bd1 100644 --- a/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java @@ -66,6 +66,10 @@ public class Ajc153Tests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testDuplicateJVMTIAgents_pr151938() {runTest("Duplicate JVMTI agents");}; public void testLTWWorldWithAnnotationMatching_pr153572() { runTest("LTWWorld with annotation matching");} + public void testReweavableAspectNotRegistered_pr129525 () { + runTest("reweavableAspectNotRegistered error"); + } + ///////////////////////////////////////// public static Test suite() { return XMLBasedAjcTestCase.loadSuite(Ajc153Tests.class); diff --git a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml index f7586c342..b1910ee63 100644 --- a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml +++ b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml @@ -333,4 +333,20 @@ </run> </ajc-test> + <ajc-test dir="ltw" title="reweavableAspectNotRegistered error"> + <compile files="HelloWorld.java, ExceptionHandler.aj" options="-showWeaveInfo"> + <message kind="weave" text="Join point 'method-execution(void HelloWorld.main(java.lang.String[]))' in Type 'HelloWorld' (HelloWorld.java:3) advised by around advice from 'ExceptionHandler' (ExceptionHandler.aj:2)"/> + </compile> + <compile files="EmptyAspect.aj"> + </compile> + <run class="HelloWorld" ltw="aop-missingaspect.xml"> + <stdout> + <line text="Hello World!"/> + </stdout> + <stderr> + <line text="error aspect 'ExceptionHandler' woven into 'HelloWorld' must be defined to the weaver (placed on the aspectpath, or defined in an aop.xml file if using LTW)."/> + </stderr> + </run> + </ajc-test> + </suite>
\ No newline at end of file diff --git a/tests/src/org/aspectj/systemtest/tracing/tracing.xml b/tests/src/org/aspectj/systemtest/tracing/tracing.xml index 6a5d4881e..bed65f12d 100644 --- a/tests/src/org/aspectj/systemtest/tracing/tracing.xml +++ b/tests/src/org/aspectj/systemtest/tracing/tracing.xml @@ -52,8 +52,10 @@ <line text="warning aspect ExcludedAspect exluded"/> <line text="error Cannot find m_parent aspect"/> <line text="error Cannot find m_parent aspect"/> - <line text="warning register definition failed"/> - <line text="warning register definition failed"/> + <line text="error Concrete-aspect 'IncludedMissingAspect' could not be registered"/> + <line text="error Concrete-aspect 'IncludedMissingAspect' could not be registered"/> + <line text="warning failure(s) registering aspects. Disabling weaver for class loader"/> + <line text="warning failure(s) registering aspects. Disabling weaver for class loader"/> </stderr> </ant> </ajc-test> |