From e97d305371a4e75edc1419cce5220238d1cef7f8 Mon Sep 17 00:00:00 2001 From: aclement Date: Thu, 11 Sep 2008 08:36:47 +0000 Subject: [PATCH] 246918: perclause: --- .../systemtest/ajc162/Ajc162Tests.java | 209 +++++++++++++----- .../org/aspectj/systemtest/ajc162/ajc162.xml | 43 ++++ 2 files changed, 200 insertions(+), 52 deletions(-) diff --git a/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java b/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java index bce389c85..0085ffe99 100644 --- a/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc162/Ajc162Tests.java @@ -17,61 +17,166 @@ import junit.framework.Test; import org.aspectj.testing.XMLBasedAjcTestCase; public class Ajc162Tests extends org.aspectj.testing.XMLBasedAjcTestCase { - - // AspectJ1.6.2 - public void testAnnoValueBinding_pr246264() { runTest("anno value binding"); } - public void testAroundAdviceProceed_pr211607() { runTest("around advice proceed"); } -// public void testAdvisingInterfaces_pr163005() { runTest("advising joinpoints in interfaces"); } - public void testChainedItds_pr176905() { runTest("chained itds"); } - public void testDecAtAnnoDecP_pr198341() { runTest("dec atanno and decp"); } -// public void testStarInAnnoStyle_pr209951() { runTest("asterisk in at aj pointcut"); } - public void testMissingMarkers_pr197720() { runTest("missing markers on inherited annotated method"); } - public void testLostGenericsSigOnItd_pr211146() { runTest("lost generic sig on itd"); } - public void testLostGenericsSigOnItd_pr211146_2() { runTest("lost generic sig on itd - 2"); } - public void testLostGenericsSigOnItd_pr211146_3() { runTest("lost generic sig on itd - 3"); } - public void testLostGenericsSigOnItd_pr211146_4() { runTest("lost generic sig on itd - 4"); } - public void testLostGenericsSigOnItd_pr211146_5() { runTest("lost generic sig on itd - 5"); } - public void testMissingContext_pr194429() { runTest("missing context"); } - public void testWarningsForLimitations_pr210114() { runTest("warnings for limitations"); } - public void testPTW_pr244830() { runTest("ptw initFailureCause"); } - public void testGenericItdsOverrides_pr222648() { runTest("generic itds - overrides"); } - public void testGenericItdsOverrides_pr222648_2() { runTest("generic itds - overrides - 2"); } - public void testItdCallingGenericMethod_pr145391() { runTest("itd calling generic method");} - public void testItdCallingGenericMethod_pr145391_2() { runTest("itd calling generic method - 2");} - public void testPublicPointcut_pr239539() { runTest("public pointcut"); } - public void testGenericDecp_pr241047() { runTest("generic decp"); } - public void testGenericDecp_pr241047_2() { runTest("generic decp - 2"); } - public void testGenericItds_pr242797_1() { runTest("generic itds - 1"); } - public void testGenericItds_pr242797_2() { runTest("generic itds - 2"); } - public void testGenericItds_pr242797_3() { runTest("generic itds - 3"); } - public void testPrivilegedGenerics_pr240693() { runTest("privileged generics"); } -// public void testParamAnnosPipelining_pr241847() { runTest("param annos pipelining");} -// public void testParamAnnoInner_pr241861() { runTest("param annotation inner class"); } - public void testAnnotationDecp_pr239441() { runTest("annotation decp"); } - public void testAtAspectJPerTarget_pr198181() { runTest("ataspectj ltw pertarget"); } - public void testAnnotationValueDecp_pr238992() { runTest("annotation value decp"); } - public void testAnnotationValueDecp_pr238992_2() { runTest("annotation value decp - 2"); } - public void testAnnotationValueDecp_pr238992_3() { runTest("annotation value decp - 3"); } - public void testAnnotationValueDecp_pr238992_4() { runTest("annotation value decp - 4"); } - public void testAnnotationValueDecp_pr238992_5() { runTest("annotation value decp - 5"); } - + + // AspectJ1.6.2 + public void testPerClause() { + runTest("ltw perclause"); + } + + public void testPerClause2() { + runTest("ltw perclause - 2"); + } + + public void testPerClause3() { + runTest("ltw perclause - 3"); + } + + public void testPerClause4_IncorrectPerClause() { + runTest("ltw perclause - 4"); + } + + public void testAnnoValueBinding_pr246264() { + runTest("anno value binding"); + } + + public void testAroundAdviceProceed_pr211607() { + runTest("around advice proceed"); + } + + // public void testAdvisingInterfaces_pr163005() { runTest("advising joinpoints in interfaces"); } + public void testChainedItds_pr176905() { + runTest("chained itds"); + } + + public void testDecAtAnnoDecP_pr198341() { + runTest("dec atanno and decp"); + } + + // public void testStarInAnnoStyle_pr209951() { runTest("asterisk in at aj pointcut"); } + public void testMissingMarkers_pr197720() { + runTest("missing markers on inherited annotated method"); + } + + public void testLostGenericsSigOnItd_pr211146() { + runTest("lost generic sig on itd"); + } + + public void testLostGenericsSigOnItd_pr211146_2() { + runTest("lost generic sig on itd - 2"); + } + + public void testLostGenericsSigOnItd_pr211146_3() { + runTest("lost generic sig on itd - 3"); + } + + public void testLostGenericsSigOnItd_pr211146_4() { + runTest("lost generic sig on itd - 4"); + } + + public void testLostGenericsSigOnItd_pr211146_5() { + runTest("lost generic sig on itd - 5"); + } + + public void testMissingContext_pr194429() { + runTest("missing context"); + } + + public void testWarningsForLimitations_pr210114() { + runTest("warnings for limitations"); + } + + public void testPTW_pr244830() { + runTest("ptw initFailureCause"); + } + + public void testGenericItdsOverrides_pr222648() { + runTest("generic itds - overrides"); + } + + public void testGenericItdsOverrides_pr222648_2() { + runTest("generic itds - overrides - 2"); + } + + public void testItdCallingGenericMethod_pr145391() { + runTest("itd calling generic method"); + } + + public void testItdCallingGenericMethod_pr145391_2() { + runTest("itd calling generic method - 2"); + } + + public void testPublicPointcut_pr239539() { + runTest("public pointcut"); + } + + public void testGenericDecp_pr241047() { + runTest("generic decp"); + } + + public void testGenericDecp_pr241047_2() { + runTest("generic decp - 2"); + } + + public void testGenericItds_pr242797_1() { + runTest("generic itds - 1"); + } + + public void testGenericItds_pr242797_2() { + runTest("generic itds - 2"); + } + + public void testGenericItds_pr242797_3() { + runTest("generic itds - 3"); + } + + public void testPrivilegedGenerics_pr240693() { + runTest("privileged generics"); + } + + // public void testParamAnnosPipelining_pr241847() { runTest("param annos pipelining");} + // public void testParamAnnoInner_pr241861() { runTest("param annotation inner class"); } + public void testAnnotationDecp_pr239441() { + runTest("annotation decp"); + } + + public void testAtAspectJPerTarget_pr198181() { + runTest("ataspectj ltw pertarget"); + } + + public void testAnnotationValueDecp_pr238992() { + runTest("annotation value decp"); + } + + public void testAnnotationValueDecp_pr238992_2() { + runTest("annotation value decp - 2"); + } + + public void testAnnotationValueDecp_pr238992_3() { + runTest("annotation value decp - 3"); + } + + public void testAnnotationValueDecp_pr238992_4() { + runTest("annotation value decp - 4"); + } + + public void testAnnotationValueDecp_pr238992_5() { + runTest("annotation value decp - 5"); + } + /* - * test plan - * execution(* *(..,String,..)) - * args(..,String,..) - * @args(..,Foo,..) + * test plan execution((..,String,..)) args(..,String,..) * + * @args(..,Foo,..) */ -// public void testParameterSubsettingMatching_pr233718_Matching() { runTest("parameter subsetting - matching");} -// public void testParameterSubsettingMatching_pr233718_ArgsMatching() { runTest("parameter subsetting - args matching");} -// public void testParameterSubsettingMatching_pr233718_ArgsBinding() { runTest("parameter subsetting - args binding");} - + // public void testParameterSubsettingMatching_pr233718_Matching() { runTest("parameter subsetting - matching");} + // public void testParameterSubsettingMatching_pr233718_ArgsMatching() { runTest("parameter subsetting - args matching");} + // public void testParameterSubsettingMatching_pr233718_ArgsBinding() { runTest("parameter subsetting - args binding");} public static Test suite() { - return XMLBasedAjcTestCase.loadSuite(Ajc162Tests.class); - } + return XMLBasedAjcTestCase.loadSuite(Ajc162Tests.class); + } + + protected File getSpecFile() { + return new File("../tests/src/org/aspectj/systemtest/ajc162/ajc162.xml"); + } - protected File getSpecFile() { - return new File("../tests/src/org/aspectj/systemtest/ajc162/ajc162.xml"); - } - } \ No newline at end of file diff --git a/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml b/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml index f592b9717..f096322b2 100644 --- a/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml +++ b/tests/src/org/aspectj/systemtest/ajc162/ajc162.xml @@ -3,6 +3,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.39.5