258206: package declaration support in the model

diff --git a/tests/model/expected/pr115607.txt b/tests/model/expected/pr115607.txt
index 0f035852830704109328da115c69da6a8171a69a..2a6a551bb92e73f2cdf62f8e83284dfd02e5f99a 100644 (file)
--- a/tests/model/expected/pr115607.txt
+++ b/tests/model/expected/pr115607.txt
@@ -2,7 +2,7 @@
 <root>  [java source file] 
     [package] 
     pr115607.java  [java source file] TEST_SANDBOX\pr115607.java:1:
-      import declarations  [import reference] 
+        [import reference] 
       I  [annotation] TEST_SANDBOX\pr115607.java:1:
       Simple  [class] TEST_SANDBOX\pr115607.java:3:
       pr115607  [aspect] TEST_SANDBOX\pr115607.java:5:

diff --git a/tests/model/expected/pr120356.txt b/tests/model/expected/pr120356.txt
index 29f6438c8dff2e63f17e76947d61666305b1b457..c4060f72ec7ac36849eaf6fa4c4a275cd9383c5c 100644 (file)
--- a/tests/model/expected/pr120356.txt
+++ b/tests/model/expected/pr120356.txt
@@ -2,7 +2,7 @@
 <root>  [java source file] 
     [package] 
     A.java  [java source file] TEST_SANDBOX\A.java:1:
-      import declarations  [import reference] 
+        [import reference] 
         org.aspectj.lang.annotation.DeclareError  [import reference] TEST_SANDBOX\A.java:4:
         org.aspectj.lang.annotation.DeclareWarning  [import reference] TEST_SANDBOX\A.java:3:
         org.aspectj.lang.annotation.Aspect  [import reference] TEST_SANDBOX\A.java:2:
@@ -10,15 +10,15 @@
         warning  [field] TEST_SANDBOX\A.java:10:
         error  [field] TEST_SANDBOX\A.java:13:
     C.java  [java source file] TEST_SANDBOX\C.java:1:
-      import declarations  [import reference] 
+        [import reference] 
       C  [class] TEST_SANDBOX\C.java:3:
         warningMethod()  [method] TEST_SANDBOX\C.java:5:
         badMethod()  [method] TEST_SANDBOX\C.java:8:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
+(targets=1) <{C.java[C~badMethod (matches declare) <{A.java}A^error
 (targets=1) <{C.java[C~warningMethod (matches declare) <{A.java}A^warning
 (targets=1) <{A.java}A^warning (matched by) <{C.java[C~warningMethod
-(targets=1) <{C.java[C~badMethod (matches declare) <{A.java}A^error
 (targets=1) <{A.java}A^error (matched by) <{C.java[C~badMethod
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====

diff --git a/tests/model/expected/pr131932.txt b/tests/model/expected/pr131932.txt
index 0955fb19e7e394f2e47a843f142e5f25d3c102ce..4f038a447944e9c06d6aa22ccfc1da9fcad40fa0 100644 (file)
--- a/tests/model/expected/pr131932.txt
+++ b/tests/model/expected/pr131932.txt
@@ -2,7 +2,7 @@
 <root>  [java source file] 
     [package] 
     pr131932.aj  [java source file] TEST_SANDBOX\pr131932.aj:1:
-      import declarations  [import reference] 
+        [import reference] 
         java.util.List  [import reference] TEST_SANDBOX\pr131932.aj:1:
       Slide74  [aspect] TEST_SANDBOX\pr131932.aj:3:
         Bar  [class] TEST_SANDBOX\pr131932.aj:13:
@@ -16,9 +16,9 @@
 (targets=1) <*pr131932.aj}Slide74)Bar.children (declared on) <*pr131932.aj}Slide74[Bar
 (targets=1) <*pr131932.aj}Slide74)Bar.getFirst (declared on) <*pr131932.aj}Slide74[Bar
 (targets=1) <*pr131932.aj[Foo (aspect declarations) <*pr131932.aj}Slide74)Foo.Foo_new)Qjava.util.List\<TT;>;
-(targets=1) <*pr131932.aj}Slide74)Foo.Foo_new)Qjava.util.List\<TT;>; (declared on) <*pr131932.aj[Foo
 (targets=2) <*pr131932.aj}Slide74[Bar (aspect declarations) <*pr131932.aj}Slide74)Bar.getFirst
 (targets=2) <*pr131932.aj}Slide74[Bar (aspect declarations) <*pr131932.aj}Slide74)Bar.children
