aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authoraclement <aclement>2005-11-21 16:33:56 +0000
committeraclement <aclement>2005-11-21 16:33:56 +0000
commit9ed75a10abaca8a6c8569ead1b74eaaadc980b07 (patch)
tree27f281b892b5cb06e54525f29bc1f9fea4960a3f /tests
parentd58439272e0c8bd5d818c80161df9d0ba520e5b9 (diff)
downloadaspectj-9ed75a10abaca8a6c8569ead1b74eaaadc980b07.tar.gz
aspectj-9ed75a10abaca8a6c8569ead1b74eaaadc980b07.zip
test and fix for 115607 (declare @type): patch from helen.
Diffstat (limited to 'tests')
-rw-r--r--tests/bugs150/pr115607.java7
-rw-r--r--tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java14
-rw-r--r--tests/src/org/aspectj/systemtest/ajc150/ajc150.xml9
3 files changed, 29 insertions, 1 deletions
diff --git a/tests/bugs150/pr115607.java b/tests/bugs150/pr115607.java
new file mode 100644
index 000000000..dfbcd28b7
--- /dev/null
+++ b/tests/bugs150/pr115607.java
@@ -0,0 +1,7 @@
+@interface I {}
+
+class Simple {}
+
+public aspect pr115607 {
+ declare @type: Simple : @I;
+} \ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index 253a9fe72..4a2ff9f6b 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -77,6 +77,7 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
public void testVarargsITD_pr110906() { runTest("ITD varargs problem");}
public void testBadRenderer_pr86903() { runTest("bcelrenderer bad");}
+ // public void testSelfBoundGenerics_pr117296() { runTest("self bounding generic types");}
public void testIncompatibleClassChangeError_pr113630_1() {runTest("IncompatibleClassChangeError - errorscenario");}
public void testIncompatibleClassChangeError_pr113630_2() {runTest("IncompatibleClassChangeError - workingscenario");}
@@ -731,7 +732,18 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
public void testXlintMessageForImproperAnnotationType_pr115252_Parameter() {runTest("xlint message for improper annotated parameter type");}
public void testXlintMessageForImproperAnnotationType_pr115252_Throws() {runTest("xlint message for improper annotated throws pattern");}
public void testXlintMessageForImproperAnnotationType_pr115252_MoreThanOne() {runTest("xlint message for more than one improper annotated parameter type");}
-
+
+ public void testDeclareAtTypeInStructureModel_pr115607() {
+ AsmManager.setReporting("c:/debug.txt",true,true,true,true);
+ runTest("declare at type appears correctly in structure model");
+ IHierarchy top = AsmManager.getDefault().getHierarchy();
+ IProgramElement pe = top.findElementForLabel(top.getRoot(),
+ IProgramElement.Kind.DECLARE_ANNOTATION_AT_TYPE,"declare @type: Simple : @I");
+ assertNotNull("Couldn't find 'declare @type: Simple : @I' element in the tree",pe);
+ List l = AsmManager.getDefault().getRelationshipMap().get(pe);
+ assertNotNull("Should have some relationships but does not",l);
+ }
+
// helper methods.....
public SyntheticRepository createRepos(File cpentry) {
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 5239733ca..8c9354fe4 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -52,6 +52,10 @@
<ajc-test dir="bugs150" pr="112756" title="pointcut expression containing 'assert'">
<compile files="Pr112756.aj" options="-warn:assertIdentifier -Xdev:Pinpoint"/>
</ajc-test>
+
+ <ajc-test dir="bugs150" pr="117296" title="self bounding generic types">
+ <compile files="PropertySupport.java" options="-1.5"/>
+ </ajc-test>
<ajc-test dir="java5/reflection" title="pointcut parsing with ajc compiled pointcut references">
<compile files="PointcutLibrary.aj,ReflectOnAjcCompiledPointcuts.java"></compile>
@@ -1123,6 +1127,11 @@
</compile>
</ajc-test>
+ <ajc-test dir="bugs150" title="declare at type appears correctly in structure model">
+ <compile files="pr115607.java" options="-1.5,-emacssym">
+ </compile>
+ </ajc-test>
+
<!-- ============================================================================ -->
<!-- ============================================================================ -->