From fc889eb9ad1e16aa06eb84369931ea9372f05563 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 11 May 2016 18:12:20 +0200 Subject: [PATCH] Revert "Implement unit tests for the time period parser" This reverts commit 1246d7dda334859ee136198b8285f5f4f9504b59. refs #11146 --- test/CMakeLists.txt | 5 +- test/icinga-legacytimeperiod.cpp | 96 -------------------------------- 2 files changed, 2 insertions(+), 99 deletions(-) delete mode 100644 test/icinga-legacytimeperiod.cpp diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index b7f76ff4b..3757274a1 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -22,8 +22,8 @@ set(base_test_SOURCES base-json.cpp base-match.cpp base-netstring.cpp base-object.cpp base-serialize.cpp base-shellescape.cpp base-stacktrace.cpp base-stream.cpp base-string.cpp base-timer.cpp base-type.cpp - base-value.cpp config-ops.cpp icinga-legacytimeperiod.cpp - icinga-macros.cpp icinga-perfdata.cpp test.cpp + base-value.cpp config-ops.cpp icinga-macros.cpp + icinga-perfdata.cpp test.cpp remote-base64.cpp remote-url.cpp ) @@ -98,7 +98,6 @@ add_boost_test(base config_ops/simple config_ops/advanced icinga_macros/simple - icinga_legacytimeperiod/simple icinga_perfdata/empty icinga_perfdata/simple icinga_perfdata/quotes diff --git a/test/icinga-legacytimeperiod.cpp b/test/icinga-legacytimeperiod.cpp deleted file mode 100644 index df93fd817..000000000 --- a/test/icinga-legacytimeperiod.cpp +++ /dev/null @@ -1,96 +0,0 @@ -/****************************************************************************** - * Icinga 2 * - * Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/) * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License * - * as published by the Free Software Foundation; either version 2 * - * of the License, or (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software Foundation * - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ******************************************************************************/ - -#include "icinga/legacytimeperiod.hpp" -#include - -using namespace icinga; - -BOOST_AUTO_TEST_SUITE(icinga_legacytimeperiod); - -struct GlobalTimezoneFixture -{ - char *tz; - - GlobalTimezoneFixture(void) - { - tz = getenv("TZ"); - setenv("TZ", "", 1); - tzset(); - } - - ~GlobalTimezoneFixture(void) - { - if (tz) - setenv("TZ", tz, 1); - else - unsetenv("TZ"); - tzset(); - } -}; - -BOOST_GLOBAL_FIXTURE(GlobalTimezoneFixture); - -BOOST_AUTO_TEST_CASE(simple) -{ - tm beg, end, ref; - timegm(&ref); - - // check parsing of "YYYY-MM-DD" specs - LegacyTimePeriod::ParseTimeSpec("2016-01-01", &beg, &end, &ref); - BOOST_CHECK_EQUAL(mktime(&beg), (time_t) 1451606400); - BOOST_CHECK_EQUAL(mktime(&end), (time_t) 1451692800); - - LegacyTimePeriod::ParseTimeSpec("2015-12-31", &beg, &end, &ref); - BOOST_CHECK_EQUAL(mktime(&beg), (time_t) 1451520000); - BOOST_CHECK_EQUAL(mktime(&end), (time_t) 1451606400); - - BOOST_CHECK_THROW(LegacyTimePeriod::ParseTimeSpec("2015-12-32", &beg, &end, &ref), - std::invalid_argument); - - BOOST_CHECK_THROW(LegacyTimePeriod::ParseTimeSpec("2015-28-01", &beg, &end, &ref), - std::invalid_argument); - - // check parsing of "day X" and "day -X" specs - ref.tm_year = 2016 - 1900; - ref.tm_mon = 1; - LegacyTimePeriod::ParseTimeSpec("day 2", &beg, &end, &ref); - BOOST_CHECK_EQUAL(mktime(&beg), (time_t) 1454371200); // 2016-02-02 - BOOST_CHECK_EQUAL(mktime(&end), (time_t) 1454457600); // 2016-02-03 - - ref.tm_year = 2018 - 1900; - ref.tm_mon = 11; - LegacyTimePeriod::ParseTimeSpec("day 31", &beg, &end, &ref); - BOOST_CHECK_EQUAL(mktime(&beg), (time_t) 1546214400); // 2018-12-31 - BOOST_CHECK_EQUAL(mktime(&end), (time_t) 1546300800); // 2019-01-01 - - ref.tm_year = 2012 - 1900; - ref.tm_mon = 6; - LegacyTimePeriod::ParseTimeSpec("day -1", &beg, &end, &ref); - BOOST_CHECK_EQUAL(mktime(&beg), (time_t) 1343692800); // 2012-07-31 - BOOST_CHECK_EQUAL(mktime(&end), (time_t) 1343779200); // 2012-08-01 - - ref.tm_year = 2016 - 1900; // leap year - ref.tm_mon = 1; - LegacyTimePeriod::ParseTimeSpec("day -1", &beg, &end, &ref); - BOOST_CHECK_EQUAL(mktime(&beg), (time_t) 1456704000); // 2016-02-29 - BOOST_CHECK_EQUAL(mktime(&end), (time_t) 1456790400); // 2016-03-01 -} - -BOOST_AUTO_TEST_SUITE_END()