* Update testsuite output

For issue #75
OpenAADL · Jan 10, 2017 · 90b44b1 · 90b44b1
1 parent a51895d
commit 90b44b1
Show file tree

Hide file tree

Showing 38 changed files with 408 additions and 908 deletions.
diff --git a/examples/real/security/all.aadl.out b/examples/real/security/all.aadl.out
diff --git a/resources/AADLv2/errorlibrary.aadl b/resources/AADLv2/errorlibrary.aadl
@@ -1,10 +1,6 @@
 package ErrorLibrary
 public
 
-data dummy
-  -- FIXME: Workaround to allow pretty printing this package
-end dummy;
-
 annex EMV2 {**
 error types
 CommonErrors: type set { ServiceError, TimingRelatedError, ValueRelatedError, ReplicationError,

diff --git a/tests/SAE-behaviour_annex-04202009/ba_example_001.aadl.out b/tests/SAE-behaviour_annex-04202009/ba_example_001.aadl.out
@@ -1,42 +1,3 @@
-
-
-
-
-
-
-
-
-package Test
-public
-  data number
-  end number;
-
-  subprogram mul
-  features
-    x : in parameter number;
-    y : in parameter number;
-    z : out parameter number;
-
-  end mul;
-
-  subprogram cube
-  features
-    x : in parameter number;
-    y : out parameter number;
-    mul : requires subprogram access mul;
-
-    annex behavior_specification {**
-    variables
-      tmp;
-    states
-      s : initial final state;
-    transitions      
-      t : s -[]-> s {
-         mul!(x, x, tmp);
-         mul!(tmp, x, y)
-        };
-    **};
-  end cube;
-
-end Test;
-
+Frontends : error : ba_example_001.aadl:25:11: parsing Behavior_Variable, token ':' is expected, found token ';'
+Frontends : error : ba_example_001.aadl:25:11: parsing Behavior_Variable, the list parsed is empty
+Frontends : fatal error : ba_example_001.aadl:28:07: parsing Behavior_Specification, failed
diff --git a/tests/SAE-behaviour_annex-04202009/ba_example_002.aadl.out b/tests/SAE-behaviour_annex-04202009/ba_example_002.aadl.out
@@ -1,200 +1,2 @@
-
-
-
-
-
-
-
-
-package Test
-public
-  with Base_types;
-
-  thread speed
-  features
-    tick : in event port
-      {Dequeue_Protocol => AllItems;};
-    sp : out data port Base_types::integer;
-
-  properties
-    Dispatch_Protocol => periodic;
-    Period => 1000 Ms;
-
-  end speed;
-
-  thread implementation speed.i
-    annex behavior_specification {**
-    states
-      s0 : initial complete state;
-    transitions      
-      s0 -[]-> s0 {
-        sp := tick'count
-        };
-    **};
-  end speed.i;
-
-end Test;
-
-package Base_Types
-public
-  with data_model;
-
-  data Boolean
-  properties
-    Data_Model::Data_Representation => Boolean;
-
-  end Boolean;
-
-  data Integer
-  properties
-    Data_Model::Data_Representation => Integer;
-
-  end Integer;
-
-  data Integer_8 extends Integer
-  properties
-    Data_Model::Number_Representation => Signed;
-    Source_Data_Size => 1 Bytes;
-
-  end Integer_8;
-
-  data Integer_16 extends Integer
-  properties
-    Data_Model::Number_Representation => Signed;
-    Source_Data_Size => 2 Bytes;
-
-  end Integer_16;
-
-  data Integer_32 extends Integer
-  properties
-    Data_Model::Number_Representation => Signed;
-    Source_Data_Size => 4 Bytes;
-
-  end Integer_32;
-
-  data Integer_64 extends Integer
-  properties
-    Data_Model::Number_Representation => Signed;
-    Source_Data_Size => 8 Bytes;
-
-  end Integer_64;
-
-  data Unsigned_8 extends Integer
-  properties
-    Data_Model::Number_Representation => Unsigned;
-    Source_Data_Size => 1 Bytes;
-
-  end Unsigned_8;
-
-  data Unsigned_16 extends Integer
-  properties
-    Data_Model::Number_Representation => Unsigned;
-    Source_Data_Size => 2 Bytes;
-
-  end Unsigned_16;
-
-  data Unsigned_32 extends Integer
-  properties
-    Data_Model::Number_Representation => Unsigned;
-    Source_Data_Size => 4 Bytes;
-
-  end Unsigned_32;
-
-  data Unsigned_64 extends Integer
-  properties
-    Data_Model::Number_Representation => Unsigned;
-    Source_Data_Size => 8 Bytes;
-
-  end Unsigned_64;
-
-  data Natural extends Integer
-  properties
-    Data_Model::Integer_Range => 0 .. Max_Target_Integer;
-
-  end Natural;
-
-  data Float
-  properties
-    Data_Model::Data_Representation => Float;
-
-  end Float;
-
-  data Float_32 extends Float
-  properties
-    Data_Model::IEEE754_Precision => Simple;
-    Source_Data_Size => 4 Bytes;
-
-  end Float_32;
-
-  data Float_64 extends Float
-  properties
-    Data_Model::IEEE754_Precision => Double;
-    Source_Data_Size => 8 Bytes;
-
-  end Float_64;
-
-  data Character
-  properties
-    Data_Model::Data_Representation => Character;
-
-  end Character;
-
-  data String
-  properties
-    Data_Model::Data_Representation => String;
-
-  end String;
-
-end Base_Types;
-
-property set Data_Model is
-  Base_Type : list of classifier (
-data)
-    applies to (data);
-
-  Code_Set : aadlinteger
-    applies to (data);
-
-  Data_Digits : aadlinteger
-    applies to (data);
-
-  Data_Scale : aadlinteger
-    applies to (data);
-
-  Data_Representation : enumeration (Array, Boolean, Character, Enum, Float, Fixed, Integer, String, Struct, Union)
-    applies to (data);
-
-  Dimension : list of aadlinteger
-    applies to (data);
-
-  Indefinite_Dimension : constant aadlinteger => -1;
-  Infinite_Dimension : constant aadlinteger => -2;
-  Element_Names : list of aadlstring
-    applies to (data);
-
-  Enumerators : list of aadlstring
-    applies to (data);
-
-  IEEE754_Precision : enumeration (Simple, Double)
-    applies to (data);
-
-  Initial_Value : list of aadlstring
-    applies to (data, port, parameter);
-
-  Integer_Range : range of aadlinteger
-    applies to (data, port, parameter);
-
-  Measurement_Unit : aadlstring
-    applies to (data, port, parameter);
-
-  Number_Representation : enumeration (Signed, Unsigned)
-    applies to (data);
-
-  Real_Range : range of aadlreal
-    applies to (data, port, parameter);
-
-  Representation : list of aadlstring
-    applies to (data);
-
-end Data_Model;
-
+ba_example_002.aadl:20:05: speed.i ( Thread ) must define one or more final states.
+Cannot analyze BEHAVIOR_SPECIFICATION specifications