From a4c925c8d7b67ef8f099710682e16622746ce648 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 1 Apr 2020 16:10:49 +0200 Subject: test/meson.build: move TestTime to time/ --- test/TestISO8601.cxx | 92 ----------------------------------------------- test/meson.build | 14 +------- test/time/TestISO8601.cxx | 92 +++++++++++++++++++++++++++++++++++++++++++++++ test/time/meson.build | 16 +++++++++ 4 files changed, 109 insertions(+), 105 deletions(-) delete mode 100644 test/TestISO8601.cxx create mode 100644 test/time/TestISO8601.cxx create mode 100644 test/time/meson.build (limited to 'test') diff --git a/test/TestISO8601.cxx b/test/TestISO8601.cxx deleted file mode 100644 index cd0897c1a..000000000 --- a/test/TestISO8601.cxx +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright 2019 Content Management AG - * All rights reserved. - * - * author: Max Kellermann - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "time/ISO8601.hxx" - -#include - -static constexpr struct { - const char *s; - time_t t; - std::chrono::system_clock::duration d; -} parse_tests[] = { - /* full ISO8601 */ - { "1970-01-01T00:00:00Z", 0, std::chrono::seconds(1) }, - { "1970-01-01T00:00:01Z", 1, std::chrono::seconds(1) }, - { "2019-02-04T16:46:41Z", 1549298801, std::chrono::seconds(1) }, - { "2018-12-31T23:59:59Z", 1546300799, std::chrono::seconds(1) }, - { "2019-01-01T00:00:00Z", 1546300800, std::chrono::seconds(1) }, - - /* only date */ - { "1970-01-01", 0, std::chrono::hours(24) }, - { "2019-02-04", 1549238400, std::chrono::hours(24) }, - { "2018-12-31", 1546214400, std::chrono::hours(24) }, - { "2019-01-01", 1546300800, std::chrono::hours(24) }, - - /* date with time zone */ - { "2019-02-04Z", 1549238400, std::chrono::hours(24) }, - - /* without time zone */ - { "2019-02-04T16:46:41", 1549298801, std::chrono::seconds(1) }, - - /* without seconds */ - { "2019-02-04T16:46", 1549298760, std::chrono::minutes(1) }, - { "2019-02-04T16:46Z", 1549298760, std::chrono::minutes(1) }, - - /* without minutes */ - { "2019-02-04T16", 1549296000, std::chrono::hours(1) }, - { "2019-02-04T16Z", 1549296000, std::chrono::hours(1) }, - - /* with time zone */ - { "2019-02-04T16:46:41+02", 1549291601, std::chrono::seconds(1) }, - { "2019-02-04T16:46:41+0200", 1549291601, std::chrono::seconds(1) }, - { "2019-02-04T16:46:41+02:00", 1549291601, std::chrono::seconds(1) }, - { "2019-02-04T16:46:41-0200", 1549306001, std::chrono::seconds(1) }, - - /* without field separators */ - { "19700101T000000Z", 0, std::chrono::seconds(1) }, - { "19700101T000001Z", 1, std::chrono::seconds(1) }, - { "20190204T164641Z", 1549298801, std::chrono::seconds(1) }, - { "19700101", 0, std::chrono::hours(24) }, - { "20190204", 1549238400, std::chrono::hours(24) }, - { "20190204T1646", 1549298760, std::chrono::minutes(1) }, - { "20190204T16", 1549296000, std::chrono::hours(1) }, -}; - -TEST(ISO8601, Parse) -{ - for (const auto &i : parse_tests) { - const auto result = ParseISO8601(i.s); - EXPECT_EQ(std::chrono::system_clock::to_time_t(result.first), i.t); - EXPECT_EQ(result.second, i.d); - } -} diff --git a/test/meson.build b/test/meson.build index 4e3fbab49..f20a79aa0 100644 --- a/test/meson.build +++ b/test/meson.build @@ -24,6 +24,7 @@ gtest_dep = declare_dependency( ) subdir('net') +subdir('time') executable( 'read_conf', @@ -51,19 +52,6 @@ test('TestUtil', executable( ], )) -test( - 'TestTime', - executable( - 'TestTime', - 'TestISO8601.cxx', - include_directories: inc, - dependencies: [ - time_dep, - gtest_dep, - ], - ), -) - test('TestRewindInputStream', executable( 'TestRewindInputStream', 'TestRewindInputStream.cxx', diff --git a/test/time/TestISO8601.cxx b/test/time/TestISO8601.cxx new file mode 100644 index 000000000..cd0897c1a --- /dev/null +++ b/test/time/TestISO8601.cxx @@ -0,0 +1,92 @@ +/* + * Copyright 2019 Content Management AG + * All rights reserved. + * + * author: Max Kellermann + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "time/ISO8601.hxx" + +#include + +static constexpr struct { + const char *s; + time_t t; + std::chrono::system_clock::duration d; +} parse_tests[] = { + /* full ISO8601 */ + { "1970-01-01T00:00:00Z", 0, std::chrono::seconds(1) }, + { "1970-01-01T00:00:01Z", 1, std::chrono::seconds(1) }, + { "2019-02-04T16:46:41Z", 1549298801, std::chrono::seconds(1) }, + { "2018-12-31T23:59:59Z", 1546300799, std::chrono::seconds(1) }, + { "2019-01-01T00:00:00Z", 1546300800, std::chrono::seconds(1) }, + + /* only date */ + { "1970-01-01", 0, std::chrono::hours(24) }, + { "2019-02-04", 1549238400, std::chrono::hours(24) }, + { "2018-12-31", 1546214400, std::chrono::hours(24) }, + { "2019-01-01", 1546300800, std::chrono::hours(24) }, + + /* date with time zone */ + { "2019-02-04Z", 1549238400, std::chrono::hours(24) }, + + /* without time zone */ + { "2019-02-04T16:46:41", 1549298801, std::chrono::seconds(1) }, + + /* without seconds */ + { "2019-02-04T16:46", 1549298760, std::chrono::minutes(1) }, + { "2019-02-04T16:46Z", 1549298760, std::chrono::minutes(1) }, + + /* without minutes */ + { "2019-02-04T16", 1549296000, std::chrono::hours(1) }, + { "2019-02-04T16Z", 1549296000, std::chrono::hours(1) }, + + /* with time zone */ + { "2019-02-04T16:46:41+02", 1549291601, std::chrono::seconds(1) }, + { "2019-02-04T16:46:41+0200", 1549291601, std::chrono::seconds(1) }, + { "2019-02-04T16:46:41+02:00", 1549291601, std::chrono::seconds(1) }, + { "2019-02-04T16:46:41-0200", 1549306001, std::chrono::seconds(1) }, + + /* without field separators */ + { "19700101T000000Z", 0, std::chrono::seconds(1) }, + { "19700101T000001Z", 1, std::chrono::seconds(1) }, + { "20190204T164641Z", 1549298801, std::chrono::seconds(1) }, + { "19700101", 0, std::chrono::hours(24) }, + { "20190204", 1549238400, std::chrono::hours(24) }, + { "20190204T1646", 1549298760, std::chrono::minutes(1) }, + { "20190204T16", 1549296000, std::chrono::hours(1) }, +}; + +TEST(ISO8601, Parse) +{ + for (const auto &i : parse_tests) { + const auto result = ParseISO8601(i.s); + EXPECT_EQ(std::chrono::system_clock::to_time_t(result.first), i.t); + EXPECT_EQ(result.second, i.d); + } +} diff --git a/test/time/meson.build b/test/time/meson.build new file mode 100644 index 000000000..0aba67ac2 --- /dev/null +++ b/test/time/meson.build @@ -0,0 +1,16 @@ +test_time_sources = [ + 'TestISO8601.cxx', +] + +test( + 'TestTime', + executable( + 'TestTime', + test_time_sources, + include_directories: inc, + dependencies: [ + time_dep, + gtest_dep, + ], + ), +) -- cgit v1.2.3