Overview
Comment: | s_expressions-parsers-tests: add a few more tests |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
d034b73c753dd5da72cf6b0ba68b46c5 |
User & Date: | nat on 2014-01-16 22:57:31 |
Other Links: | manifest | tags |
Context
2014-01-17
| ||
20:46 | s_expressions-parsers: fix a bug where the first character after an invalid escape sequence was not processed check-in: 6d15e0e0da user: nat tags: trunk | |
2014-01-16
| ||
22:57 | s_expressions-parsers-tests: add a few more tests check-in: d034b73c75 user: nat tags: trunk | |
2014-01-15
| ||
21:49 | s_expressions-atom_buffers: fix accessors to return only used part of the buffer check-in: ad0685d1d1 user: nat tags: trunk | |
Changes
Modified tests/natools-s_expressions-parsers-tests.adb from [36b7ad4f5a] to [a40df37a2a].
︙ | ︙ | |||
55 56 57 58 59 60 61 62 63 64 65 66 67 68 | if Parser.Current_Event = Events.Error then Report.Info ("Parser in error state"); end if; if Output.Has_Mismatch then Report.Info ("Mismatch at position" & Count'Image (Output.Mismatch_Index)); end if; if Output.Unread_Expected /= Null_Atom then Report.Info ("Left to expect: """ & To_String (Output.Unread_Expected) & '"'); end if; | > > > > > > > > | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | if Parser.Current_Event = Events.Error then Report.Info ("Parser in error state"); end if; if Output.Has_Mismatch then Report.Info ("Mismatch at position" & Count'Image (Output.Mismatch_Index)); declare Output_Data : Atom renames Output.Get_Data; begin Report.Info ("Mismatching data: """ & To_String (Output_Data (Output.Mismatch_Index .. Output_Data'Last)) & '"'); end; end if; if Output.Unread_Expected /= Null_Atom then Report.Info ("Left to expect: """ & To_String (Output.Unread_Expected) & '"'); end if; |
︙ | ︙ | |||
79 80 81 82 83 84 85 86 87 88 | procedure Blackbox_Test (Report : in out NT.Reporter'Class) is begin declare Input, Output : aliased Test_Tools.Memory_Stream; Printer : Printers.Canonical (Output'Access); Parser : aliased Parsers.Parser; Sub : Subparser (Parser'Access, Input'Access); begin Output.Set_Expected (Expected); Input.Set_Data (Source); | > | > > > > | 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 | procedure Blackbox_Test (Report : in out NT.Reporter'Class) is begin declare Input, Output : aliased Test_Tools.Memory_Stream; Printer : Printers.Canonical (Output'Access); Parser : aliased Parsers.Parser; Sub : Subparser (Parser'Access, Input'Access); Event : Events.Event; -- ! begin Output.Set_Expected (Expected); Input.Set_Data (Source); -- Parser.Next_Event (Input'Access); Sub.Next (Event); -- ! Printers.Transfer (Sub, Printer); Check_Parsing (Report, Name, Parser, Input, Output); end; exception when Error : others => Report.Report_Exception (Name, Error); end Blackbox_Test; ------------------------- -- Complete Test Suite -- ------------------------- procedure All_Tests (Report : in out NT.Reporter'Class) is begin Canonical_Encoding (Report); Atom_Encodings (Report); Base64_Subexpression (Report); Number_Prefixes (Report); Quoted_Escapes (Report); end All_Tests; ----------------------- -- Inidividual Tests -- ----------------------- |
︙ | ︙ | |||
140 141 142 143 144 145 146 147 | (Name => "Canonical encoding", Source => To_Atom (Sample_Image), Expected => To_Atom (Sample_Image)); begin Test (Report); end Canonical_Encoding; end Natools.S_Expressions.Parsers.Tests; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | (Name => "Canonical encoding", Source => To_Atom (Sample_Image), Expected => To_Atom (Sample_Image)); begin Test (Report); end Canonical_Encoding; procedure Base64_Subexpression (Report : in out NT.Reporter'Class) is procedure Test is new Blackbox_Test (Name => "Base-64 subexpression", Source => To_Atom ("head({KDc6c3VibGlzdCk1OnRva2Vu})""tail"""), Expected => To_Atom ("4:head((7:sublist)5:token)4:tail")); begin Test (Report); end Base64_Subexpression; procedure Number_Prefixes (Report : in out NT.Reporter'Class) is procedure Test is new Blackbox_Test (Name => "Number prefixes", Source => To_Atom ("8:verbatim" & "(valid 6""quoted"" 11#68657861646563696d616c#" & " 7|YmFzZS02NA==| 9{NzpleHByLTY0})" & "(undefined 42 10% 123() 10)" & "(invalid 10""quoted"" 3#68657861646563696d616c#" & " 75|YmFzZS02NA==| 1{NzpleHByLTY0})"), Expected => To_Atom ("8:verbatim" & "(5:valid6:quoted11:hexadecimal7:base-647:expr-64)" & "(9:undefined2:423:10%3:123()2:10)" & "(7:invalid6:quoted11:hexadecimal7:base-647:expr-64)")); begin Test (Report); end Number_Prefixes; procedure Quoted_Escapes (Report : in out NT.Reporter'Class) is CR : constant Character := Character'Val (13); LF : constant Character := Character'Val (10); procedure Test is new Blackbox_Test (Name => "Escapes in quoted encoding", Source => To_Atom ("(single-letters ""\b\t\n\v\f\r\\\k"")" & "(newlines ""head\" & CR & "tail"" ""head\" & LF & "tail""" & " ""head\" & CR & LF & "tail"" ""head\" & LF & CR & "tail"")" & "(octal ""head\040\04\xtail"")" & "(hexadecimal ""head\x20\x2a\x2D\x2gtail"")" & "(special ""\x""1:"")"), Expected => To_Atom ("(14:single-letters9:" & Character'Val (8) & Character'Val (9) & Character'Val (10) & Character'Val (11) & Character'Val (12) & Character'Val (13) & "\\k)" & "(8:newlines8:headtail8:headtail8:headtail8:headtail)" & "(5:octal14:head \04\xtail)" & "(11:hexadecimal15:head *-\x2gtail)" & "(7:special2:\x1:"")")); begin Test (Report); end Quoted_Escapes; end Natools.S_Expressions.Parsers.Tests; |
Modified tests/natools-s_expressions-parsers-tests.ads from [0d27e0541c] to [01b8ee403a].
︙ | ︙ | |||
25 26 27 28 29 30 31 32 33 34 | pragma Preelaborate (Tests); package NT renames Natools.Tests; procedure All_Tests (Report : in out NT.Reporter'Class); procedure Atom_Encodings (Report : in out NT.Reporter'Class); procedure Canonical_Encoding (Report : in out NT.Reporter'Class); end Natools.S_Expressions.Parsers.Tests; | > > > | 25 26 27 28 29 30 31 32 33 34 35 36 37 | pragma Preelaborate (Tests); package NT renames Natools.Tests; procedure All_Tests (Report : in out NT.Reporter'Class); procedure Atom_Encodings (Report : in out NT.Reporter'Class); procedure Base64_Subexpression (Report : in out NT.Reporter'Class); procedure Canonical_Encoding (Report : in out NT.Reporter'Class); procedure Number_Prefixes (Report : in out NT.Reporter'Class); procedure Quoted_Escapes (Report : in out NT.Reporter'Class); end Natools.S_Expressions.Parsers.Tests; |