* Update reference output, new test for annex at package level

git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/ocarina@5022 129961e7-ef38-4bb5-a8f7-c9a525a55882

tests/MANIFEST

@@ -253,6 +253,7 @@ tests/real_units/validation.aadl
 tests/real_requires/test.aadl
 tests/ticket_46/test.aadl
 tests/ticket_48/test.aadl
+tests/package_annex/test.aadl
 
 # Pre-declared property sets AADL_v1
 resources/AADLv1

tests/package_annex/MANIFEST

+AADL_VERSION=-aadlv2

tests/package_annex/test.aadl

+package Test
+public
+
+system A
+end A;
+
+system implementation A.impl
+end A.impl;
+
+annex real_specification {**
+	theorem test_theorem
+	foreach s in system_set do
+		check(1=1);
+	end test_theorem;
+**};
+
+end Test;
\ No newline at end of file

tests/package_annex/test.aadl.out

+
+
+
+
+
+
+
+
+package Test
+public
+  system A
+  end A;
+
+  system implementation A.impl
+  end A.impl;
+
+    annex real_specification {**
+
+--  test_theorem
+
+theorem test_theorem
+foreach s in system_set do
+
+check ((1 = 1));
+end test_theorem;
+
+
+    **};
+end Test;
+

tests/real-annexes-execution/test_real_exec_02.aadl.out

@@ -151,22 +151,22 @@ Evaluating theorem set_declaration_is_passing_through
 
  * Iterate for variable: rma.erc32_node_a_task_1
 Content of set accessor_flows (test_real_exec_02.aadl:251:21) is 
-anonymous end to end flow :3700 end to end flow spec 
+anonymous end to end flow :3702 end to end flow spec 
  => Result: TRUE
 
  * Iterate for variable: rma.erc32_node_a_task_2
 Content of set accessor_flows (test_real_exec_02.aadl:251:21) is 
-anonymous end to end flow :3700 end to end flow spec 
+anonymous end to end flow :3702 end to end flow spec 
  => Result: TRUE
 
  * Iterate for variable: rma.erc32_node_a_task_12
 Content of set accessor_flows (test_real_exec_02.aadl:251:21) is 
-anonymous end to end flow :3701 end to end flow spec 
+anonymous end to end flow :3703 end to end flow spec 
  => Result: TRUE
 
  * Iterate for variable: rma.erc32_node_a_task_22
 Content of set accessor_flows (test_real_exec_02.aadl:251:21) is 
-anonymous end to end flow :3701 end to end flow spec 
+anonymous end to end flow :3703 end to end flow spec 
  => Result: TRUE
 
 theorem set_declaration_is_passing_through is: TRUE

tests/test_tree_p/test.aadl.out

@@ -8265,10 +8265,10 @@ Declarations List_Id 7
  Default_Instance Node_Id 0
  Properties List_Id 0
  Parent Node_Id 0
+ Annexes List_Id 0
  Category Byte 13
  Features List_Id 0
  Flows List_Id 0
- Annexes List_Id 0
  Instances List_Id 0
  Modes List_Id 0
  Prototypes List_Id 0
@@ -8288,9 +8288,9 @@ Declarations List_Id 7
  Default_Instance Node_Id 0
  Properties List_Id 0
  Parent Node_Id 0
+ Annexes List_Id 0
  Category Byte 13
  Flows List_Id 0
- Annexes List_Id 0
  Instances List_Id 0
  Modes List_Id 0
  Prototypes List_Id 0