import declarations gone from faulted in binaries (265693)

6 files changed, 18 insertions, 24 deletions

diff --git a/tests/model/expected/pr145963_1.txt b/tests/model/expected/pr145963_1.txt
index f8f81d2bb..b0a9bf9b7 100644
--- a/tests/model/expected/pr145963_1.txt
+++ b/tests/model/expected/pr145963_1.txt
@@ -18,25 +18,24 @@
   binaries  [source folder] 
     pkg  [package] 
       BinaryAspect.class  [file] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:1:
-        import declarations  [import reference] 
         BinaryAspect  [aspect] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:1:
           p()  [pointcut] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:7:
           before(): p..  [advice] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:9:
           declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:5:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=2) <pack{C.java[C~method1 (advised by) <pkg*SourceAspect.aj}SourceAspect&before
-(targets=2) <pack{C.java[C~method1 (advised by) /binaries<pkg(BinaryAspect.class}BinaryAspect&before
-(targets=1) <pkg*SourceAspect.aj}SourceAspect`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
-(targets=1) <pkg*SourceAspect.aj}SourceAspect&before (advises) <pack{C.java[C~method1
 (targets=2) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) <pkg*SourceAspect.aj}SourceAspect`declare warning
 (targets=2) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) /binaries<pkg(BinaryAspect.class}BinaryAspect`declare warning
-(targets=1) /binaries<pkg(BinaryAspect.class}BinaryAspect&before (advises) <pack{C.java[C~method1
+(targets=1) <pkg*SourceAspect.aj}SourceAspect`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
 (targets=1) /binaries<pkg(BinaryAspect.class}BinaryAspect`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
+(targets=1) /binaries<pkg(BinaryAspect.class}BinaryAspect&before (advises) <pack{C.java[C~method1
+(targets=2) <pack{C.java[C~method1 (advised by) <pkg*SourceAspect.aj}SourceAspect&before
+(targets=2) <pack{C.java[C~method1 (advised by) /binaries<pkg(BinaryAspect.class}BinaryAspect&before
+(targets=1) <pkg*SourceAspect.aj}SourceAspect&before (advises) <pack{C.java[C~method1
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=1
-import reference=3
+import reference=2
 aspect=2
 code=1
 declare warning=2
diff --git a/tests/model/expected/pr145963_2.txt b/tests/model/expected/pr145963_2.txt
index 84f017ba4..e31faf8f5 100644
--- a/tests/model/expected/pr145963_2.txt
+++ b/tests/model/expected/pr145963_2.txt
@@ -18,25 +18,24 @@
   binaries  [source folder] 
     pkg  [package] 
       BinaryAspect.class  [file] TEST_SANDBOX!pkg\BinaryAspect.class:1:
-        import declarations  [import reference] 
         BinaryAspect  [aspect] TEST_SANDBOX!pkg\BinaryAspect.class:1:
           p()  [pointcut] TEST_SANDBOX!pkg\BinaryAspect.class:7:
           before(): p..  [advice] TEST_SANDBOX!pkg\BinaryAspect.class:9:
           declare warning: "There should be n.."  [declare warning] TEST_SANDBOX!pkg\BinaryAspect.class:5:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=2) <pack{C.java[C~method1 (advised by) <pkg*SourceAspect.aj}SourceAspect&before
-(targets=2) <pack{C.java[C~method1 (advised by) /binaries<pkg(BinaryAspect.class}BinaryAspect&before
-(targets=1) <pkg*SourceAspect.aj}SourceAspect`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
-(targets=1) <pkg*SourceAspect.aj}SourceAspect&before (advises) <pack{C.java[C~method1
 (targets=2) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) <pkg*SourceAspect.aj}SourceAspect`declare warning
 (targets=2) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) /binaries<pkg(BinaryAspect.class}BinaryAspect`declare warning
