Natools

Check-in [674fc9e953]
Login
Overview
Comment:s_expressions-templates-tests-integers: test the new explicit images from templates
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 674fc9e9531db8b12c9e4ec075c2678be8f3c94a
User & Date: nat on 2014-09-24 18:55:44
Other Links: manifest | tags
Context
2014-09-25
21:29
s_expressions-templates-generic_integers: use ranges instead of discrete values for image maps check-in: c0da1058a5 user: nat tags: trunk
2014-09-24
18:55
s_expressions-templates-tests-integers: test the new explicit images from templates check-in: 674fc9e953 user: nat tags: trunk
2014-09-23
18:35
Add generated packages updates missing from previous commit check-in: 160210cf8d user: nat tags: trunk
Changes

Modified tests/natools-s_expressions-templates-tests-integers.adb from [4fcbf5aa87] to [ce1e623a4b].

81
82
83
84
85
86
87

88
89
90
91
92
93
94
   -- Complete Test Suite --
   -------------------------

   procedure All_Tests (Report : in out NT.Reporter'Class) is
   begin
      Alignment (Report);
      Default_Format (Report);

      Explicit_Sign (Report);
      Hexadecimal (Report);
      Overflow (Report);
      Parse_Errors (Report);
      Static_Hash_Map (Report);
      Explicit_Default_Format (Report);
   end All_Tests;







>







81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
   -- Complete Test Suite --
   -------------------------

   procedure All_Tests (Report : in out NT.Reporter'Class) is
   begin
      Alignment (Report);
      Default_Format (Report);
      Explicit_Images (Report);
      Explicit_Sign (Report);
      Hexadecimal (Report);
      Overflow (Report);
      Parse_Errors (Report);
      Static_Hash_Map (Report);
      Explicit_Default_Format (Report);
   end All_Tests;
142
143
144
145
146
147
148

















149
150
151
152
153
154
155
         Test_Render (Test, Default, "", 12, "12");
         Test_Render (Test, Default, "(padding 1: )", 7, " 7");
      end;
   exception
      when Error : others => Test.Report_Exception (Error);
   end Explicit_Default_Format;



















   procedure Explicit_Sign (Report : in out NT.Reporter'Class) is
      Test : NT.Test := Report.Item ("Explicit sign specification");
   begin
      Test_Render (Test, "(sign +)", 42, "+42");
      Test_Render (Test, "(sign + _)", 42, "+42");
      Test_Render (Test, "(sign + _)", -42, "_42");







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
         Test_Render (Test, Default, "", 12, "12");
         Test_Render (Test, Default, "(padding 1: )", 7, " 7");
      end;
   exception
      when Error : others => Test.Report_Exception (Error);
   end Explicit_Default_Format;


   procedure Explicit_Images (Report : in out NT.Reporter'Class) is
      Test : NT.Test := Report.Item ("Explicit images in template");
   begin
      Test_Render (Test, "(image (-2 two) (666 evil))", 10, "10");
      Test_Render (Test, "(image (-2 two) (666 evil))", -2, "two");
      Test_Render (Test, "(image (-2 two) (666 evil))", 666, "evil");
      Test_Render (Test, "(image (-2 two) (666 evil) (-2))", -2, "-2");
      Test_Render (Test, "(image (1 one))3:Two4:four", 1, "one");
      Test_Render (Test, "(image (1 one))3:Two4:four", 2, "Two");
      Test_Render (Test, "(image (1 one))3:Two4:four", 3, "four");
      Test_Render (Test, "(image (1 one))3:Two4:four", 4, "4");
      Test_Render (Test, "(image (invalid -))5:first", Integer'First, "first");
   exception
      when Error : others => Test.Report_Exception (Error);
   end Explicit_Images;


   procedure Explicit_Sign (Report : in out NT.Reporter'Class) is
      Test : NT.Test := Report.Item ("Explicit sign specification");
   begin
      Test_Render (Test, "(sign +)", 42, "+42");
      Test_Render (Test, "(sign + _)", 42, "+42");
      Test_Render (Test, "(sign + _)", -42, "_42");

Modified tests/natools-s_expressions-templates-tests-integers.ads from [1757b59b20] to [36b481a7a8].

23
24
25
26
27
28
29

30
31
32
33
34
35
36
   pragma Preelaborate;

   procedure All_Tests (Report : in out NT.Reporter'Class);

   procedure Alignment (Report : in out NT.Reporter'Class);
   procedure Default_Format (Report : in out NT.Reporter'Class);
   procedure Explicit_Default_Format (Report : in out NT.Reporter'Class);

   procedure Explicit_Sign (Report : in out NT.Reporter'Class);
   procedure Hexadecimal (Report : in out NT.Reporter'Class);
   procedure Overflow (Report : in out NT.Reporter'Class);
   procedure Parse_Errors (Report : in out NT.Reporter'Class);
   procedure Static_Hash_Map (Report : in out NT.Reporter'Class);

end Natools.S_Expressions.Templates.Tests.Integers;







>







23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
   pragma Preelaborate;

   procedure All_Tests (Report : in out NT.Reporter'Class);

   procedure Alignment (Report : in out NT.Reporter'Class);
   procedure Default_Format (Report : in out NT.Reporter'Class);
   procedure Explicit_Default_Format (Report : in out NT.Reporter'Class);
   procedure Explicit_Images (Report : in out NT.Reporter'Class);
   procedure Explicit_Sign (Report : in out NT.Reporter'Class);
   procedure Hexadecimal (Report : in out NT.Reporter'Class);
   procedure Overflow (Report : in out NT.Reporter'Class);
   procedure Parse_Errors (Report : in out NT.Reporter'Class);
   procedure Static_Hash_Map (Report : in out NT.Reporter'Class);

end Natools.S_Expressions.Templates.Tests.Integers;