Overview
Comment: | time_io-tests: add a test suite for RFC-3339 |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
0bfc3117df1120b535c2d6c09ce0e283 |
User & Date: | nat on 2014-08-18 19:21:59 |
Other Links: | manifest | tags |
Context
2014-08-19
| ||
21:09 | time_io-tests: check leap second support before using it in tests check-in: 03c5f8582b user: nat tags: trunk | |
2014-08-18
| ||
19:21 | time_io-tests: add a test suite for RFC-3339 check-in: 0bfc3117df user: nat tags: trunk | |
2014-08-17
| ||
21:58 | time_io-rfc_3339: new package for time I/O according to RFC-3339 check-in: 0e268efe7a user: nat tags: trunk | |
Changes
Modified tests/natools-time_io-tests.adb from [1ca443fdfc] to [133b2a97ac].
︙ | ︙ | |||
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 | -- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -- ------------------------------------------------------------------------------ with Ada.Calendar.Arithmetic; with Ada.Calendar.Formatting; with Ada.Calendar.Time_Zones; with Natools.Time_IO.Human; package body Natools.Time_IO.Tests is use type Ada.Calendar.Time; use type Ada.Calendar.Time_Zones.Time_Offset; ------------------------------ -- Local Helper Subprograms -- ------------------------------ function Quote (Original : String) return String is ('"' & Original & '"'); procedure Check is new NT.Generic_Check (String, "=", Quote); ------------------------- -- Complete Test Suite -- ------------------------- procedure All_Tests (Report : in out NT.Reporter'Class) is begin Human_Duration (Report); Human_Time_Difference (Report); end All_Tests; ----------------------- -- Inidividual Tests -- ----------------------- | > > > > > > > > > > > > > > > > > > > > | 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 | -- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -- ------------------------------------------------------------------------------ with Ada.Calendar.Arithmetic; with Ada.Calendar.Formatting; with Ada.Calendar.Time_Zones; with Natools.Time_IO.Human; with Natools.Time_IO.RFC_3339; package body Natools.Time_IO.Tests is use type Ada.Calendar.Time; use type Ada.Calendar.Time_Zones.Time_Offset; type Extended_Time is record Time : Ada.Calendar.Time; Offset : Ada.Calendar.Time_Zones.Time_Offset; end record; ------------------------------ -- Local Helper Subprograms -- ------------------------------ function Explicit_Sign (Image : String) return String is (if Image'Length > 0 and then Image (Image'First) = ' ' then '+' & Image (Image'First + 1 .. Image'Last) else Image); function Image (Time : Extended_Time) return String is ('[' & Ada.Calendar.Formatting.Image (Time.Time) & "] " & Explicit_Sign (Ada.Calendar.Time_Zones.Time_Offset'Image (Time.Offset))); function Quote (Original : String) return String is ('"' & Original & '"'); procedure Check is new NT.Generic_Check (Extended_Time); procedure Check is new NT.Generic_Check (String, "=", Quote); ------------------------- -- Complete Test Suite -- ------------------------- procedure All_Tests (Report : in out NT.Reporter'Class) is begin Human_Duration (Report); Human_Time_Difference (Report); Read_From_RFC_3339 (Report); Write_As_RFC_3339 (Report); end All_Tests; ----------------------- -- Inidividual Tests -- ----------------------- |
︙ | ︙ | |||
152 153 154 155 156 157 158 159 | Check (Test, "8d", Test_Image (7, 23 * 3600.0 + 35 * 60.0, False)); Check (Test, "5d", Test_Image (5, 900.0, True)); Check (Test, "10h", Test_Image (0, 36_598.0, True)); exception when Error : others => Test.Report_Exception (Error); end Human_Time_Difference; end Natools.Time_IO.Tests; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 277 278 279 280 281 282 283 284 285 | Check (Test, "8d", Test_Image (7, 23 * 3600.0 + 35 * 60.0, False)); Check (Test, "5d", Test_Image (5, 900.0, True)); Check (Test, "10h", Test_Image (0, 36_598.0, True)); exception when Error : others => Test.Report_Exception (Error); end Human_Time_Difference; procedure Read_From_RFC_3339 (Report : in out NT.Reporter'Class) is Test : NT.Test := Report.Item ("RFC-3339 -> Ada.Calendar.Time"); Now : constant Extended_Time := (Ada.Calendar.Clock, Ada.Calendar.Time_Zones.UTC_Time_Offset); function Value (Img : String) return Extended_Time; function Value (Img : String) return Extended_Time is Result : Extended_Time; begin RFC_3339.Value (Img, Result.Time, Result.Offset); return Result; end Value; begin Check (Test, (Ada.Calendar.Formatting.Time_Of (1985, 04, 12, 23, 20, 50, 0.52, False, 0), 0), Value ("1985-04-12T23:20:50.52Z"), "[1] UTC time with subseconds:"); Check (Test, (Ada.Calendar.Formatting.Time_Of (1996, 12, 19, 16, 39, 57, 0.0, False, -8 * 60), -8 * 60), Value ("1996-12-19T16:39:57-08:00"), "[2] Time with negative offset:"); Check (Test, (Ada.Calendar.Formatting.Time_Of (1990, 12, 31, 23, 59, 59, 0.0, True, 0), 0), Value ("1990-12-31T23:59:60Z"), "[3] UTC leap second:"); Check (Test, (Ada.Calendar.Formatting.Time_Of (1990, 12, 31, 15, 59, 59, 0.0, True, -8 * 60), -8 * 60), Value ("1990-12-31T15:59:60-08:00"), "[4] Leap second with time offset:"); Check (Test, (Ada.Calendar.Formatting.Time_Of (1937, 01, 01, 12, 0, 27, 0.87, False, 20), 20), Value ("1937-01-01T12:00:27.87+00:20"), "[5] Noon in the Netherlands:"); Check (Test, Now, Value (RFC_3339.Image (Now.Time, Subsecond_Digits => 9)), "[6] Round trip with current time:"); exception when Error : others => Test.Report_Exception (Error); end Read_From_RFC_3339; procedure Write_As_RFC_3339 (Report : in out NT.Reporter'Class) is Test : NT.Test := Report.Item ("Ada.Calendar.Time -> RFC-3339"); begin Check (Test, "1985-04-12T23:20:50.52Z", RFC_3339.Image (Ada.Calendar.Formatting.Time_Of (1985, 04, 12, 23, 20, 50, 0.52, False, 0), 0, 2), "[1] UTC time with subseconds:"); Check (Test, "1996-12-19T16:39:57-08:00", RFC_3339.Image (Ada.Calendar.Formatting.Time_Of (1996, 12, 19, 16, 39, 57, 0.0, False, -8 * 60), -8 * 60, 0), "[2] Time with negative offset:"); Check (Test, "1990-12-31T23:59:60Z", RFC_3339.Image (Ada.Calendar.Formatting.Time_Of (1990, 12, 31, 23, 59, 59, 0.0, True, 0), 0, 0), "[3] UTC leap second:"); Check (Test, "1990-12-31T15:59:60-08:00", RFC_3339.Image (Ada.Calendar.Formatting.Time_Of (1990, 12, 31, 15, 59, 59, 0.0, True, -8 * 60), -8 * 60, 0), "[4] Leap second with time offset:"); Check (Test, "1937-01-01T12:00:27.87+00:20", RFC_3339.Image (Ada.Calendar.Formatting.Time_Of (1937, 01, 01, 12, 0, 27, 0.87, False, 20), 20, 2), "[5] Noon in the Netherlands:"); Check (Test, "2014-12-25T23:00:00+01:00", RFC_3339.Image (RFC_3339.Value ("2014-12-25T23:00:00+01:00"), 60, 0), "[6] Round trip"); exception when Error : others => Test.Report_Exception (Error); end Write_As_RFC_3339; end Natools.Time_IO.Tests; |
Modified tests/natools-time_io-tests.ads from [cfc1ea2988] to [82e02cbcd3].
︙ | ︙ | |||
25 26 27 28 29 30 31 32 33 | package NT renames Natools.Tests; procedure All_Tests (Report : in out NT.Reporter'Class); procedure Human_Duration (Report : in out NT.Reporter'Class); procedure Human_Time_Difference (Report : in out NT.Reporter'Class); end Natools.Time_IO.Tests; | > > | 25 26 27 28 29 30 31 32 33 34 35 | package NT renames Natools.Tests; procedure All_Tests (Report : in out NT.Reporter'Class); procedure Human_Duration (Report : in out NT.Reporter'Class); procedure Human_Time_Difference (Report : in out NT.Reporter'Class); procedure Read_From_RFC_3339 (Report : in out NT.Reporter'Class); procedure Write_As_RFC_3339 (Report : in out NT.Reporter'Class); end Natools.Time_IO.Tests; |