278255

diff --git a/tests/model/expected/pr132130.txt b/tests/model/expected/pr132130.txt
index e4b7e0968b5ac35362cbcdcb9d1c121dcd6f2a6c..1f1ee3d0fa14307617fe177d8c8388a4d869d82a 100644 (file)
--- a/tests/model/expected/pr132130.txt
+++ b/tests/model/expected/pr132130.txt
@@ -12,10 +12,10 @@
       Secured  [annotation] TEST_SANDBOX\pr132130.aj:15:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) <*pr132130.aj[BankAccount~BankAccount~QString;~I (annotated by) <*pr132130.aj}basic`declare \@constructor!2
-(targets=1) <*pr132130.aj}basic`declare \@method (annotates) <*pr132130.aj[BankAccount~debit~J~J
-(targets=1) <*pr132130.aj}basic`declare \@constructor!2 (annotates) <*pr132130.aj[BankAccount~BankAccount~QString;~I
+(targets=1) <*pr132130.aj}basic`declare \@constructor (annotates) <*pr132130.aj[BankAccount~BankAccount~QString;~I
 (targets=1) <*pr132130.aj[BankAccount~debit~J~J (annotated by) <*pr132130.aj}basic`declare \@method
+(targets=1) <*pr132130.aj}basic`declare \@method (annotates) <*pr132130.aj[BankAccount~debit~J~J
+(targets=1) <*pr132130.aj[BankAccount~BankAccount~QString;~I (annotated by) <*pr132130.aj}basic`declare \@constructor
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=1

diff --git a/tests/model/expected/pr141730_4.txt b/tests/model/expected/pr141730_4.txt
index 805c0fc29b88b573bccd7ae24a99b1cccb53f061..12541bf8df8427e6070d97a19c22d2e540006e03 100644 (file)
--- a/tests/model/expected/pr141730_4.txt
+++ b/tests/model/expected/pr141730_4.txt
@@ -23,9 +23,9 @@
       NewClass  [class] TEST_SANDBOX\NewClass.java:3:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) {MyFoo.java (annotated by) <bar*MyBar.aj}MyBar`declare \@type!3
+(targets=1) {MyFoo.java (annotated by) <bar*MyBar.aj}MyBar`declare \@type
 (targets=1) <bar*MyBar.aj}MyBar`declare parents!2 (declared on) /,<foo(MyFoo.class[MyFoo
-(targets=1) <bar*MyBar.aj}MyBar`declare \@type!3 (annotates) {MyFoo.java
+(targets=1) <bar*MyBar.aj}MyBar`declare \@type (annotates) {MyFoo.java
 (targets=1) /,<foo(MyFoo.class[MyFoo (aspect declarations) <bar*MyBar.aj}MyBar`declare parents!2
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====