diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-12-13 10:36:46 -0600 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2013-12-13 10:36:46 -0600 |
| commit | 77608001413236f5decbfabea3392137127bd1c1 (patch) | |
| tree | 659e71ded401ffb9e06b1411280ff8613821afdd /tests | |
| parent | 54cf4f28f2284ee2700e6806b2ab1cbba355dfba (diff) | |
| download | ayatana-indicator-datetime-77608001413236f5decbfabea3392137127bd1c1.tar.gz ayatana-indicator-datetime-77608001413236f5decbfabea3392137127bd1c1.tar.bz2 ayatana-indicator-datetime-77608001413236f5decbfabea3392137127bd1c1.zip | |
in test-formatter, the 12h/24h unit test doesn't need our gschema, so remove it from this MP
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/test-formatter.cc | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 23f96b9..6564a25 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -32,7 +32,7 @@ include_directories (${SERVICE_DEPS_INCLUDE_DIRS}) # test-formatter set (TEST_NAME test-formatter) -add_executable (${TEST_NAME} test-formatter.cc gschemas.compiled) +add_executable (${TEST_NAME} test-formatter.cc) add_test (${TEST_NAME} ${TEST_NAME}) add_dependencies (${TEST_NAME} libindicatordatetimeservice) target_link_libraries (${TEST_NAME} indicatordatetimeservice gtest ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS}) diff --git a/tests/test-formatter.cc b/tests/test-formatter.cc index 488d9e1..6a408ab 100644 --- a/tests/test-formatter.cc +++ b/tests/test-formatter.cc @@ -18,16 +18,12 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <string> -#include <vector> - #include <langinfo.h> #include <locale.h> #include <glib/gi18n.h> #include "utils.h" -#include "settings-shared.h" #include "glib-fixture.h" @@ -44,21 +40,15 @@ class FormatterFixture: public GlibFixture protected: - GSettings * settings = nullptr; - virtual void SetUp () { super::SetUp (); - settings = g_settings_new (SETTINGS_INTERFACE); - original_locale = g_strdup (setlocale (LC_TIME, NULL)); } virtual void TearDown () { - g_clear_object (&settings); - setlocale (LC_TIME, original_locale); g_clear_pointer (&original_locale, g_free); |