Natools

Check-in [6a2a4d94a0]
Login
☰Home Timeline Files Branches Tags Tickets Wiki Login
Overview
Comment:constant_indefinite_ordered_map_tests: add a fully covering test suite for the new "mutation" constructors
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 6a2a4d94a03084fa10365fc1dcb65f60bfa8df1e
User & Date: nat on 2015-03-18 20:25:41
Other Links: manifest | tags
Context
2015-03-19
18:01
s_expressions-special_descriptors: new package that provide empty and erroneous descriptors check-in: df682ad54a user: nat tags: trunk
2015-03-18
20:25
constant_indefinite_ordered_map_tests: add a fully covering test suite for the new "mutation" constructors check-in: 6a2a4d94a0 user: nat tags: trunk
2015-03-17
22:06
constant_indefinite_ordered_maps: add constructors that provide mutation semantics check-in: c0a78f48d7 user: nat tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified tests/natools-constant_indefinite_ordered_map_tests.adb from [dd94feabff] to [4b60e7ede8].

︙
105
106
107
108
109
110
111
112



113
114
115
116
117
118
119

105
106
107
108
109
110
111

112
113
114
115
116
117
118
119
120
121








-
+
+
+








      Empty_Map (Report);
      Iterations (Report);
      Map_Updates (Report);
      Unsafe_Map_Roundtrip (Report);
      Ada_2012_Indexing (Report);
      Ada_2012_Iteration (Report);
      Ada_2012_Errors (Report);
      Range_Iteratiors (Report);
      Range_Iterators (Report);
      Update_Constructors (Report);
      Update_Constructor_Exceptions (Report);
   end All_Tests;



   ----------------------
   -- Individual Tests --
   ----------------------
︙
784
785
786
787
788
789
790
791

792
793
794
795
796
797
798

786
787
788
789
790
791
792

793
794
795
796
797
798
799
800








