diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ajcTests.xml | 22 | ||||
| -rw-r--r-- | tests/ajcTestsFailing.xml | 15 | ||||
| -rw-r--r-- | tests/jimTests.xml | 1 | ||||
| -rw-r--r-- | tests/options/injars/simple/DecParents.java | 23 |
4 files changed, 46 insertions, 15 deletions
diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml index 97927ea16..6d4fd67b9 100644 --- a/tests/ajcTests.xml +++ b/tests/ajcTests.xml @@ -5781,5 +5781,27 @@ <run class="b_impl.BImpl"/> </ajc-test> + <ajc-test dir="new/declareParents" + title="Declare parents with intermediate ancestor" + keywords="from-new"> + <compile files="Driver.java"/> + <run class="Driver"/> + </ajc-test> + + <ajc-test dir="new/declareParents" + title="Declare parents removing ancestor" + keywords="from-new"> + <compile files="IllegalAdoption.java"> + <message kind="error" line="13"/> + </compile> + </ajc-test> + + + <ajc-test dir="options/injars/simple" pr="35865" + title="options -injars checking declare parents interactions"> + <compile files="DecParents.java,main.jar" + options="!eclipse"/> + <run class="DecParents"/> + </ajc-test> </suite> diff --git a/tests/ajcTestsFailing.xml b/tests/ajcTestsFailing.xml index 27b67e5b0..1b2b82f8c 100644 --- a/tests/ajcTestsFailing.xml +++ b/tests/ajcTestsFailing.xml @@ -4,19 +4,6 @@ <!-- contains valid tests that the compiler has never passed --> <suite> - <ajc-test dir="new/declareParents" - title="Declare parents with intermediate ancestor" - keywords="from-new"> - <compile files="Driver.java"/> - <run class="Driver"/> - </ajc-test> - - <ajc-test dir="new/declareParents" - title="Declare parents removing ancestor" - keywords="from-new"> - <compile files="IllegalAdoption.java"> - <message kind="error" line="13"/> - </compile> - </ajc-test> + </suite> diff --git a/tests/jimTests.xml b/tests/jimTests.xml index 7664c3799..cc3257d9f 100644 --- a/tests/jimTests.xml +++ b/tests/jimTests.xml @@ -1,7 +1,6 @@ <!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"> <suite> - <!-- <ajc-test dir="new" pr="885" diff --git a/tests/options/injars/simple/DecParents.java b/tests/options/injars/simple/DecParents.java new file mode 100644 index 000000000..ecbf5f1e3 --- /dev/null +++ b/tests/options/injars/simple/DecParents.java @@ -0,0 +1,23 @@ + + +import org.aspectj.testing.Tester; + +public aspect DecParents { + private interface I { + public abstract String doit(); + } + + public String I.doit() { + return "foo"; + } + + declare parents: Main implements I; + + before(): execution(void Main.main(..)) { + } + + public static void main(String[] args) { + I i = new Main(); + System.out.println("Main: " + i.doit()); + } +}
\ No newline at end of file |