238054: testcase, commented out

diff --git a/tests/model/expected/pr238054.txt b/tests/model/expected/pr238054.txt
new file mode 100644 (file)
index 0000000..e69c6ed
--- /dev/null
+++ b/tests/model/expected/pr238054.txt
@@ -0,0 +1,28 @@
+=== MODEL STATUS REPORT ========= After a batch build
+<root>  [java source file] 
+  pr238054.aj  [java source file] TEST_SANDBOX\pr238054.aj:1:
+    import declarations  [import reference] 
+    A  [class] TEST_SANDBOX\pr238054.aj:1:
+      x()  [method] TEST_SANDBOX\pr238054.aj:2:
+      y()  [method] TEST_SANDBOX\pr238054.aj:3:
+        method-call(void A.x())  [code] TEST_SANDBOX\pr238054.aj:3:
+        method-call(void A.x())  [code] TEST_SANDBOX\pr238054.aj:3:
+    B  [aspect] TEST_SANDBOX\pr238054.aj:6:
+      before(): <anonymous pointcut>  [advice] TEST_SANDBOX\pr238054.aj:7:
+=== END OF MODEL REPORT =========
+=== RELATIONSHIPS REPORT ========= After a batch build
+(targets=2) *pr238054.aj}B&before (advises) *pr238054.aj[A~y?method-call(void A.x())
+(targets=2) *pr238054.aj}B&before (advises) *pr238054.aj[A~y?method-call(void A.x())!2
+(targets=1) *pr238054.aj[A~y?method-call(void A.x())!2 (advised by) *pr238054.aj}B&before
+(targets=1) *pr238054.aj[A~y?method-call(void A.x()) (advised by) *pr238054.aj}B&before
+=== END OF RELATIONSHIPS REPORT ==
+=== Properties of the model and relationships map =====
+method=2
+import reference=1
+aspect=1
+code=2
+class=1
+advice=1
+RelationshipMapSize=3
+FileMapSize=1
+java source file=2

diff --git a/tests/model/pr238054/pr238054.aj b/tests/model/pr238054/pr238054.aj
new file mode 100644 (file)
index 0000000..f1021b3
--- /dev/null
+++ b/tests/model/pr238054/pr238054.aj
@@ -0,0 +1,8 @@
+class A {
+        void x() {}
+        void y() { x();x();}
+}
+
+aspect B {
+        before() : call(* A.x()) {}
+}

diff --git a/tests/src/org/aspectj/systemtest/model/ModelTests.java b/tests/src/org/aspectj/systemtest/model/ModelTests.java
index 51853f332483b55806aaf34aaafddfe3e682175e..4978f1d5dcf5562cca9f52b31d92504ab12b51c8 100644 (file)
--- a/tests/src/org/aspectj/systemtest/model/ModelTests.java
+++ b/tests/src/org/aspectj/systemtest/model/ModelTests.java
@@ -70,6 +70,8 @@ public class ModelTests extends ModelTestCase {
        public void testAbstractAspectsAndAdvice_pr160469() {runModelTest("ensure advice from abstract aspects appear correctly in the model","pr160469_1");}
        public void testAbstractAspectsAndDeow_pr160469() {runModelTest("ensure deow from abstract aspects appear correctly in the model","pr160469_2");}
        
+       //public void testMultipleIdenticalJpsOnOneLine_pr238054() { runModelTest("multiple identical jps on one line","pr238054");}
+       
        /////////////////////////////////////////
        public static Test suite() {
                return XMLBasedAjcTestCase.loadSuite(ModelTests.class);

diff --git a/tests/src/org/aspectj/systemtest/model/model.xml b/tests/src/org/aspectj/systemtest/model/model.xml
index 38bd461b7e922dd176e1061b02203fd6bb250f3a..ff406a99209bae747c4f6da3cced72319a26d3d0 100644 (file)
--- a/tests/src/org/aspectj/systemtest/model/model.xml
+++ b/tests/src/org/aspectj/systemtest/model/model.xml
@@ -4,6 +4,12 @@
 <suite>
 <!-- non-AspectJ 5 specific tests -->
 
+    <ajc-test dir="model/pr238054" title="multiple identical jps on one line">
+        <compile files="pr238054.aj" options="-emacssym"/>
+    </ajc-test> 
+
+
+
     <ajc-test dir="model/pr77269_1" title="advice in structure model with anonymous inner class">
         <compile files="pack/pr77269.aj" options="-emacssym"/>
     </ajc-test>