diff --git a/test/iso8601p.t.cpp b/test/iso8601p.t.cpp index 74eb99464..6226af4b1 100644 --- a/test/iso8601p.t.cpp +++ b/test/iso8601p.t.cpp @@ -44,7 +44,8 @@ void testParse ( int in_hours, int in_minutes, int in_seconds, - time_t in_value) + time_t in_value, + const std::string& output) { std::string label = std::string ("parse (\"") + input + "\") --> "; @@ -60,12 +61,13 @@ void testParse ( t.is (iso._minutes, in_minutes, label + "_minutes"); t.is (iso._seconds, in_seconds, label + "_seconds"); t.is ((size_t) iso._value, (size_t) in_value, label + "_value"); + t.is (iso.format (), output, label + " format"); } //////////////////////////////////////////////////////////////////////////////// int main (int argc, char** argv) { - UnitTest t (183); + UnitTest t (1355); ISO8601p iso; std::string::size_type start = 0; @@ -94,27 +96,202 @@ int main (int argc, char** argv) int m = 60; // Designated. - // input i Year Mo Da Ho Mi Se time_t - testParse (t, "P1Y", 3, 1, 0, 0, 0, 0, 0, year); - testParse (t, "P1M", 3, 0, 1, 0, 0, 0, 0, month); - testParse (t, "P1D", 3, 0, 0, 1, 0, 0, 0, day); - testParse (t, "P1Y1M", 5, 1, 1, 0, 0, 0, 0, year + month); - testParse (t, "P1Y1D", 5, 1, 0, 1, 0, 0, 0, year + day); - testParse (t, "P1M1D", 5, 0, 1, 1, 0, 0, 0, month + day); - testParse (t, "P1Y1M1D", 7, 1, 1, 1, 0, 0, 0, year + month + day); - testParse (t, "PT1H", 4, 0, 0, 0, 1, 0, 0, h); - testParse (t, "PT1M", 4, 0, 0, 0, 0, 1, 0, m); - testParse (t, "PT1S", 4, 0, 0, 0, 0, 0, 1, 1); - testParse (t, "PT1H1M", 6, 0, 0, 0, 1, 1, 0, h + m); - testParse (t, "PT1H1S", 6, 0, 0, 0, 1, 0, 1, h + 1); - testParse (t, "PT1M1S", 6, 0, 0, 0, 0, 1, 1, m + 1); - testParse (t, "PT1H1M1S", 8, 0, 0, 0, 1, 1, 1, h + m + 1); - testParse (t, "P1Y1M1DT1H1M1S", 14, 1, 1, 1, 1, 1, 1, year + month + day + h + m + 1); + // input i Year Mo Da Ho Mi Se time_t format + testParse (t, "P1Y", 3, 1, 0, 0, 0, 0, 0, year, "P1Y"); + testParse (t, "P1M", 3, 0, 1, 0, 0, 0, 0, month, "P1M"); + testParse (t, "P1D", 3, 0, 0, 1, 0, 0, 0, day, "P1D"); + testParse (t, "P1Y1M", 5, 1, 1, 0, 0, 0, 0, year + month, "P1Y1M"); + testParse (t, "P1Y1D", 5, 1, 0, 1, 0, 0, 0, year + day, "P1Y1D"); + testParse (t, "P1M1D", 5, 0, 1, 1, 0, 0, 0, month + day, "P1M1D"); + testParse (t, "P1Y1M1D", 7, 1, 1, 1, 0, 0, 0, year + month + day, "P1Y1M1D"); + testParse (t, "PT1H", 4, 0, 0, 0, 1, 0, 0, h, "PT1H"); + testParse (t, "PT1M", 4, 0, 0, 0, 0, 1, 0, m, "PT1M"); + testParse (t, "PT1S", 4, 0, 0, 0, 0, 0, 1, 1, "PT1S"); + testParse (t, "PT1H1M", 6, 0, 0, 0, 1, 1, 0, h + m, "PT1H1M"); + testParse (t, "PT1H1S", 6, 0, 0, 0, 1, 0, 1, h + 1, "PT1H1S"); + testParse (t, "PT1M1S", 6, 0, 0, 0, 0, 1, 1, m + 1, "PT1M1S"); + testParse (t, "PT1H1M1S", 8, 0, 0, 0, 1, 1, 1, h + m + 1, "PT1H1M1S"); + testParse (t, "P1Y1M1DT1H1M1S", 14, 1, 1, 1, 1, 1, 1, year + month + day + h + m + 1, "P1Y1M1DT1H1M1S"); + testParse (t, "PT24H", 5, 0, 0, 0, 24, 0, 0, day, "P1D"); + testParse (t, "PT40000000S", 11, 0, 0, 0, 0, 0, 40000000, 40000000, "P46DT7H6M40S"); + testParse (t, "PT3600S", 7, 0, 0, 0, 0, 0, 3600, h, "PT1H"); + testParse (t, "PT60M", 5, 0, 0, 0, 0, 60, 0, h, "PT1H"); - testParse (t, "PT24H", 5, 0, 0, 0, 24, 0, 0, day); - testParse (t, "PT40000000S", 11, 0, 0, 0, 0, 0, 40000000, 40000000); - testParse (t, "PT3600S", 7, 0, 0, 0, 0, 0, 3600, h); - testParse (t, "PT60M", 5, 0, 0, 0, 0, 60, 0, h); + testParse (t, "0seconds", 8, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 seconds", 9, 0, 0, 0, 0, 0, 2, 2, "PT2S"); + testParse (t, "10seconds", 9, 0, 0, 0, 0, 0, 10, 10, "PT10S"); + testParse (t, "1.5seconds", 10, 0, 0, 0, 0, 0, 1, 1, "PT1S"); + + testParse (t, "0second", 7, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 second", 8, 0, 0, 0, 0, 0, 2, 2, "PT2S"); + testParse (t, "10second", 8, 0, 0, 0, 0, 0, 10, 10, "PT10S"); + testParse (t, "1.5second", 9, 0, 0, 0, 0, 0, 1, 1, "PT1S"); + + testParse (t, "0s", 2, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 s", 3, 0, 0, 0, 0, 0, 2, 2, "PT2S"); + testParse (t, "10s", 3, 0, 0, 0, 0, 0, 10, 10, "PT10S"); + testParse (t, "1.5s", 4, 0, 0, 0, 0, 0, 1, 1, "PT1S"); + + testParse (t, "0minutes", 8, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 minutes", 9, 0, 0, 0, 0, 2, 0, 2 * m, "PT2M"); + testParse (t, "10minutes", 9, 0, 0, 0, 0, 10, 0, 10 * m, "PT10H"); + testParse (t, "1.5minutes", 10, 0, 0, 0, 0, 1, 30, m + 30, "PT1M30S"); + + testParse (t, "0minute", 7, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 minute", 8, 0, 0, 0, 0, 2, 0, 2 * m, "PT2M"); + testParse (t, "10minute", 8, 0, 0, 0, 0, 10, 0, 10 * m, "PT10H"); + testParse (t, "1.5minute", 9, 0, 0, 0, 0, 1, 30, m + 30, "PT1M30S"); + + testParse (t, "0min", 4, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 min", 5, 0, 0, 0, 0, 2, 0, 2 * m, "PT2M"); + testParse (t, "10min", 5, 0, 0, 0, 0, 10, 0, 10 * m, "PT10H"); + testParse (t, "1.5min", 6, 0, 0, 0, 0, 1, 30, m + 30, "PT1M30S"); + + testParse (t, "0hours", 6, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 hours", 7, 0, 0, 0, 2, 0, 0, 2 * h, "PT2H"); + testParse (t, "10hours", 7, 0, 0, 0, 10, 0, 0, 10 * h, "PT10H"); + testParse (t, "1.5hours", 8, 0, 0, 0, 1, 30, 0, h + 30 * m, "PT1H30M"); + + testParse (t, "0hour", 5, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 hour", 6, 0, 0, 0, 2, 0, 0, 2 * h, "PT2H"); + testParse (t, "10hour", 6, 0, 0, 0, 10, 0, 0, 10 * h, "PT10H"); + testParse (t, "1.5hour", 7, 0, 0, 0, 1, 30, 0, h + 30 * m, "PT1H30M"); + + testParse (t, "0h", 2, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 h", 3, 0, 0, 0, 2, 0, 0, 2 * h, "PT2H"); + testParse (t, "10h", 3, 0, 0, 0, 10, 0, 0, 10 * h, "PT10H"); + testParse (t, "1.5h", 4, 0, 0, 0, 1, 30, 0, h + 30 * m, "PT1H30M"); + + testParse (t, "weekdays", 8, 0, 0, 1, 0, 0, 0, day, "P1D"); + + testParse (t, "daily", 5, 0, 0, 1, 0, 0, 0, day, "P1D"); + + testParse (t, "0days", 5, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 days", 6, 0, 0, 2, 0, 0, 0, 2 * day, "P2D"); + testParse (t, "10days", 6, 0, 0, 10, 0, 0, 0, 10 * day, "P10D"); + testParse (t, "1.5days", 7, 0, 0, 1, 12, 0, 0, day + 12 * h, "P1D12H"); + + testParse (t, "0day", 4, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 day", 5, 0, 0, 2, 0, 0, 0, 2 * day, "P2D"); + testParse (t, "10day", 5, 0, 0, 10, 0, 0, 0, 10 * day, "P10D"); + testParse (t, "1.5day", 6, 0, 0, 1, 12, 0, 0, day + 12 * h, "P1D12H"); + + testParse (t, "0d", 2, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 d", 3, 0, 0, 2, 0, 0, 0, 2 * day, "P2D"); + testParse (t, "10d", 3, 0, 0, 10, 0, 0, 0, 10 * day, "P10D"); + testParse (t, "1.5d", 4, 0, 0, 1, 12, 0, 0, day + 12 * h, "P1D12H"); + + testParse (t, "weekly", 6, 0, 0, 7, 0, 0, 0, 7 * day, "P7D"); + + testParse (t, "0weeks", 6, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 weeks", 7, 0, 0, 14, 0, 0, 0, 14 * day, "P14D"); + testParse (t, "10weeks", 7, 0, 0, 70, 0, 0, 0, 70 * day, "P70D"); + testParse (t, "1.5weeks", 8, 0, 0, 10, 12, 0, 0, 10 * day + 12 * h, "P10DT12H"); + + testParse (t, "0week", 5, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 week", 6, 0, 0, 14, 0, 0, 0, 14 * day, "P14D"); + testParse (t, "10week", 6, 0, 0, 70, 0, 0, 0, 70 * day, "P70D"); + testParse (t, "1.5week", 7, 0, 0, 10, 12, 0, 0, 10 * day + 12 * h, "P10DT12H"); + + testParse (t, "0w", 2, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 w", 3, 0, 0, 14, 0, 0, 0, 14 * day, "P14D"); + testParse (t, "10w", 3, 0, 0, 70, 0, 0, 0, 70 * day, "P70D"); + testParse (t, "1.5w", 4, 0, 0, 10, 12, 0, 0, 10 * day + 12 * h, "P10DT12H"); + + testParse (t, "monthly", 7, 0, 1, 0, 0, 0, 0, 30 * day, "P1M"); + + testParse (t, "0months", 7, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 months", 8, 0, 2, 0, 0, 0, 0, 2 * month, "P2M"); + testParse (t, "10months", 8, 0, 10, 0, 0, 0, 0, 10 * month, "P10M"); + testParse (t, "1.5months", 9, 0, 1, 15, 0, 0, 0, month + 15 * day, "P1M15D"); + + testParse (t, "0month", 6, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 month", 7, 0, 2, 0, 0, 0, 0, 2 * month, "P2M"); + testParse (t, "10month", 7, 0, 10, 0, 0, 0, 0, 10 * month, "P10M"); + testParse (t, "1.5month", 8, 0, 1, 15, 0, 0, 0, month + 15 * day, "P1M15D"); + + testParse (t, "0mo", 3, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 mo", 4, 0, 2, 0, 0, 0, 0, 2 * month, "P2M"); + testParse (t, "10mo", 4, 0, 10, 0, 0, 0, 0, 10 * month, "P10M"); + testParse (t, "1.5mo", 5, 0, 1, 15, 0, 0, 0, month + 15 * day, "P1M15D"); + + testParse (t, "quarterly", 9, 0, 3, 0, 0, 0, 0, 3 * month, "P3M"); + + testParse (t, "0quarters", 9, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 quarters", 10, 0, 6, 0, 0, 0, 0, 6 * month, "P6M"); + testParse (t, "10quarters", 10, 2, 2, 0, 0, 0, 0, 2 * year + 6 * month, "P2Y6M"); + testParse (t, "1.5quarters", 11, 0, 4, 15, 0, 0, 0, 4 * month + 15 * day, "P4M15D"); + + testParse (t, "0quarter", 8, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 quarter", 9, 0, 6, 0, 0, 0, 0, 6 * month, "P6M"); + testParse (t, "10quarter", 9, 2, 2, 0, 0, 0, 0, 2 * year + 6 * month, "P2Y6M"); + testParse (t, "1.5quarter", 10, 0, 4, 15, 0, 0, 0, 4 * month + 15 * day, "P4M15D"); + + testParse (t, "0q", 2, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 q", 3, 0, 6, 0, 0, 0, 0, 6 * month, "P6M"); + testParse (t, "10q", 3, 2, 2, 0, 0, 0, 0, 2 * year + 6 * month, "P2Y6M"); + testParse (t, "1.5q", 4, 0, 4, 15, 0, 0, 0, 4 * month + 15 * day, "P4M15D"); + + testParse (t, "yearly", 6, 1, 0, 0, 0, 0, 0, 0, "P1Y"); + + testParse (t, "0years", 6, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 years", 7, 2, 0, 0, 0, 0, 0, 2 * year, "P2Y"); + testParse (t, "10years", 7, 10, 0, 0, 0, 0, 0, 10 * year, "P10Y"); + testParse (t, "1.5years", 8, 1, 6, 0, 0, 0, 0, year + 6 * month, "P1Y6M"); + + testParse (t, "0year", 5, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 year", 6, 2, 0, 0, 0, 0, 0, 2 * year, "P2Y"); + testParse (t, "10year", 6, 10, 0, 0, 0, 0, 0, 10 * year, "P10Y"); + testParse (t, "1.5year", 7, 1, 6, 0, 0, 0, 0, year + 6 * month, "P1Y6M"); + + testParse (t, "0y", 2, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 y", 3, 2, 0, 0, 0, 0, 0, 2 * year, "P2Y"); + testParse (t, "10y", 3, 10, 0, 0, 0, 0, 0, 10 * year, "P10Y"); + testParse (t, "1.5y", 4, 1, 6, 0, 0, 0, 0, year + 6 * month, "P1Y6M"); + + testParse (t, "annual", 6, 1, 0, 0, 0, 0, 0, year, "P1Y"); + testParse (t, "biannual", 8, 2, 0, 0, 0, 0, 0, 2 * year, "P2Y"); + testParse (t, "bimonthly", 9, 0, 2, 0, 0, 0, 0, 2 * month, "P2M"); + testParse (t, "biweekly", 8, 0, 0, 14, 0, 0, 0, 14 * day, "P14D"); + testParse (t, "biyearly", 8, 2, 0, 0, 0, 0, 0, 2 * year, "P2Y"); + testParse (t, "fortnight", 9, 0, 0, 14, 0, 0, 0, 14 * day, "P14D"); + testParse (t, "semiannual", 10, 0, 6, 0, 0, 0, 0, 6 * month, "P6M"); + + testParse (t, "0sennight", 9, 0, 0, 0, 0, 0, 0, 0, "PT0S"); + testParse (t, "2 sennight", 10, 0, 0, 14, 0, 0, 0, 14 * day, "P14D"); + testParse (t, "10sennight", 10, 0, 0, 140, 0, 0, 0, 140 * day, "P140D"); + testParse (t, "1.5sennight", 11, 0, 0, 10, 12, 0, 0, 10 * day + 12 * h, "P10DT12H"); + + ISO8601p left, right; + + // operator< + left = ISO8601p ("1s"); right = ISO8601p ("2s"); t.ok (left < right, "iso8601p 1s < 2s"); + left = ISO8601p ("-2s"); right = ISO8601p ("-1s"); t.ok (left < right, "iso8601p -2s < -1s"); + left = ISO8601p ("1s"); right = ISO8601p ("1min"); t.ok (left < right, "iso8601p 1s < 1min"); + left = ISO8601p ("1min"); right = ISO8601p ("1h"); t.ok (left < right, "iso8601p 1min < 1h"); + left = ISO8601p ("1h"); right = ISO8601p ("1d"); t.ok (left < right, "iso8601p 1h < 1d"); + left = ISO8601p ("1d"); right = ISO8601p ("1w"); t.ok (left < right, "iso8601p 1d < 1w"); + left = ISO8601p ("1w"); right = ISO8601p ("1mo"); t.ok (left < right, "iso8601p 1w < 1mo"); + left = ISO8601p ("1mo"); right = ISO8601p ("1q"); t.ok (left < right, "iso8601p 1mo < 1q"); + left = ISO8601p ("1q"); right = ISO8601p ("1y"); t.ok (left < right, "iso8601p 1q < 1y"); + left = ISO8601p ("-3s"); right = ISO8601p ("-6s"); t.ok (right < left, "iso8601p -6s < -3s"); + + // operator> + left = ISO8601p ("2s"); right = ISO8601p ("1s"); t.ok (left > right, "iso8601p 2s > 1s"); + left = ISO8601p ("-1s"); right = ISO8601p ("-2s"); t.ok (left > right, "iso8601p -1s > -2s"); + left = ISO8601p ("1min"); right = ISO8601p ("1s"); t.ok (left > right, "iso8601p 1min > 1s"); + left = ISO8601p ("1h"); right = ISO8601p ("1min"); t.ok (left > right, "iso8601p 1h > 1min"); + left = ISO8601p ("1d"); right = ISO8601p ("1h"); t.ok (left > right, "iso8601p 1d > 1h"); + left = ISO8601p ("1w"); right = ISO8601p ("1d"); t.ok (left > right, "iso8601p 1w > 1d"); + left = ISO8601p ("1mo"); right = ISO8601p ("1w"); t.ok (left > right, "iso8601p 1mo > 1w"); + left = ISO8601p ("1q"); right = ISO8601p ("1mo"); t.ok (left > right, "iso8601p 1q > 1mo"); + left = ISO8601p ("1y"); right = ISO8601p ("1q"); t.ok (left > right, "iso8601p 1y > 1q"); + left = ISO8601p ("-3s"); right = ISO8601p ("-6s"); t.ok (left > right, "iso8601p -3s > -6s"); + + // operator<= + left = ISO8601p ("1s"); right = ISO8601p ("2s"); t.ok (left <= right, "iso8601p 1s <= 2s"); + left = ISO8601p ("2s"); right = ISO8601p ("2s"); t.ok (left <= right, "iso8601p 1s <= 2s"); + left = ISO8601p ("2s"); right = ISO8601p ("1s"); t.notok (left <= right, "iso8601p NOT 1s <= 2s"); return 0; }