Overview
Comment: | Move Check_Stream from Natools.S_Expressions.Printers.Pretty.Tests to Natools.S_Expressions.Test_Tools to make it more widely available |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
f95cb1f5a84a1d9b59160aa002cda3b8 |
User & Date: | nat on 2014-02-12 21:59:00 |
Other Links: | manifest | tags |
Context
2014-02-13
| ||
22:15 | s_expressions-cache_tests: new packge for S-expression memory cache test suite check-in: b14a72b9cb user: nat tags: trunk | |
2014-02-12
| ||
21:59 | Move Check_Stream from Natools.S_Expressions.Printers.Pretty.Tests to Natools.S_Expressions.Test_Tools to make it more widely available check-in: f95cb1f5a8 user: nat tags: trunk | |
2014-02-11
| ||
20:57 | s_expressions-caches: instantiation of Natools.S_Expressions.Generic_Caches with default storage pool check-in: 2b97af7bf2 user: nat tags: trunk | |
Changes
Modified tests/natools-s_expressions-printers-pretty-tests.adb from [facab2d13a] to [2c8c19248a].
︙ | ︙ | |||
20 21 22 23 24 25 26 | with Natools.S_Expressions.Parsers; with Natools.S_Expressions.Test_Tools; package body Natools.S_Expressions.Printers.Pretty.Tests is package Latin_1 renames Ada.Characters.Latin_1; | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | 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 | with Natools.S_Expressions.Parsers; with Natools.S_Expressions.Test_Tools; package body Natools.S_Expressions.Printers.Pretty.Tests is package Latin_1 renames Ada.Characters.Latin_1; procedure Parse_Print_Test (Test : in out NT.Test; Param : in Parameters; Expected : in Atom); -- Parse Expected and feed it into a new pretty printer, checking -- the result is identical to Expected. ------------------------------ -- Local Helper Subprograms -- ------------------------------ procedure Parse_Print_Test (Test : in out NT.Test; Param : in Parameters; Expected : in Atom) is begin declare Input, Output : aliased Test_Tools.Memory_Stream; Parser : aliased Parsers.Parser; Subparser : Parsers.Subparser (Parser'Access, Input'Access); Pretty_Printer : Printer (Output'Access); Event : Events.Event; begin Input.Set_Data (Expected); Output.Set_Expected (Expected); Pretty_Printer.Set_Parameters (Param); Subparser.Next (Event); Transfer (Subparser, Pretty_Printer); Output.Check_Stream (Test); end; exception when Error : others => Test.Report_Exception (Error); end Parse_Print_Test; |
︙ | ︙ | |||
188 189 190 191 192 193 194 | & " 3637#)")); Pr.Set_Parameters (Param); Pr.Open_List; Pr.Append_Atom (To_Atom ("01234567")); Pr.Close_List; | | | | 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 | & " 3637#)")); Pr.Set_Parameters (Param); Pr.Open_List; Pr.Append_Atom (To_Atom ("01234567")); Pr.Close_List; Output.Check_Stream (Test); end; Param.Fallback := Base64; declare Output : aliased Test_Tools.Memory_Stream; Pr : Printer (Output'Access); begin Output.Set_Expected (To_Atom ("(" & Latin_1.LF & " | YWJj" & Latin_1.LF & " REVG" & Latin_1.LF & " Z2hp" & Latin_1.LF & " SktM" & Latin_1.LF & " |)")); Pr.Set_Parameters (Param); Pr.Open_List; Pr.Append_Atom (To_Atom ("abcDEFghiJKL")); Pr.Close_List; Output.Check_Stream (Test); end; exception when Error : others => Test.Report_Exception (Error); end Atom_Width; procedure Basic_Printing (Report : in out NT.Reporter'Class) is |
︙ | ︙ | |||
235 236 237 238 239 240 241 | P.Open_List; P.Append_Atom (To_Atom ("subarg")); P.Close_List; P.Append_Atom (To_Atom ("arg")); P.Close_List; P.Append_Atom (To_Atom ("end")); | | | 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 | P.Open_List; P.Append_Atom (To_Atom ("subarg")); P.Close_List; P.Append_Atom (To_Atom ("arg")); P.Close_List; P.Append_Atom (To_Atom ("end")); Output.Check_Stream (Test); end; exception when Error : others => Test.Report_Exception (Error); end Basic_Printing; procedure Indentation (Report : in out NT.Reporter'Class) is |
︙ | ︙ | |||
338 339 340 341 342 343 344 | Output.Set_Expected (To_Atom ("(begin" & Latin_1.CR & " ""quot\" & Latin_1.CR & "ed" & Latin_1.CR & "\n" & Latin_1.CR & "str"")")); Print (Pr); | | | | | | 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 | Output.Set_Expected (To_Atom ("(begin" & Latin_1.CR & " ""quot\" & Latin_1.CR & "ed" & Latin_1.CR & "\n" & Latin_1.CR & "str"")")); Print (Pr); Output.Check_Stream (Test); end; Param.Newline := LF; declare Output : aliased Test_Tools.Memory_Stream; Pr : Printer (Output'Access); begin Pr.Set_Parameters (Param); Output.Set_Expected (To_Atom ("(begin" & Latin_1.LF & " ""quot\" & Latin_1.LF & "ed\r" & Latin_1.LF & "\rstr"")")); Print (Pr); Output.Check_Stream (Test); end; Param.Newline := CR_LF; declare Output : aliased Test_Tools.Memory_Stream; Pr : Printer (Output'Access); begin Pr.Set_Parameters (Param); Output.Set_Expected (To_Atom ("(begin" & Latin_1.CR & Latin_1.LF & " ""quot\" & Latin_1.CR & Latin_1.LF & "ed" & Latin_1.CR & Latin_1.LF & "\rstr"")")); Print (Pr); Output.Check_Stream (Test); end; Param.Newline := LF_CR; declare Output : aliased Test_Tools.Memory_Stream; Pr : Printer (Output'Access); begin Pr.Set_Parameters (Param); Output.Set_Expected (To_Atom ("(begin" & Latin_1.LF & Latin_1.CR & " ""quot\" & Latin_1.LF & Latin_1.CR & "ed\r" & Latin_1.LF & Latin_1.CR & "str"")")); Print (Pr); Output.Check_Stream (Test); end; exception when Error : others => Test.Report_Exception (Error); end Newline_Formats; procedure Parameter_Mutators (Report : in out NT.Reporter'Class) is |
︙ | ︙ | |||
512 513 514 515 516 517 518 | Output.Set_Expected (Encodings.Hex_Atom_Begin & Encodings.Encode_Hex (Source (Source'First + 1 .. Source'Last), Param.Hex_Casing) & Encodings.Hex_Atom_End); Pr.Set_Parameters (Param); Pr.Append_Atom (Source (Source'First + 1 .. Source'Last)); | | | | 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 | Output.Set_Expected (Encodings.Hex_Atom_Begin & Encodings.Encode_Hex (Source (Source'First + 1 .. Source'Last), Param.Hex_Casing) & Encodings.Hex_Atom_End); Pr.Set_Parameters (Param); Pr.Append_Atom (Source (Source'First + 1 .. Source'Last)); Output.Check_Stream (Test); end; declare Output : aliased Test_Tools.Memory_Stream; Pr : Printer (Output'Access); begin Output.Set_Expected (To_Atom ("""Special: \b\t\n\v\f\r\\\""\x00" & "UTF-8 sequences: \xC3\xA9, \xE2\x88\x92, \xF0\x9F\x81\xA1, " & "\xF9\x88\xB4\x95\xA7, \xFD\xB6\x95\x83\x88\x90" & "Invalid UTF-8 sequences: " & "\xAA, \xC3, \xE2\x88, \xF0\x9F\x81, \xF9\x88\xB4\x95, " & "\xFD\xB6\x95\x83\x88, \xFE." & Latin_1.CR & Latin_1.LF & "<>\r\n""")); Pr.Set_Parameters (Param); Pr.Append_Atom (Source); Output.Check_Stream (Test); end; Param.Char_Encoding := Latin; Param.Hex_Casing := Encodings.Lower; declare Output : aliased Test_Tools.Memory_Stream; |
︙ | ︙ | |||
564 565 566 567 568 569 570 | & Character'Val (16#B4#) & "\x95, " & Character'Val (16#FD#) & Character'Val (16#B6#) & "\x95\x83\x88, " & Character'Val (16#FE#) & '.' & Latin_1.CR & Latin_1.LF & "<>\r\n""")); Pr.Set_Parameters (Param); Pr.Append_Atom (Source); | | | | | 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 | & Character'Val (16#B4#) & "\x95, " & Character'Val (16#FD#) & Character'Val (16#B6#) & "\x95\x83\x88, " & Character'Val (16#FE#) & '.' & Latin_1.CR & Latin_1.LF & "<>\r\n""")); Pr.Set_Parameters (Param); Pr.Append_Atom (Source); Output.Check_Stream (Test); end; Param.Char_Encoding := UTF_8; Param.Quoted_Escape := Octal_Escape; declare Output : aliased Test_Tools.Memory_Stream; Pr : Printer (Output'Access); begin Output.Set_Expected (To_Atom ("""Special: \b\t\n\v\f\r\\\""\000") & Source (18 .. 62) & To_Atom ("Invalid UTF-8 sequences: " & "\252, \303, \342\210, \360\237\201, " & "\371\210\264\225, \375\266\225\203\210, \376." & Latin_1.CR & Latin_1.LF & "<>\r\n""")); Pr.Set_Parameters (Param); Pr.Append_Atom (Source); Output.Check_Stream (Test); end; Param.Width := 31; declare Output : aliased Test_Tools.Memory_Stream; Pr : Printer (Output'Access); begin Output.Set_Expected (To_Atom ("""Special: \b\t\n\v\f\r\\\""\000" & '\' & Latin_1.CR & Latin_1.LF) & Source (18 .. 62) & To_Atom ('\' & Latin_1.CR & Latin_1.LF & "Invalid UTF-8 sequences: \252,\" & Latin_1.CR & Latin_1.LF & " \303, \342\210, \360\237\201,\" & Latin_1.CR & Latin_1.LF & " \371\210\264\225, \375\266\" & Latin_1.CR & Latin_1.LF & "\225\203\210, \376." & Latin_1.CR & Latin_1.LF & "<>\r\n""")); Pr.Set_Parameters (Param); Pr.Append_Atom (Source); Output.Check_Stream (Test); end; exception when Error : others => Test.Report_Exception (Error); end Quoted_String_Escapes; procedure Separators (Report : in out NT.Reporter'Class) is |
︙ | ︙ | |||
638 639 640 641 642 643 644 | declare Output : aliased Test_Tools.Memory_Stream; Pr : Printer (Output'Access); begin Output.Set_Expected (To_Atom ("5:begin(()(4:head4:tail))3:end")); Pr.Set_Parameters (Param); Test_Exp (Pr); | | | | 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 | declare Output : aliased Test_Tools.Memory_Stream; Pr : Printer (Output'Access); begin Output.Set_Expected (To_Atom ("5:begin(()(4:head4:tail))3:end")); Pr.Set_Parameters (Param); Test_Exp (Pr); Output.Check_Stream (Test); end; Param.Space_At := (others => (others => True)); declare Output : aliased Test_Tools.Memory_Stream; Pr : Printer (Output'Access); begin Output.Set_Expected (To_Atom ("5:begin ( ( ) ( 4:head 4:tail ) ) 3:end")); Pr.Set_Parameters (Param); Test_Exp (Pr); Output.Check_Stream (Test); end; Param.Newline_At := (others => (others => True)); Param.Newline := LF; declare Output : aliased Test_Tools.Memory_Stream; |
︙ | ︙ | |||
673 674 675 676 677 678 679 | & "4:head" & Latin_1.LF & "4:tail" & Latin_1.LF & ')' & Latin_1.LF & ')' & Latin_1.LF & "3:end")); Pr.Set_Parameters (Param); Test_Exp (Pr); | | | 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 | & "4:head" & Latin_1.LF & "4:tail" & Latin_1.LF & ')' & Latin_1.LF & ')' & Latin_1.LF & "3:end")); Pr.Set_Parameters (Param); Test_Exp (Pr); Output.Check_Stream (Test); end; exception when Error : others => Test.Report_Exception (Error); end Separators; procedure Token_Separation (Report : in out NT.Reporter'Class) is |
︙ | ︙ | |||
723 724 725 726 727 728 729 | Pr.Set_Fallback (Base64); Pr.Append_Atom (To_Atom ("Base-64" & Latin_1.LF)); Pr.Append_Atom (Token); Pr.Close_List; Pr.Append_Atom (To_Atom ("end")); Pr.Close_List; | | | 684 685 686 687 688 689 690 691 692 693 694 695 696 697 | Pr.Set_Fallback (Base64); Pr.Append_Atom (To_Atom ("Base-64" & Latin_1.LF)); Pr.Append_Atom (Token); Pr.Close_List; Pr.Append_Atom (To_Atom ("end")); Pr.Close_List; Output.Check_Stream (Test); end; exception when Error : others => Test.Report_Exception (Error); end Token_Separation; end Natools.S_Expressions.Printers.Pretty.Tests; |
Modified tests/natools-s_expressions-test_tools.adb from [b83412e9a0] to [32354a28b6].
︙ | ︙ | |||
320 321 322 323 324 325 326 327 | if Stream.Mismatch then return Stream.Expect_Pointer + 1; else return 0; end if; end Mismatch_Index; end Natools.S_Expressions.Test_Tools; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 | if Stream.Mismatch then return Stream.Expect_Pointer + 1; else return 0; end if; end Mismatch_Index; procedure Check_Stream (Stream : in Test_Tools.Memory_Stream; Test : in out NT.Test) is begin if Stream.Has_Mismatch or else Stream.Unread_Expected /= Null_Atom then if Stream.Has_Mismatch then Test.Fail ("Mismatch at position" & Count'Image (Stream.Mismatch_Index)); declare Stream_Data : Atom renames Stream.Get_Data; begin Test_Tools.Dump_Atom (Test, Stream_Data (Stream_Data'First .. Stream.Mismatch_Index - 1), "Matching data"); Test_Tools.Dump_Atom (Test, Stream_Data (Stream.Mismatch_Index .. Stream_Data'Last), "Mismatching data"); end; end if; if Stream.Unread_Expected /= Null_Atom then Test.Fail; Test_Tools.Dump_Atom (Test, Stream.Unread_Expected, "Left to expect"); end if; end if; end Check_Stream; end Natools.S_Expressions.Test_Tools; |
Modified tests/natools-s_expressions-test_tools.ads from [44f4289719] to [ec3eb81d6e].
︙ | ︙ | |||
94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | procedure Reset_Mismatch (Stream : in out Memory_Stream); -- Accessor and mutator of the mismatch flag function Mismatch_Index (Stream : Memory_Stream) return Count; -- Return the position of the first mismatching octet, -- or 0 when there has been no mismatch. private type Memory_Stream is new Ada.Streams.Root_Stream_Type with record Internal : Atom_Buffers.Atom_Buffer; Expected : Atom_Buffers.Atom_Buffer; Read_Pointer : Count := 0; Expect_Pointer : Count := 0; Mismatch : Boolean := False; end record; end Natools.S_Expressions.Test_Tools; | > > > > > | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 | procedure Reset_Mismatch (Stream : in out Memory_Stream); -- Accessor and mutator of the mismatch flag function Mismatch_Index (Stream : Memory_Stream) return Count; -- Return the position of the first mismatching octet, -- or 0 when there has been no mismatch. procedure Check_Stream (Stream : in Test_Tools.Memory_Stream; Test : in out NT.Test); -- On error in Stream, report error and dump relevant information. private type Memory_Stream is new Ada.Streams.Root_Stream_Type with record Internal : Atom_Buffers.Atom_Buffer; Expected : Atom_Buffers.Atom_Buffer; Read_Pointer : Count := 0; Expect_Pointer : Count := 0; Mismatch : Boolean := False; end record; end Natools.S_Expressions.Test_Tools; |