-(targets=1) /binaries<pkg(BinaryAspect.class}BinaryAspect&before (advises) <pack{C.java[C~method1
+(targets=1) <pkg*SourceAspect.aj}SourceAspect`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
 (targets=1) /binaries<pkg(BinaryAspect.class}BinaryAspect`declare warning (matched by) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
+(targets=1) /binaries<pkg(BinaryAspect.class}BinaryAspect&before (advises) <pack{C.java[C~method1
+(targets=2) <pack{C.java[C~method1 (advised by) <pkg*SourceAspect.aj}SourceAspect&before
+(targets=2) <pack{C.java[C~method1 (advised by) /binaries<pkg(BinaryAspect.class}BinaryAspect&before
+(targets=1) <pkg*SourceAspect.aj}SourceAspect&before (advises) <pack{C.java[C~method1
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=1
-import reference=3
+import reference=2
 aspect=2
 code=1
 declare warning=2
diff --git a/tests/model/expected/pr145963_3.txt b/tests/model/expected/pr145963_3.txt
index 73bdb3f28..38b2bf8c9 100644
--- a/tests/model/expected/pr145963_3.txt
+++ b/tests/model/expected/pr145963_3.txt
@@ -9,17 +9,16 @@
   binaries  [source folder] 
       [package] 
       AspectInDefaultPackage.class  [file] TEST_SANDBOX\simple.jar!\AspectInDefaultPackage.class:1:
-        import declarations  [import reference] 
         AspectInDefaultPackage  [aspect] TEST_SANDBOX\simple.jar!\AspectInDefaultPackage.class:1:
           declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!\AspectInDefaultPackage.class:4:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) /binaries<(AspectInDefaultPackage.class}AspectInDefaultPackage`declare warning (matched by) <{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
 (targets=1) <{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) /binaries<(AspectInDefaultPackage.class}AspectInDefaultPackage`declare warning
+(targets=1) /binaries<(AspectInDefaultPackage.class}AspectInDefaultPackage`declare warning (matched by) <{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out)
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=1
-import reference=2
+import reference=1
 aspect=1
 code=1
 declare warning=1
diff --git a/tests/model/expected/pr145963_4.txt b/tests/model/expected/pr145963_4.txt
index d03053acd..b35d9e62b 100644
--- a/tests/model/expected/pr145963_4.txt
+++ b/tests/model/expected/pr145963_4.txt
@@ -10,7 +10,6 @@
   binaries  [source folder] 
       [package] 
       A.class  [file] TEST_SANDBOX\simple.jar!\A.class:1:
-        import declarations  [import reference] 
         A  [aspect] TEST_SANDBOX\simple.jar!\A.class:1:
           declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!\A.class:4:
 === END OF MODEL REPORT =========
@@ -20,7 +19,7 @@
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=1
-import reference=2
+import reference=1
 aspect=1
 code=1
 declare warning=1
diff --git a/tests/model/expected/pr160469_1.txt b/tests/model/expected/pr160469_1.txt
index 75011b373..678f94adf 100644
--- a/tests/model/expected/pr160469_1.txt
+++ b/tests/model/expected/pr160469_1.txt
@@ -9,7 +9,6 @@
   binaries  [source folder] 
     pkg  [package] 
       AbstractBeanConfigurerAspect.class  [file] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
-        import declarations  [import reference] 
         AbstractBeanConfigurerAspect  [aspect] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
           beanCreation()  [pointcut] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
           afterReturning(): beanCreation..  [advice] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:6:
@@ -17,12 +16,12 @@
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
 (targets=1) /binaries<pkg(AbstractBeanConfigurerAspect.class}AbstractBeanConfigurerAspect&before (advises) <test{Simple.java[Simple~Simple
-(targets=1) /binaries<pkg(AbstractBeanConfigurerAspect.class}AbstractBeanConfigurerAspect&afterReturning (advises) <test{Simple.java[Simple~Simple
 (targets=2) <test{Simple.java[Simple~Simple (advised by) /binaries<pkg(AbstractBeanConfigurerAspect.class}AbstractBeanConfigurerAspect&afterReturning
 (targets=2) <test{Simple.java[Simple~Simple (advised by) /binaries<pkg(AbstractBeanConfigurerAspect.class}AbstractBeanConfigurerAspect&before
+(targets=1) /binaries<pkg(AbstractBeanConfigurerAspect.class}AbstractBeanConfigurerAspect&afterReturning (advises) <test{Simple.java[Simple~Simple
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
-import reference=2
+import reference=1
 aspect=1
 constructor=1
 file=1
diff --git a/tests/model/expected/pr160469_2.txt b/tests/model/expected/pr160469_2.txt
index 957aeab33..2705bd22d 100644
--- a/tests/model/expected/pr160469_2.txt
+++ b/tests/model/expected/pr160469_2.txt
@@ -9,7 +9,6 @@
   binaries  [source folder] 
     pkg  [package] 
       AbstractBeanConfigurerAspect.class  [file] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
-        import declarations  [import reference] 
         AbstractBeanConfigurerAspect  [aspect] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
           beanCreation()  [pointcut] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:1:
           declare warning: "warning"  [declare warning] TEST_SANDBOX\aspects.jar!pkg\AbstractBeanConfigurerAspect.class:7:
@@ -19,7 +18,7 @@
 (targets=1) <test{Simple.java[Simple~Simple (matches declare) /binaries<pkg(AbstractBeanConfigurerAspect.class}AbstractBeanConfigurerAspect`declare warning
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
-import reference=2
+import reference=1
 aspect=1
 declare warning=1
 constructor=1