diff options
| author | Andy Clement <aclement@pivotal.io> | 2017-11-01 15:08:27 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2017-11-01 15:31:10 -0700 |
| commit | 6765fdc34c775e99799b36d88cff8ab88dffc8e7 (patch) | |
| tree | 13f35d56861a8685bd7bc20db34f3ae99a94bb91 /tests/src/org/aspectj | |
| parent | dc89660c13270539cf9ff71d288086631a658665 (diff) | |
| download | aspectj-6765fdc34c775e99799b36d88cff8ab88dffc8e7.tar.gz aspectj-6765fdc34c775e99799b36d88cff8ab88dffc8e7.zip | |
Fix 526734 - Incorrect generic override decp validation when binary weaving
Diffstat (limited to 'tests/src/org/aspectj')
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java | 7 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc1811/ajc1811.xml | 17 |
2 files changed, 24 insertions, 0 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java b/tests/src/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java index 4e6013507..80729f894 100644 --- a/tests/src/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc1811/Ajc1811Tests.java @@ -63,6 +63,7 @@ public class Ajc1811Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // public Outer<String>.Inner m2() { ... } } + // // public void testMultiArgs_509235() { // runTest("multiargs"); @@ -72,6 +73,12 @@ public class Ajc1811Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // runTest("multiargs - no ellipsis"); // } + // 1.8.13: + + public void testAjcGenerics() { + runTest("generics"); + } + // --- public static Test suite() { diff --git a/tests/src/org/aspectj/systemtest/ajc1811/ajc1811.xml b/tests/src/org/aspectj/systemtest/ajc1811/ajc1811.xml index f4e321e5c..fe59c3595 100644 --- a/tests/src/org/aspectj/systemtest/ajc1811/ajc1811.xml +++ b/tests/src/org/aspectj/systemtest/ajc1811/ajc1811.xml @@ -6,6 +6,23 @@ <compile options="-1.8" files="Code.java"/> </ajc-test> + <ajc-test dir="bugs1813/generics" title="generics"> + <!-- this order works reliably --> + <compile options="-1.8 -showWeaveInfo" files="A.java AlreadyImplementsA.java BaseI.java BaseT.java BindInterfaceA.aj ConcreteIImpl.java ConcreteTImpl.java Runner.java"> + <message kind="weave" text="Extending interface set for type 'AlreadyImplementsA' (AlreadyImplementsA.java) to include 'A<ConcreteTImpl,ConcreteIImpl>' (BindInterfaceA.aj)"/> + </compile> + + <!-- this order was failing --> + <compile options="-1.8 -showWeaveInfo" files="AlreadyImplementsA.java BaseI.java BaseT.java BindInterfaceA.aj ConcreteIImpl.java ConcreteTImpl.java A.java Runner.java "> + <message kind="weave" text="Extending interface set for type 'AlreadyImplementsA' (AlreadyImplementsA.java) to include 'A<ConcreteTImpl,ConcreteIImpl>' (BindInterfaceA.aj)"/> + </compile> + <run class="Runner"> + <stdout> + <line text="ok"/> + </stdout> + </run> + </ajc-test> + <ajc-test dir="bugs1811/509235" title="multiargs"> <compile options="-1.8" files="Code.java"/> <run class="Code"> |