diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-02-08 22:05:22 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-02-08 22:05:22 +0100 |
commit | b439ad041ff4478453f0bd4e00f55224d653c69b (patch) | |
tree | d04a05b67e5e7d325ca5f18a567906bcaefad6e1 /tests/test-formatter.cpp | |
parent | 4e9da1fb0791336cc25b323aed3bbbb20c1b9fb5 (diff) | |
parent | 91af5e2854d40d06515416b4b89eb66b346ebe56 (diff) | |
download | ayatana-indicator-datetime-b439ad041ff4478453f0bd4e00f55224d653c69b.tar.gz ayatana-indicator-datetime-b439ad041ff4478453f0bd4e00f55224d653c69b.tar.bz2 ayatana-indicator-datetime-b439ad041ff4478453f0bd4e00f55224d653c69b.zip |
Merge branch 'tari01-pr/fix-cppcheck-suppressions'
Attributes GH PR #86: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/86
Diffstat (limited to 'tests/test-formatter.cpp')
-rw-r--r-- | tests/test-formatter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test-formatter.cpp b/tests/test-formatter.cpp index a8d798b..d8c0afb 100644 --- a/tests/test-formatter.cpp +++ b/tests/test-formatter.cpp @@ -1,9 +1,10 @@ - /* * Copyright 2013 Canonical Ltd. + * Copyright 2021 Robert Tari * * Authors: * Charles Kerr <charles.kerr@canonical.com> + * Robert Tari <robert@tari.in> * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -143,10 +144,9 @@ TEST_F(FormatterFixture, DISABLED_TestDesktopHeader) auto now = DateTime::Local(2020, 10, 31, 18, 30, 59); auto clock = std::make_shared<MockClock>(now); - bool locale_set = false; for(const auto& test_case : test_cases) { - test_case.is_12h ? locale_set = Set12hLocale() : locale_set = Set24hLocale(); + bool locale_set = test_case.is_12h ? Set12hLocale() : Set24hLocale(); DesktopFormatter f(clock, m_settings); m_settings->show_day.set(test_case.show_day); |