-
+








         end if;
      end;
   exception
      when Error : others => Test.Report_Exception (Error);
   end Map_Updates;


   procedure Range_Iteratiors (Report : in out NT.Reporter'Class) is
   procedure Range_Iterators (Report : in out NT.Reporter'Class) is
      Test : NT.Test := Report.Item ("Map updates");
   begin
      declare
         Map : constant Test_Maps.Updatable_Map := Sample_Map;
         Expected, Direction : Integer;
         Abort_Loop : Boolean := False;
︙
872
873
874
875
876
877
878
879

880
881
882
883
884
885
886

874
875
876
877
878
879
880

881
882
883
884
885
886
887
888








-
+








            Test_Element (Test_Maps.Element (Position));
            exit when Abort_Loop;
         end loop;
         Test_Element (24);
      end;
   exception
      when Error : others => Test.Report_Exception (Error);
   end Range_Iteratiors;
   end Range_Iterators;


   procedure Unsafe_Map_Roundtrip (Report : in out NT.Reporter'Class) is
      Test : NT.Test := Report.Item ("Constant_Map <-> Unsafe_Map roundtrip");
   begin
      declare
         use type Test_Maps.Unsafe_Maps.Map;
︙
895
896
897
898
899
900
901















































































































































































































































































































































902

897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239








+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


            Test.Info ("Roundtrip: " & Image (Roundtrip));
         end if;
      end;
   exception
      when Error : others => Test.Report_Exception (Error);
   end Unsafe_Map_Roundtrip;


   procedure Update_Constructors (Report : in out NT.Reporter'Class) is
      Test : NT.Test := Report.Item ("""Update"" constructors");

      procedure Check_Map
        (Map : in Test_Maps.Updatable_Map;
         Context : in String;
         Expected_Length : in Ada.Containers.Count_Type;
         Dump : out Boolean);
         --  Base map consistency check

      procedure Check_Map_Not_Value
        (Map : in Test_Maps.Updatable_Map;
         Context : in String;
         Expected_Length : in Ada.Containers.Count_Type;
         Key : in String);
         --  Check consistency and that Key does not exist

      procedure Check_Map_Value
        (Map : in Test_Maps.Updatable_Map;
         Context : in String;
         Expected_Length : in Ada.Containers.Count_Type;
         Key : in String;
         Value : in Integer);
         --  Check consistency and that Key exists and is associated with Value

      procedure Check_Map
        (Map : in Test_Maps.Updatable_Map;
         Context : in String;
         Expected_Length : in Ada.Containers.Count_Type;
         Dump : out Boolean)
      is
         use type Ada.Containers.Count_Type;
         I : Integer;
         Current : Test_Maps.Cursor := Map.First;
         Previous : Test_Maps.Cursor;
      begin
         Dump := False;

         if Map.Length /= Expected_Length then
            Test.Fail (Context & ": found length"
              & Ada.Containers.Count_Type'Image (Map.Length)
              & ", expected:"
              & Ada.Containers.Count_Type'Image (Expected_Length));
            Dump := True;
         end if;

         if not Test_Maps.Has_Element (Current) then
            return;
         end if;

         loop
            begin
               I := Integer'Value (Test_Maps.Key (Current));
            exception
               when Constraint_Error =>
                  Test.Fail (Context & ": Invalid key """
                    & Test_Maps.Key (Current) & '"');
                  Dump := True;
                  exit;
            end;

            if I /= abs Test_Maps.Element (Current) then
               Test.Fail (Context & ": Inconsistent key """
                 & Test_Maps.Key (Current) & """ and value "
                 & Integer'Image (Test_Maps.Element (Current)));
               Dump := True;
            end if;

            Previous := Current;
            Test_Maps.Next (Current);
            exit when not Test_Maps.Has_Element (Current);

            if Test_Maps.Key (Previous) >= Test_Maps.Key (Current) then
               Test.Fail (Context & ": Inconsistent ordering of keys """
                 & Test_Maps.Key (Previous) & """ and """
                 & Test_Maps.Key (Current));
               Dump := True;
            end if;
         end loop;
      end Check_Map;

      procedure Check_Map_Not_Value
        (Map : in Test_Maps.Updatable_Map;
         Context : in String;
         Expected_Length : in Ada.Containers.Count_Type;
         Key : in String)
      is
         Dump : Boolean;
         Position : constant Test_Maps.Cursor := Map.Find (Key);
      begin
         Check_Map (Map, Context, Expected_Length, Dump);

         if Test_Maps.Has_Element (Position) then
            Test.Fail (Context & ": unexpected key """
              & Test_Maps.Key (Position) & """ found with value "
              & Integer'Image (Test_Maps.Element (Position)));
            Dump := True;
         end if;

         if Dump then
            Test.Info (Context & ": Map dump " & Image (Map));
         end if;
      end Check_Map_Not_Value;

      procedure Check_Map_Value
        (Map : in Test_Maps.Updatable_Map;
         Context : in String;
         Expected_Length : in Ada.Containers.Count_Type;
         Key : in String;
         Value : in Integer)
      is
         Dump : Boolean;
         Position : constant Test_Maps.Cursor := Map.Find (Key);
      begin
         Check_Map (Map, Context, Expected_Length, Dump);

         if not Test_Maps.Has_Element (Position) then
            Test.Fail (Context & ": key """ & Key & """ not found");
            Dump := True;
         elsif Test_Maps.Element (Position) /= Value then
            Test.Fail (Context & ": key """ & Key & """ found with value "
              & Integer'Image (Test_Maps.Element (Position))
              & " instead of "
              & Integer'Image (Value));
            Dump := True;
         end if;

         if Dump then
            Test.Info (Context & ": Map dump " & Image (Map));
         end if;
      end Check_Map_Value;
   begin
      declare
         Base : constant Test_Maps.Updatable_Map := Sample_Map;
         Position : Test_Maps.Cursor;
      begin
         Check_Map_Not_Value (Base, "Base", 20, "152");

         Check_Map_Value
           (Test_Maps.Insert (Test_Maps.Empty_Updatable_Map, "1", -1),
            "Insert on empty map", 1,
            "1", -1);
         Check_Map_Value
           (Test_Maps.Insert (Base, "152", 152),
            "Insert", 21,
            "152", 152);
         Check_Map_Value
           (Base.Include ("21 ", 21),
            "Inserting Include", 21,
            "21 ", 21);
         Check_Map_Value
           (Base.Include ("21", -21),
            "Replacing Include", 20,
            "21", -21);
         Check_Map_Value
           (Base.Replace ("28", -28),
            "Replace", 20,
            "28", -28);
         Check_Map_Not_Value
           (Test_Maps.Delete (Base, "11"),
            "Delete", 19, "11");
         Check_Map_Not_Value
           (Test_Maps.Exclude (Base, "27"),
            "Exclude", 19, "27");
         Check_Map_Not_Value
           (Test_Maps.Exclude (Test_Maps.Empty_Updatable_Map, "23"),
            "Empty Exclude", 0, "23");
         Check_Map_Value
           (Test_Maps.Replace_Element (Base, Base.Find ("12"), -12, Position),
            "Replace_Element", 20,
            "12", -12);

         if Test_Maps.Key (Position) /= "12" then
            Test.Fail ("Output Position key is """
              & Test_Maps.Key (Position) & """, expected ""12""");
         end if;

         if Test_Maps.Element (Position) /= -12 then
            Test.Fail ("Output Position element is "
              & Integer'Image (Test_Maps.Element (Position))
              & ", expected -12");
         end if;

         declare
            use type Test_Maps.Updatable_Map;
            Derived : constant Test_Maps.Updatable_Map := Base.Exclude ("foo");
         begin
            if Derived /= Base then
               Test.Fail ("No-op Exclude return differing maps");
               Test.Info ("Base: " & Image (Base));
               Test.Info ("Excluded: " & Image (Derived));
            end if;
         end;
      end;
   exception
      when Error : others => Test.Report_Exception (Error);
   end Update_Constructors;


   procedure Update_Constructor_Exceptions
     (Report : in out NT.Reporter'Class)
   is
      Test : NT.Test := Report.Item
        ("Exceptions raised in ""Update"" constructors");
   begin
      declare
         Map : constant Test_Maps.Updatable_Map := Sample_Map;
         Unrelated_Map : constant Test_Maps.Updatable_Map := Sample_Map;
         Unrelated_Position : constant Test_Maps.Cursor
            := Unrelated_Map.Find ("19");
         Output : Test_Maps.Updatable_Map;
      begin
         Insert :
         declare
            Name : constant String := "Insert with used key";
         begin
            Output := Test_Maps.Insert (Map, "14", -14);
            Test.Fail ("Expected exception in " & Name);
            Test.Info ("Result: " & Image (Output));
         exception
            when Constraint_Error => null;
            when others =>
               Test.Fail ("Unexpected exception in " & Name);
         end Insert;

         Empty_Replace :
         declare
            Name : constant String := "Replace on empty map";
         begin
            Output := Test_Maps.Empty_Updatable_Map.Replace ("14", -14);
            Test.Fail ("Expected exception in " & Name);
            Test.Info ("Result: " & Image (Output));
         exception
            when Constraint_Error => null;
            when others =>
               Test.Fail ("Unexpected exception in " & Name);
         end Empty_Replace;

         Replace :
         declare
            Name : constant String := "Replace with non-existent key";
         begin
            Output := Map.Replace ("-14", -14);
            Test.Fail ("Expected exception in " & Name);
            Test.Info ("Result: " & Image (Output));
         exception
            when Constraint_Error => null;
            when others =>
               Test.Fail ("Unexpected exception in " & Name);
         end Replace;

         Replace_Element :
         declare
            Name : constant String := "Replace_Element with empty cursor";
            Position : constant Test_Maps.Cursor := Map.Find ("-18");
         begin
            Output := Test_Maps.Replace_Element (Map, Position, -18);
            Test.Fail ("Expected exception in " & Name);
            Test.Info ("Result: " & Image (Output));
         exception
            when Constraint_Error => null;
            when others =>
               Test.Fail ("Unexpected exception in " & Name);
         end Replace_Element;

         Unrelated_Replace_Element :
         declare
            Name : constant String := "Replace_Element with unrelated cursor";
         begin
            Output := Test_Maps.Replace_Element (Map, Unrelated_Position, -1);
            Test.Fail ("Expected exception in " & Name);
            Test.Info ("Result: " & Image (Output));
         exception
            when Program_Error => null;
            when others =>
               Test.Fail ("Unexpected exception in " & Name);
         end Unrelated_Replace_Element;

         Empty_Delete_Key :
         declare
            Name : constant String := "Delete on empty map";
         begin
            Output := Test_Maps.Delete (Test_Maps.Empty_Updatable_Map, "24");
            Test.Fail ("Expected exception in " & Name);
            Test.Info ("Result: " & Image (Output));
         exception
            when Constraint_Error => null;
            when others =>
               Test.Fail ("Unexpected exception in " & Name);
         end Empty_Delete_Key;

         Delete_Key :
         declare
            Name : constant String := "Delete with non-existent key";
         begin
            Output := Test_Maps.Delete (Map, "-24");
            Test.Fail ("Expected exception in " & Name);
            Test.Info ("Result: " & Image (Output));
         exception
            when Constraint_Error => null;
            when others =>
               Test.Fail ("Unexpected exception in " & Name);
         end Delete_Key;

         Delete_Empty_Cursor :
         declare
            Name : constant String := "Delete with empty cursor";
         begin
            Output := Test_Maps.Delete (Map, Test_Maps.No_Element);
            Test.Fail ("Expected exception in " & Name);
            Test.Info ("Result: " & Image (Output));
         exception
            when Constraint_Error => null;
            when others =>
               Test.Fail ("Unexpected exception in " & Name);
         end Delete_Empty_Cursor;

         Delete_Unrelated_Cursor :
         declare
            Name : constant String := "Delete with unrelated cursor";
         begin
            Output := Test_Maps.Delete (Map, Unrelated_Position);
            Test.Fail ("Expected exception in " & Name);
            Test.Info ("Result: " & Image (Output));
         exception
            when Program_Error => null;
            when others =>
               Test.Fail ("Unexpected exception in " & Name);
         end Delete_Unrelated_Cursor;
      end;
   exception
      when Error : others => Test.Report_Exception (Error);
   end Update_Constructor_Exceptions;

end Natools.Constant_Indefinite_Ordered_Map_Tests;

Modified tests/natools-constant_indefinite_ordered_map_tests.ads from [4ff2666077] to [f113882e14].

︙
28
29
30
31
32
33
34
35

36


37
38

28
29
30
31
32
33
34

35
36
37
38
39
40








-
+

+
+



   procedure Ada_2012_Iteration (Report : in out NT.Reporter'Class);
   procedure Consistency (Report : in out NT.Reporter'Class);
   procedure Cursor_Operations (Report : in out NT.Reporter'Class);
   procedure Direct_Access (Report : in out NT.Reporter'Class);
   procedure Empty_Map (Report : in out NT.Reporter'Class);
   procedure Iterations (Report : in out NT.Reporter'Class);
   procedure Map_Updates (Report : in out NT.Reporter'Class);
   procedure Range_Iteratiors (Report : in out NT.Reporter'Class);
   procedure Range_Iterators (Report : in out NT.Reporter'Class);
   procedure Unsafe_Map_Roundtrip (Report : in out NT.Reporter'Class);
   procedure Update_Constructors (Report : in out NT.Reporter'Class);
   procedure Update_Constructor_Exceptions (Report : in out NT.Reporter'Class);

end Natools.Constant_Indefinite_Ordered_Map_Tests;

This page was generated in about 0.005s by Fossil 2.23 [47362306a7] 2023-11-01 18:56:47