diff options
10 files changed, 57 insertions, 0 deletions
diff --git a/tests/bugs1612/pr354683/main/AbstractBaseClass.java b/tests/bugs1612/pr354683/main/AbstractBaseClass.java new file mode 100644 index 000000000..d885d5fc2 --- /dev/null +++ b/tests/bugs1612/pr354683/main/AbstractBaseClass.java @@ -0,0 +1,12 @@ +package main; + +import util.DerivedCommonDataInterfaceImpl; + + +/** +* NOTE: for iajc failure to occur this class has to be +* 1st - parametrized +* 2nd - abstract +* whether or not its subclasses specifie the type parameter does not matter +*/ +public abstract class AbstractBaseClass <T extends Whatever> implements DerivedCommonDataInterfaceImpl {} diff --git a/tests/bugs1612/pr354683/main/DerivedClass.java b/tests/bugs1612/pr354683/main/DerivedClass.java new file mode 100644 index 000000000..e8e891927 --- /dev/null +++ b/tests/bugs1612/pr354683/main/DerivedClass.java @@ -0,0 +1,3 @@ +package main; + +public class DerivedClass extends AbstractBaseClass {} diff --git a/tests/bugs1612/pr354683/main/Whatever.java b/tests/bugs1612/pr354683/main/Whatever.java new file mode 100644 index 000000000..0dc327133 --- /dev/null +++ b/tests/bugs1612/pr354683/main/Whatever.java @@ -0,0 +1,5 @@ +package main; + +public class Whatever { + +} diff --git a/tests/bugs1612/pr354683/util/CommonData.java b/tests/bugs1612/pr354683/util/CommonData.java new file mode 100644 index 000000000..8e13cb11c --- /dev/null +++ b/tests/bugs1612/pr354683/util/CommonData.java @@ -0,0 +1,5 @@ +package util; + +public interface CommonData { + void getData(); +} diff --git a/tests/bugs1612/pr354683/util/CommonDataImpl.java b/tests/bugs1612/pr354683/util/CommonDataImpl.java new file mode 100644 index 000000000..edabda4d3 --- /dev/null +++ b/tests/bugs1612/pr354683/util/CommonDataImpl.java @@ -0,0 +1,6 @@ +package util; + + +public interface CommonDataImpl extends CommonData { + +} diff --git a/tests/bugs1612/pr354683/util/CommonDataImplementation.aj b/tests/bugs1612/pr354683/util/CommonDataImplementation.aj new file mode 100644 index 000000000..9b482cbc9 --- /dev/null +++ b/tests/bugs1612/pr354683/util/CommonDataImplementation.aj @@ -0,0 +1,6 @@ +package util; + +public aspect CommonDataImplementation { + public void CommonDataImpl.getData() { + } +} diff --git a/tests/bugs1612/pr354683/util/DerivedCommonDataInterface.java b/tests/bugs1612/pr354683/util/DerivedCommonDataInterface.java new file mode 100644 index 000000000..3b516ef63 --- /dev/null +++ b/tests/bugs1612/pr354683/util/DerivedCommonDataInterface.java @@ -0,0 +1,6 @@ +package util; + + +public interface DerivedCommonDataInterface extends CommonData { + void getDerivedData(); +} diff --git a/tests/bugs1612/pr354683/util/DerivedCommonDataInterfaceImpl.java b/tests/bugs1612/pr354683/util/DerivedCommonDataInterfaceImpl.java new file mode 100644 index 000000000..bcccd47d7 --- /dev/null +++ b/tests/bugs1612/pr354683/util/DerivedCommonDataInterfaceImpl.java @@ -0,0 +1,4 @@ +package util; + + +public interface DerivedCommonDataInterfaceImpl extends DerivedCommonDataInterface, CommonDataImpl {} diff --git a/tests/bugs1612/pr354683/util/DerivedCommonDataInterfaceImplementation.aj b/tests/bugs1612/pr354683/util/DerivedCommonDataInterfaceImplementation.aj new file mode 100644 index 000000000..6cbe393c2 --- /dev/null +++ b/tests/bugs1612/pr354683/util/DerivedCommonDataInterfaceImplementation.aj @@ -0,0 +1,5 @@ +package util; + +public aspect DerivedCommonDataInterfaceImplementation { + public void DerivedCommonDataInterfaceImpl.getDerivedData() {} +} diff --git a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml index 898eb8a25..f8e2b0f4a 100644 --- a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml +++ b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml @@ -2,6 +2,11 @@ <suite> +<ajc-test dir="bugs1612/pr354683" title="itd split compilation"> +<compile files="util/CommonData.java util/CommonDataImpl.java util/CommonDataImplementation.aj util/DerivedCommonDataInterface.java util/DerivedCommonDataInterfaceImpl.java util/DerivedCommonDataInterfaceImplementation.aj" options="-1.5" outjar="code.jar"/> +<compile files="main/AbstractBaseClass.java main/DerivedClass.java main/Whatever.java " options="-1.5 -showWeaveInfo" aspectpath="code.jar"/> +</ajc-test> + <ajc-test dir="bugs1612/pr239649" title="thisAspectInstance - 1"> <compile files="One.java" options="-1.5"/> <run class="One"> |