Overview
| Comment: | string_slice_set_tests: first draft of test suite for Slice_Set |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
d080254455664110b5eedcb41e6874a5 |
| User & Date: | nat on 2013-10-05 16:14:48 |
| Other Links: | manifest | tags |
Context
|
2013-10-06
| ||
| 20:38 | chunked_strings: remove (hopefully) dead code in Chunked_String vs String comparison check-in: 2afdfab33b user: nat tags: trunk | |
|
2013-10-05
| ||
| 16:14 | string_slice_set_tests: first draft of test suite for Slice_Set check-in: d080254455 user: nat tags: trunk | |
|
2013-10-04
| ||
| 19:17 | string_slices-slice_sets: new package for sets of slices of a common parent string check-in: 525e25f293 user: nat tags: trunk | |
Changes
Added tests/natools-string_slice_set_tests.adb version [bfbaf590bc].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 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 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 |
------------------------------------------------------------------------------
-- Copyright (c) 2013, Natacha Porté --
-- --
-- Permission to use, copy, modify, and distribute this software for any --
-- purpose with or without fee is hereby granted, provided that the above --
-- copyright notice and this permission notice appear in all copies. --
-- --
-- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES --
-- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF --
-- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR --
-- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES --
-- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN --
-- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF --
-- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --
------------------------------------------------------------------------------
with Ada.Strings.Fixed;
with Ada.Strings.Maps;
with Ada.Strings.Unbounded;
with Natools.String_Slices.Slice_Sets;
package body Natools.String_Slice_Set_Tests is
package Slice_Sets renames Natools.String_Slices.Slice_Sets;
Parent_String : constant String (11 .. 54)
:= "The quick brown fox jumps over the lazy dog.";
-- .123456789.123456789.123456789.123456789.1234
-- 1 2 3 4 5
procedure Info_Fail
(Report : in out NT.Reporter'Class;
Name : in String;
Reported : in out Boolean;
Info : in String);
-- Report failure if not already reported, and append Info
pragma Unreferenced (Info_Fail);
procedure Dump
(Report : in out NT.Reporter'Class;
Set : in Slice_Sets.Slice_Set);
-- Dump the given slice set in Report.Info
------------------------
-- Helper subprograms --
------------------------
procedure Dump
(Report : in out NT.Reporter'Class;
Set : in Slice_Sets.Slice_Set)
is
procedure Range_Image (Slice : in String_Slices.Slice);
Parent, Image : Ada.Strings.Unbounded.Unbounded_String;
Parent_Range : String_Slices.String_Range;
Parent_Seen : Boolean := False;
procedure Range_Image (Slice : in String_Slices.Slice) is
begin
if not Parent_Seen then
Parent := Ada.Strings.Unbounded.To_Unbounded_String
(Slice.Parent.To_String);
Parent_Range := Slice.Parent.Get_Range;
Parent_Seen := True;
end if;
Ada.Strings.Unbounded.Append (Image, " ");
Ada.Strings.Unbounded.Append
(Image,
String_Slices.Image (Slice.Get_Range));
end Range_Image;
begin
Set.Query_Slices (Range_Image'Access);
Report.Info ("Parent: "
& String_Slices.Image (Parent_Range)
& " """ & Ada.Strings.Unbounded.To_String (Parent) & '"');
Report.Info ("Slices:" & Ada.Strings.Unbounded.To_String (Image));
end Dump;
procedure Info_Fail
(Report : in out NT.Reporter'Class;
Name : in String;
Reported : in out Boolean;
Info : in String) is
begin
if not Reported then
Report.Item (Name, NT.Fail);
Reported := True;
end if;
Report.Info (Info);
end Info_Fail;
----------------------
-- Test collections --
----------------------
procedure All_Tests (Report : in out NT.Reporter'Class) is
begin
Test_Navigation (Report);
Test_Tokenization (Report);
end All_Tests;
----------------------
-- Individual tests --
----------------------
procedure Test_Navigation (Report : in out NT.Reporter'Class) is
Name : constant String := "External index navigation";
begin
declare
Set : Slice_Sets.Slice_Set := Slice_Sets.To_Slice_Set (Parent_String);
Middle_First : constant Positive := 20;
Middle_Last : constant Natural := 29;
Index, Previous, Expected, Set_Last : Positive;
begin
Set.Exclude_Slice (Middle_First, Middle_Last);
Set.Cut_Before (45);
Index := Set.First;
Set_Last := Set.Last;
if Index /= Parent_String'First then
Report.Item (Name, NT.Fail);
Report.Info
("First index is" & Integer'Image (Index)
& ", expected" & Integer'Image (Parent_String'First));
Dump (Report, Set);
return;
end if;
if Set_Last /= Parent_String'Last then
Report.Item (Name, NT.Fail);
Report.Info
("Last index is" & Integer'Image (Set_Last)
& ", expected" & Integer'Image (Parent_String'Last));
Dump (Report, Set);
return;
end if;
loop
if Set.Element (Index) /= Parent_String (Index) then
Report.Item (Name, NT.Fail);
Report.Info
("Content mismatch at" & Integer'Image (Index)
& ": " & Character'Image (Set.Element (Index))
& " instead of " & Character'Image (Parent_String (Index)));
Dump (Report, Set);
return;
end if;
exit when Index >= Set_Last;
Previous := Index;
Expected := Index + 1;
if Expected in Middle_First .. Middle_Last then
Expected := Middle_Last + 1;
end if;
Set.Next (Index);
if Index <= Previous then
Report.Item (Name, NT.Fail);
Report.Info
("Next updated index from" & Integer'Image (Previous)
& " to" & Integer'Image (Index));
Dump (Report, Set);
return;
end if;
if Index /= Expected then
Report.Item (Name, NT.Fail);
Report.Info
("Index after" & Integer'Image (Previous)
& " is" & Integer'Image (Index)
& ", expected" & Integer'Image (Expected));
Dump (Report, Set);
return;
end if;
Set.Previous (Expected);
if Previous /= Expected then
Report.Item (Name, NT.Fail);
Report.Info
("Index before" & Integer'Image (Index)
& " is" & Integer'Image (Expected)
& ", expected" & Integer'Image (Previous));
Dump (Report, Set);
return;
end if;
end loop;
end;
Report.Item (Name, NT.Success);
exception
when Error : others => Report.Report_Exception (Name, Error);
end Test_Navigation;
procedure Test_Tokenization (Report : in out NT.Reporter'Class) is
Name : constant String := "Simple tokenization";
Space : constant Ada.Strings.Maps.Character_Set
:= Ada.Strings.Maps.To_Set (" ");
function Has_Spaces (S : String) return Boolean;
function Trim_Spaces (S : String) return String_Slices.String_Range;
function Has_Spaces (S : String) return Boolean is
begin
return Ada.Strings.Fixed.Index (S, Space) > 0;
end Has_Spaces;
function Trim_Spaces (S : String) return String_Slices.String_Range is
Result : String_Slices.String_Range;
N : Natural;
begin
N := Ada.Strings.Fixed.Index (S, Space, Ada.Strings.Outside);
if N = 0 then
return (1, 0);
end if;
Result.First := N;
N := Ada.Strings.Fixed.Index
(S, Space, Ada.Strings.Outside, Ada.Strings.Backward);
String_Slices.Set_Last (Result, N);
return Result;
end Trim_Spaces;
begin
declare
Set : Slice_Sets.Slice_Set := Slice_Sets.To_Slice_Set (Parent_String);
R : String_Slices.String_Range;
N : Natural;
begin
N := Set.Index (Space);
while N > 0 loop
Set.Cut_Before (N);
N := Set.Index (Space, N + 1);
end loop;
Set.Trim_Slices (Trim_Spaces'Access);
N := Set.Index (Space, Going => Ada.Strings.Backward);
if N /= 0 then
Report.Item (Name, NT.Fail);
Report.Info ("Unexpected space at" & Integer'Image (N));
Dump (Report, Set);
return;
end if;
R := Set.Find_Slice (Has_Spaces'Access);
if R.First /= 1 or R.Length /= 0 then
Report.Item (Name, NT.Fail);
Report.Info ("Unxpected slice found at "
& String_Slices.Image (R));
Dump (Report, Set);
return;
end if;
end;
Report.Item (Name, NT.Success);
exception
when Error : others => Report.Report_Exception (Name, Error);
end Test_Tokenization;
end Natools.String_Slice_Set_Tests;
|
Added tests/natools-string_slice_set_tests.ads version [16324aefd5].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | ------------------------------------------------------------------------------ -- Copyright (c) 2013, Natacha Porté -- -- -- -- Permission to use, copy, modify, and distribute this software for any -- -- purpose with or without fee is hereby granted, provided that the above -- -- copyright notice and this permission notice appear in all copies. -- -- -- -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -- -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -- -- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -- -- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -- -- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -- -- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -- -- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -- ------------------------------------------------------------------------------ ------------------------------------------------------------------------------ -- Natools.String_Slice_Set_Tests is a test suite for -- -- Natools.String_Slices.Slice_Sets. -- ------------------------------------------------------------------------------ with Natools.Tests; package Natools.String_Slice_Set_Tests is pragma Preelaborate (String_Slice_Set_Tests); package NT renames Natools.Tests; procedure All_Tests (Report : in out NT.Reporter'Class); procedure Test_Navigation (Report : in out NT.Reporter'Class); procedure Test_Tokenization (Report : in out NT.Reporter'Class); end Natools.String_Slice_Set_Tests; |
Modified tests/test_all.adb from [bc7229b77a] to [2cde93d78d].
| ︙ | ︙ | |||
19 20 21 22 23 24 25 26 27 28 29 30 31 32 |
-----------------------------------------------------------------------
with Ada.Command_Line;
with Ada.Text_IO;
with Natools.Chunked_Strings.Tests;
with Natools.Getopt_Long_Tests;
with Natools.Reference_Tests;
with Natools.String_Slice_Tests;
with Natools.Tests.Text_IO;
procedure Test_All is
package Uneven_Chunked_Strings is new Natools.Chunked_Strings
(Default_Allocation_Unit => 7,
Default_Chunk_Size => 15);
| > | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 |
-----------------------------------------------------------------------
with Ada.Command_Line;
with Ada.Text_IO;
with Natools.Chunked_Strings.Tests;
with Natools.Getopt_Long_Tests;
with Natools.Reference_Tests;
with Natools.String_Slice_Set_Tests;
with Natools.String_Slice_Tests;
with Natools.Tests.Text_IO;
procedure Test_All is
package Uneven_Chunked_Strings is new Natools.Chunked_Strings
(Default_Allocation_Unit => 7,
Default_Chunk_Size => 15);
|
| ︙ | ︙ | |||
66 67 68 69 70 71 72 73 74 75 76 77 78 79 |
Report.Section ("References");
Natools.Reference_Tests.All_Tests (Report);
Report.End_Section;
Report.Section ("String_Slices");
Natools.String_Slice_Tests.All_Tests (Report);
Report.End_Section;
Natools.Tests.Text_IO.Print_Results (Report.Total_Results);
declare
Results : constant Natools.Tests.Result_Summary := Report.Total_Results;
begin
if Results (Natools.Tests.Fail) > 0 or
| > > > > | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 |
Report.Section ("References");
Natools.Reference_Tests.All_Tests (Report);
Report.End_Section;
Report.Section ("String_Slices");
Natools.String_Slice_Tests.All_Tests (Report);
Report.End_Section;
Report.Section ("String_Slices.Slice_Sets");
Natools.String_Slice_Set_Tests.All_Tests (Report);
Report.End_Section;
Natools.Tests.Text_IO.Print_Results (Report.Total_Results);
declare
Results : constant Natools.Tests.Result_Summary := Report.Total_Results;
begin
if Results (Natools.Tests.Fail) > 0 or
|
| ︙ | ︙ |