+(targets=1) <*pr131932.aj}Slide74)Foo.Foo_new)Qjava.util.List\<TT;>; (declared on) <*pr131932.aj[Foo
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 import reference=2

diff --git a/tests/model/expected/pr132130.txt b/tests/model/expected/pr132130.txt
index f64bc7cfdbbdaa64c85c1f64c27d038429eb777d..e4b7e0968b5ac35362cbcdcb9d1c121dcd6f2a6c 100644 (file)
--- a/tests/model/expected/pr132130.txt
+++ b/tests/model/expected/pr132130.txt
@@ -2,7 +2,7 @@
 <root>  [java source file] 
     [package] 
     pr132130.aj  [java source file] TEST_SANDBOX\pr132130.aj:1:
-      import declarations  [import reference] 
+        [import reference] 
       basic  [aspect] TEST_SANDBOX\pr132130.aj:1:
         declare @method: * debit(..) : @Secured(role = "supervisor")  [declare @method] TEST_SANDBOX\pr132130.aj:3:
         declare @constructor: BankAccount+.new(..) : @Secured(role = "supervisor")  [declare @constructor] TEST_SANDBOX\pr132130.aj:4:

diff --git a/tests/model/expected/pr141730_1.txt b/tests/model/expected/pr141730_1.txt
index 479b2a5f0761dc3db134add5614cfd793fe2b1f0..2f6eb6f9d4bdc1ae14c831f5813627a0610565db 100644 (file)
--- a/tests/model/expected/pr141730_1.txt
+++ b/tests/model/expected/pr141730_1.txt
@@ -2,7 +2,7 @@
 <root>  [java source file] 
     [package] 
     pr141730.aj  [java source file] TEST_SANDBOX\pr141730.aj:1:
-      import declarations  [import reference] 
+        [import reference] 
       A  [aspect] TEST_SANDBOX\pr141730.aj:1:
         p()  [pointcut] TEST_SANDBOX\pr141730.aj:3:
         before(): p..  [advice] TEST_SANDBOX\pr141730.aj:5:
@@ -35,12 +35,12 @@
 (targets=11) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~main~\[QString;
 (targets=11) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~multiMethod~\[\[QString;
 (targets=11) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~intArray~\[I
+(targets=1) <*pr141730.aj[C~multiMethod~\[\[QString; (advised by) <*pr141730.aj}A&before
 (targets=1) <*pr141730.aj[C~stringMethod~QString; (advised by) <*pr141730.aj}A&before
 (targets=1) <*pr141730.aj[C~intArray~\[I (advised by) <*pr141730.aj}A&before
 (targets=1) <*pr141730.aj[C~myClassMethod~LMyClass; (advised by) <*pr141730.aj}A&before
 (targets=1) <*pr141730.aj[C~C (advised by) <*pr141730.aj}A&before
 (targets=1) <*pr141730.aj}A (advised by) <*pr141730.aj}A&before
-(targets=1) <*pr141730.aj[C~multiMethod~\[\[QString; (advised by) <*pr141730.aj}A&before
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=8

diff --git a/tests/model/expected/pr141730_2.txt b/tests/model/expected/pr141730_2.txt
index 565f2471d8307fadbc27865810a4fafa67a9551f..49282247b8e0a2dd9a15723363a65e269f1646f2 100644 (file)
--- a/tests/model/expected/pr141730_2.txt
+++ b/tests/model/expected/pr141730_2.txt
@@ -2,7 +2,7 @@
 <root>  [java source file] 
     [package] 
     pr141730.aj  [java source file] TEST_SANDBOX\pr141730.aj:1:
-      import declarations  [import reference] 
+        [import reference] 
         java.util.List  [import reference] TEST_SANDBOX\pr141730.aj:1:
       A  [aspect] TEST_SANDBOX\pr141730.aj:3:
         p()  [pointcut] TEST_SANDBOX\pr141730.aj:5:
@@ -14,17 +14,17 @@
       MyGenericClass  [class] TEST_SANDBOX\pr141730.aj:22:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) <*pr141730.aj[MyClass (advised by) <*pr141730.aj}A&before
 (targets=1) <*pr141730.aj[MyGenericClass (advised by) <*pr141730.aj}A&before
-(targets=1) <*pr141730.aj[C~genericMethod2~QMyGenericClass\<QString;LMyClass;>; (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[MyClass (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[C~genericMethod~Qjava.util.List\<QString;>; (advised by) <*pr141730.aj}A&before
 (targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj}A
 (targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[C
 (targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~genericMethod~Qjava.util.List\<QString;>;
 (targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[C~genericMethod2~QMyGenericClass\<QString;LMyClass;>;
-(targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[MyGenericClass
 (targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[MyClass
-(targets=1) <*pr141730.aj[C~genericMethod~Qjava.util.List\<QString;>; (advised by) <*pr141730.aj}A&before
+(targets=6) <*pr141730.aj}A&before (advises) <*pr141730.aj[MyGenericClass
 (targets=1) <*pr141730.aj[C (advised by) <*pr141730.aj}A&before
+(targets=1) <*pr141730.aj[C~genericMethod2~QMyGenericClass\<QString;LMyClass;>; (advised by) <*pr141730.aj}A&before
 (targets=1) <*pr141730.aj}A (advised by) <*pr141730.aj}A&before
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====

diff --git a/tests/model/expected/pr141730_3.txt b/tests/model/expected/pr141730_3.txt
index 2b3c3fb34bb7f4a267bf1b5728b5aa8a8ce74504..07ce5021847dccb50364a604a0571e1cbff5f5aa 100644 (file)
--- a/tests/model/expected/pr141730_3.txt
+++ b/tests/model/expected/pr141730_3.txt
@@ -2,7 +2,8 @@
 <root>  [java source file] 
   foo  [package] 
     MyFoo.java  [java source file] TEST_SANDBOX\MyFoo.java:1:
-      import declarations  [import reference] 
+      foo  [package declaration] TEST_SANDBOX\MyFoo.java:1:
+        [import reference] 
       MyFoo  [class] TEST_SANDBOX\MyFoo.java:3:
         callMain()  [method] TEST_SANDBOX\MyFoo.java:5:
           method-call(void foo.MyFoo.main())  [code] TEST_SANDBOX\MyFoo.java:6:
@@ -13,11 +14,12 @@
 (targets=1) {MyBar.class (advises) <foo{MyFoo.java[MyFoo~callMain?method-call(void foo.MyFoo.main())
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
-package=1
-FileMapSize=1
-RelationshipMapSize=2
-java source file=2
+method=2
 import reference=1
 code=1
 class=1
-method=2
+RelationshipMapSize=2
+package declaration=1
+FileMapSize=1
+package=1
+java source file=2

diff --git a/tests/model/expected/pr141730_4.txt b/tests/model/expected/pr141730_4.txt
index 9eb235a1e5f9afbf71ce053f3ff17508b5d4e8b1..714d1fba001b19bddc0b0112c2a725b95c6bed4d 100644 (file)
--- a/tests/model/expected/pr141730_4.txt
+++ b/tests/model/expected/pr141730_4.txt
@@ -2,7 +2,8 @@
 <root>  [java source file] 
   bar  [package] 
     MyBar.aj  [java source file] TEST_SANDBOX\MyBar.aj:1:
-      import declarations  [import reference] 
+      bar  [package declaration] TEST_SANDBOX\MyBar.aj:1:
+        [import reference] 
         foo.*  [import reference] TEST_SANDBOX\MyBar.aj:3:
       MyBar  [aspect] TEST_SANDBOX\MyBar.aj:5:
         before(): <anonymous pointcut>  [advice] TEST_SANDBOX\MyBar.aj:7:
@@ -13,17 +14,19 @@
         declare @constructor: *Foo.new(java.lang.String) : @MyAnnotation  [declare @constructor] TEST_SANDBOX\MyBar.aj:15:
         declare @field: int *Foo.* : @MyAnnotation  [declare @field] TEST_SANDBOX\MyBar.aj:16:
     MyAnnotation.java  [java source file] TEST_SANDBOX\MyAnnotation.java:1:
-      import declarations  [import reference] 
+      bar  [package declaration] TEST_SANDBOX\MyAnnotation.java:1:
+        [import reference] 
       MyAnnotation  [annotation] TEST_SANDBOX\MyAnnotation.java:3:
     NewClass.java  [java source file] TEST_SANDBOX\NewClass.java:1:
-      import declarations  [import reference] 
+      bar  [package declaration] TEST_SANDBOX\NewClass.java:1:
+        [import reference] 
       NewClass  [class] TEST_SANDBOX\NewClass.java:3:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
+(targets=1) <bar*MyBar.aj}MyBar`declare \@type!3 (annotates) {MyFoo.java
 (targets=1) <bar*MyBar.aj}MyBar`declare parents!2 (declared on) {MyFoo.java
 (targets=1) {MyFoo.java (annotated by) <bar*MyBar.aj}MyBar`declare \@type!3
 (targets=1) {MyFoo.java (aspect declarations) <bar*MyBar.aj}MyBar`declare parents!2
-(targets=1) <bar*MyBar.aj}MyBar`declare \@type!3 (annotates) {MyFoo.java
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 import reference=4
@@ -37,6 +40,7 @@ advice=1
 annotation=1
 class=1
 RelationshipMapSize=3
+package declaration=3
 FileMapSize=3
 package=1
 declare @field=1

diff --git a/tests/model/expected/pr143924.txt b/tests/model/expected/pr143924.txt
index 1253cc64b520eab54d06ff6c7c6526342cdc0db5..f37143d708e8b27d0ad16de9a64c08928d6853d6 100644 (file)
--- a/tests/model/expected/pr143924.txt
+++ b/tests/model/expected/pr143924.txt
@@ -2,7 +2,7 @@
 <root>  [java source file] 
     [package] 
     pr143924.aj  [java source file] TEST_SANDBOX\pr143924.aj:1:
-      import declarations  [import reference] 
+        [import reference] 
       DeclareAnnotation  [aspect] TEST_SANDBOX\pr143924.aj:1:
         declare @method: * debit(..) : @Secured(role = "supervisor")  [declare @method] TEST_SANDBOX\pr143924.aj:2:
       BankAccount  [class] TEST_SANDBOX\pr143924.aj:5:
@@ -10,8 +10,8 @@
       Secured  [annotation] TEST_SANDBOX\pr143924.aj:11:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) <*pr143924.aj}DeclareAnnotation`declare \@method (annotates) <*pr143924.aj[BankAccount~debit~QString;~J
 (targets=1) <*pr143924.aj[BankAccount~debit~QString;~J (annotated by) <*pr143924.aj}DeclareAnnotation`declare \@method
+(targets=1) <*pr143924.aj}DeclareAnnotation`declare \@method (annotates) <*pr143924.aj[BankAccount~debit~QString;~J
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=1

diff --git a/tests/model/expected/pr145963_1.txt b/tests/model/expected/pr145963_1.txt
index a0bfee87807163ed4683599e071e57921fdc30b3..f8f81d2bb5b046c1270e3cfffd524eb0b3b208e0 100644 (file)
--- a/tests/model/expected/pr145963_1.txt
+++ b/tests/model/expected/pr145963_1.txt
@@ -2,14 +2,16 @@
 <root>  [java source file] 
   pkg  [package] 
     SourceAspect.aj  [java source file] TEST_SANDBOX\SourceAspect.aj:1:
-      import declarations  [import reference] 
+      pkg  [package declaration] TEST_SANDBOX\SourceAspect.aj:1:
+        [import reference] 
       SourceAspect  [aspect] TEST_SANDBOX\SourceAspect.aj:3:
         declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\SourceAspect.aj:5:
         p()  [pointcut] TEST_SANDBOX\SourceAspect.aj:7:
         before(): p..  [advice] TEST_SANDBOX\SourceAspect.aj:9:
   pack  [package] 
     C.java  [java source file] TEST_SANDBOX\C.java:1:
-      import declarations  [import reference] 
+      pack  [package declaration] TEST_SANDBOX\C.java:1:
+        [import reference] 
       C  [class] TEST_SANDBOX\C.java:3:
         method1()  [method] TEST_SANDBOX\C.java:5:
           field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6:
@@ -43,6 +45,7 @@ class=1
 advice=2
 pointcut=2
 RelationshipMapSize=6
+package declaration=2
 source folder=1
 FileMapSize=2
 package=3

diff --git a/tests/model/expected/pr145963_2.txt b/tests/model/expected/pr145963_2.txt
index ea19d26231595a01e2ae98153e258fbf1d91c380..84f017ba4a0c33d694dfdfed9a5487ee22c1a9b6 100644 (file)
--- a/tests/model/expected/pr145963_2.txt
+++ b/tests/model/expected/pr145963_2.txt
@@ -2,14 +2,16 @@
 <root>  [java source file] 
   pkg  [package] 
     SourceAspect.aj  [java source file] TEST_SANDBOX\SourceAspect.aj:1:
-      import declarations  [import reference] 
+      pkg  [package declaration] TEST_SANDBOX\SourceAspect.aj:1:
+        [import reference] 
       SourceAspect  [aspect] TEST_SANDBOX\SourceAspect.aj:3:
         declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\SourceAspect.aj:5:
         p()  [pointcut] TEST_SANDBOX\SourceAspect.aj:7:
         before(): p..  [advice] TEST_SANDBOX\SourceAspect.aj:9:
   pack  [package] 
     C.java  [java source file] TEST_SANDBOX\C.java:1:
-      import declarations  [import reference] 
+      pack  [package declaration] TEST_SANDBOX\C.java:1:
+        [import reference] 
       C  [class] TEST_SANDBOX\C.java:3:
         method1()  [method] TEST_SANDBOX\C.java:5:
           field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6:
@@ -43,6 +45,7 @@ class=1
 advice=2
 pointcut=2
 RelationshipMapSize=6
+package declaration=2
 source folder=1
 FileMapSize=2
 package=3

diff --git a/tests/model/expected/pr145963_3.txt b/tests/model/expected/pr145963_3.txt
index f7dc1dd8fdd99a610210d31f4fa87fae43bb7fc0..73bdb3f28bc31a46412c67e120053205e5b99808 100644 (file)
--- a/tests/model/expected/pr145963_3.txt
+++ b/tests/model/expected/pr145963_3.txt
@@ -2,7 +2,7 @@
 <root>  [java source file] 
     [package] 
     C.java  [java source file] TEST_SANDBOX\C.java:1:
-      import declarations  [import reference] 
+        [import reference] 
       C  [class] TEST_SANDBOX\C.java:3:
         method1()  [method] TEST_SANDBOX\C.java:5:
           field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6:

diff --git a/tests/model/expected/pr145963_4.txt b/tests/model/expected/pr145963_4.txt
index 178bcecdd3fcf3071c67196f70bc4d826ecdfa99..d03053acd48e61b54d9be586fe49bcf631941a35 100644 (file)
--- a/tests/model/expected/pr145963_4.txt
+++ b/tests/model/expected/pr145963_4.txt
@@ -2,7 +2,8 @@
 <root>  [java source file] 
   pack  [package] 
     C.java  [java source file] TEST_SANDBOX\C.java:1:
-      import declarations  [import reference] 
+      pack  [package declaration] TEST_SANDBOX\C.java:1:
+        [import reference] 
       C  [class] TEST_SANDBOX\C.java:3:
         method1()  [method] TEST_SANDBOX\C.java:5:
           field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6:
@@ -26,6 +27,7 @@ declare warning=1
 file=1
 class=1
 RelationshipMapSize=2
+package declaration=1
 source folder=1
 FileMapSize=1
 package=2

diff --git a/tests/model/expected/pr160469_1.txt b/tests/model/expected/pr160469_1.txt
index 67fc2d6b9c2363683c76a697a918a155ef50f58b..75011b37356098de08632ccbfbc6a689faed575a 100644 (file)
--- a/tests/model/expected/pr160469_1.txt
+++ b/tests/model/expected/pr160469_1.txt
@@ -2,7 +2,8 @@
 <root>  [java source file] 
   test  [package] 
     Simple.java  [java source file] TEST_SANDBOX\Simple.java:1:
-      import declarations  [import reference] 
+      test  [package declaration] TEST_SANDBOX\Simple.java:1:
+        [import reference] 
       Simple  [class] TEST_SANDBOX\Simple.java:3:
         Simple()  [constructor] TEST_SANDBOX\Simple.java:5:
   binaries  [source folder] 
@@ -29,6 +30,7 @@ class=1
 advice=2
 pointcut=1
 RelationshipMapSize=3
+package declaration=1
 source folder=1
 FileMapSize=1
 package=2

diff --git a/tests/model/expected/pr160469_2.txt b/tests/model/expected/pr160469_2.txt
index d32d6a1dfa6d3775dde16a3c3eeb93ac2fe3b50c..957aeab333ef7a147f9a871a333dbb5ca31567b3 100644 (file)
--- a/tests/model/expected/pr160469_2.txt
+++ b/tests/model/expected/pr160469_2.txt
@@ -2,7 +2,8 @@
 <root>  [java source file] 
   test  [package] 
     Simple.java  [java source file] TEST_SANDBOX\Simple.java:1:
-      import declarations  [import reference] 
+      test  [package declaration] TEST_SANDBOX\Simple.java:1:
+        [import reference] 
       Simple  [class] TEST_SANDBOX\Simple.java:3:
         Simple()  [constructor] TEST_SANDBOX\Simple.java:5:
   binaries  [source folder] 
@@ -26,6 +27,7 @@ file=1
 class=1
 pointcut=1
 RelationshipMapSize=2
+package declaration=1
 source folder=1
 FileMapSize=1
 package=2

diff --git a/tests/model/expected/pr77269_1.txt b/tests/model/expected/pr77269_1.txt
index bdd591ea8055a46032b4e7d7e8ffacfa979a5891..0e15585af94bfa9867b57a955d2f6ebb5e24bae2 100644 (file)
--- a/tests/model/expected/pr77269_1.txt
+++ b/tests/model/expected/pr77269_1.txt
@@ -2,7 +2,8 @@
 <root>  [java source file] 
   pack  [package] 
     pr77269.aj  [java source file] TEST_SANDBOX\pack\pr77269.aj:1:
-      import declarations  [import reference] 
+      pack  [package declaration] TEST_SANDBOX\pack\pr77269.aj:1:
+        [import reference] 
       Test  [class] TEST_SANDBOX\pack\pr77269.aj:2:
         testMethod()  [method] TEST_SANDBOX\pack\pr77269.aj:4:
           new Runnable() {..}  [class] TEST_SANDBOX\pack\pr77269.aj:5:
@@ -25,6 +26,7 @@ class=3
 advice=1
 pointcut=1
 RelationshipMapSize=2
+package declaration=1
 FileMapSize=1
 package=1
 java source file=2

diff --git a/tests/model/expected/pr77269_2.txt b/tests/model/expected/pr77269_2.txt
index cd750034c9cd36e7c33ef9709b569f00c3b7c098..1a9459f5b8d3fcbaf3d5b7273dd7997c89b61863 100644 (file)
--- a/tests/model/expected/pr77269_2.txt
+++ b/tests/model/expected/pr77269_2.txt
@@ -2,7 +2,7 @@
 <root>  [java source file] 
     [package] 
     pr77269b.aj  [java source file] TEST_SANDBOX\pr77269b.aj:1:
-      import declarations  [import reference] 
+        [import reference] 
       Test  [class] TEST_SANDBOX\pr77269b.aj:1:
         testMethod()  [method] TEST_SANDBOX\pr77269b.aj:3:
           new Runnable() {..}  [class] TEST_SANDBOX\pr77269b.aj:4:

diff --git a/tests/model/expected/pr77269_3.txt b/tests/model/expected/pr77269_3.txt
index 48fae6a5f051823c9c0fc33d3071ab0fce3bc298..bac930da325cc12b0baf1be276d55a4e36d82dc7 100644 (file)
--- a/tests/model/expected/pr77269_3.txt
+++ b/tests/model/expected/pr77269_3.txt
@@ -2,7 +2,8 @@
 <root>  [java source file] 
   pack  [package] 
     pr77269c.aj  [java source file] TEST_SANDBOX\pack\pr77269c.aj:1:
-      import declarations  [import reference] 
+      pack  [package declaration] TEST_SANDBOX\pack\pr77269c.aj:1:
+        [import reference] 
       Test  [class] TEST_SANDBOX\pack\pr77269c.aj:3:
         testMethod()  [method] TEST_SANDBOX\pack\pr77269c.aj:5:
           new Runnable() {..}  [class] TEST_SANDBOX\pack\pr77269c.aj:6:
@@ -24,6 +25,7 @@ code=1
 declare warning=1
 class=2
 RelationshipMapSize=2
+package declaration=1
 FileMapSize=1
 package=1
 java source file=2