diff options
| author | aclement <aclement> | 2009-07-28 01:52:31 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2009-07-28 01:52:31 +0000 |
| commit | 3c9a892af98b9d5ad8e3826295d0ff141e738aca (patch) | |
| tree | ac2c95bca53d2a5faa74f94fa6597a2b059a7084 | |
| parent | 224e781cb556614cd65e463614ec2797ae644e49 (diff) | |
| download | aspectj-3c9a892af98b9d5ad8e3826295d0ff141e738aca.tar.gz aspectj-3c9a892af98b9d5ad8e3826295d0ff141e738aca.zip | |
279983: generic method overriding
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc165/ajc165.xml | 6 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java | 6 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc166/ajc166.xml | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc165/ajc165.xml b/tests/src/org/aspectj/systemtest/ajc165/ajc165.xml index fabaa4886..6c3b74d71 100644 --- a/tests/src/org/aspectj/systemtest/ajc165/ajc165.xml +++ b/tests/src/org/aspectj/systemtest/ajc165/ajc165.xml @@ -1,12 +1,6 @@ <!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]> <suite> - - <ajc-test dir="bugs165/pr279983" title="generics bridge"> - <compile files="X.java" options="-1.5"/> - <run class="X"/> - </ajc-test> - <ajc-test dir="bugs165/pr277959" title="verifyerror"> <compile files="AOPTest.java CodeAspect.java" options="-1.5"/> diff --git a/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java b/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java index 8e5f0bbf9..19b333205 100644 --- a/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java @@ -19,9 +19,9 @@ import org.aspectj.testing.XMLBasedAjcTestCase; public class Ajc166Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // fix is too disruptive for 1.6.5 - // public void testGenericsBridge_pr279983() { - // runTest("generics bridge"); - // } + public void testGenericsBridge_pr279983() { + runTest("generics bridge"); + } public void testGenericsDecp_pr282299() { runTest("generics and decp"); diff --git a/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml b/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml index 27628adbb..32f072b0f 100644 --- a/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml +++ b/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml @@ -2,6 +2,11 @@ <suite> + <ajc-test dir="bugs165/pr279983" title="generics bridge"> + <compile files="X.java" options="-1.5"/> + <run class="X"/> + </ajc-test> + <ajc-test dir="bugs166/pr282299" title="generics and decp"> <compile files="Code.java" options="-1.5"/> </ajc-test> |