aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/test-locations.cc133
1 files changed, 65 insertions, 68 deletions
diff --git a/tests/test-locations.cc b/tests/test-locations.cc
index edaac69..65adbc7 100644
--- a/tests/test-locations.cc
+++ b/tests/test-locations.cc
@@ -21,18 +21,11 @@
#include "glib-fixture.h"
-#include <datetime/clock-mock.h>
-#include <datetime/locations.h>
#include <datetime/locations-settings.h>
-#include <datetime/settings-shared.h>
-
-#include <glib/gi18n.h>
-
-#include <langinfo.h>
-#include <locale.h>
using unity::indicator::datetime::Location;
using unity::indicator::datetime::Locations;
+using unity::indicator::datetime::Settings;
using unity::indicator::datetime::SettingsLocations;
using unity::indicator::datetime::Timezones;
@@ -48,8 +41,9 @@ class LocationsFixture: public GlibFixture
protected:
- GSettings * settings = nullptr;
- std::shared_ptr<Timezones> timezones;
+ //GSettings * settings = nullptr;
+ std::shared_ptr<Settings> m_settings;
+ std::shared_ptr<Timezones> m_timezones;
const std::string nyc = "America/New_York";
const std::string chicago = "America/Chicago";
@@ -57,20 +51,24 @@ class LocationsFixture: public GlibFixture
{
super::SetUp();
- settings = g_settings_new(SETTINGS_INTERFACE);
- const gchar * location_strv[] = { "America/Los_Angeles Oakland", "America/Chicago Chicago", "America/Chicago Oklahoma City", "America/Toronto Toronto", "Europe/London London", "Europe/Berlin Berlin", NULL };
- g_settings_set_strv(settings, SETTINGS_LOCATIONS_S, location_strv);
- g_settings_set_boolean(settings, SETTINGS_SHOW_LOCATIONS_S, true);
-
- timezones.reset(new Timezones);
- timezones->timezone.set(chicago);
- timezones->timezones.set(std::set<std::string>({ nyc, chicago }));
+ m_settings.reset(new Settings);
+ m_settings->show_locations.set(true);
+ m_settings->locations.set({"America/Los_Angeles Oakland",
+ "America/Chicago Chicago",
+ "America/Chicago Oklahoma City",
+ "America/Toronto Toronto",
+ "Europe/London London",
+ "Europe/Berlin Berlin"});
+
+ m_timezones.reset(new Timezones);
+ m_timezones->timezone.set(chicago);
+ m_timezones->timezones.set(std::set<std::string>({ nyc, chicago }));
}
virtual void TearDown()
{
- //timezones.reset(nullptr);
- g_clear_object(&settings);
+ m_timezones.reset();
+ m_settings.reset();
super::TearDown();
}
@@ -78,42 +76,42 @@ class LocationsFixture: public GlibFixture
TEST_F(LocationsFixture, Timezones)
{
- g_settings_set_boolean(settings, SETTINGS_SHOW_LOCATIONS_S, false);
+ m_settings->show_locations.set(false);
- SettingsLocations locations(SETTINGS_INTERFACE, timezones);
- std::vector<Location> l = locations.locations.get();
+ SettingsLocations locations(m_settings, m_timezones);
+ const auto l = locations.locations.get();
EXPECT_EQ(2, l.size());
- EXPECT_EQ("Chicago", l[0].name);
- EXPECT_EQ(chicago, l[0].zone);
- EXPECT_EQ("New York", l[1].name);
- EXPECT_EQ(nyc, l[1].zone);
+ EXPECT_STREQ("Chicago", l[0].name().c_str());
+ EXPECT_EQ(chicago, l[0].zone());
+ EXPECT_EQ("New York", l[1].name());
+ EXPECT_EQ(nyc, l[1].zone());
}
TEST_F(LocationsFixture, SettingsLocations)
{
- SettingsLocations locations(SETTINGS_INTERFACE, timezones);
+ SettingsLocations locations(m_settings, m_timezones);
- std::vector<Location> l = locations.locations.get();
+ const auto l = locations.locations.get();
EXPECT_EQ(7, l.size());
- EXPECT_EQ("Chicago", l[0].name);
- EXPECT_EQ(chicago, l[0].zone);
- EXPECT_EQ("New York", l[1].name);
- EXPECT_EQ(nyc, l[1].zone);
- EXPECT_EQ("Oakland", l[2].name);
- EXPECT_EQ("America/Los_Angeles", l[2].zone);
- EXPECT_EQ("Oklahoma City", l[3].name);
- EXPECT_EQ("America/Chicago", l[3].zone);
- EXPECT_EQ("Toronto", l[4].name);
- EXPECT_EQ("America/Toronto", l[4].zone);
- EXPECT_EQ("London", l[5].name);
- EXPECT_EQ("Europe/London", l[5].zone);
- EXPECT_EQ("Berlin", l[6].name);
- EXPECT_EQ("Europe/Berlin", l[6].zone);
+ EXPECT_EQ("Chicago", l[0].name());
+ EXPECT_EQ(chicago, l[0].zone());
+ EXPECT_EQ("New York", l[1].name());
+ EXPECT_EQ(nyc, l[1].zone());
+ EXPECT_EQ("Oakland", l[2].name());
+ EXPECT_EQ("America/Los_Angeles", l[2].zone());
+ EXPECT_EQ("Oklahoma City", l[3].name());
+ EXPECT_EQ("America/Chicago", l[3].zone());
+ EXPECT_EQ("Toronto", l[4].name());
+ EXPECT_EQ("America/Toronto", l[4].zone());
+ EXPECT_EQ("London", l[5].name());
+ EXPECT_EQ("Europe/London", l[5].zone());
+ EXPECT_EQ("Berlin", l[6].name());
+ EXPECT_EQ("Europe/Berlin", l[6].zone());
}
TEST_F(LocationsFixture, ChangeLocationStrings)
{
- SettingsLocations locations(SETTINGS_INTERFACE, timezones);
+ SettingsLocations locations(m_settings, m_timezones);
bool locations_changed = false;
locations.locations.changed().connect([&locations_changed, this](const std::vector<Location>&){
@@ -121,33 +119,32 @@ TEST_F(LocationsFixture, ChangeLocationStrings)
g_main_loop_quit(loop);
});
- g_idle_add([](gpointer gsettings){
- const gchar * strv[] = { "America/Los_Angeles Oakland", "Europe/London London", "Europe/Berlin Berlin", NULL };
- g_settings_set_strv(static_cast<GSettings*>(gsettings), SETTINGS_LOCATIONS_S, strv);
+ g_idle_add([](gpointer settings){
+ static_cast<Settings*>(settings)->locations.set({"America/Los_Angeles Oakland", "Europe/London London", "Europe/Berlin Berlin"});
return G_SOURCE_REMOVE;
- }, settings);
+ }, m_settings.get());
g_main_loop_run(loop);
EXPECT_TRUE(locations_changed);
- std::vector<Location> l = locations.locations.get();
+ const auto l = locations.locations.get();
EXPECT_EQ(5, l.size());
- EXPECT_EQ("Chicago", l[0].name);
- EXPECT_EQ(chicago, l[0].zone);
- EXPECT_EQ("New York", l[1].name);
- EXPECT_EQ(nyc, l[1].zone);
- EXPECT_EQ("Oakland", l[2].name);
- EXPECT_EQ("America/Los_Angeles", l[2].zone);
- EXPECT_EQ("London", l[3].name);
- EXPECT_EQ("Europe/London", l[3].zone);
- EXPECT_EQ("Berlin", l[4].name);
- EXPECT_EQ("Europe/Berlin", l[4].zone);
+ EXPECT_EQ("Chicago", l[0].name());
+ EXPECT_EQ(chicago, l[0].zone());
+ EXPECT_EQ("New York", l[1].name());
+ EXPECT_EQ(nyc, l[1].zone());
+ EXPECT_EQ("Oakland", l[2].name());
+ EXPECT_EQ("America/Los_Angeles", l[2].zone());
+ EXPECT_EQ("London", l[3].name());
+ EXPECT_EQ("Europe/London", l[3].zone());
+ EXPECT_EQ("Berlin", l[4].name());
+ EXPECT_EQ("Europe/Berlin", l[4].zone());
locations_changed = false;
}
TEST_F(LocationsFixture, ChangeLocationVisibility)
{
- SettingsLocations locations(SETTINGS_INTERFACE, timezones);
+ SettingsLocations locations(m_settings, m_timezones);
bool locations_changed = false;
locations.locations.changed().connect([&locations_changed, this](const std::vector<Location>&){
@@ -155,18 +152,18 @@ TEST_F(LocationsFixture, ChangeLocationVisibility)
g_main_loop_quit(loop);
});
- g_idle_add([](gpointer gsettings){
- g_settings_set_boolean(static_cast<GSettings*>(gsettings), SETTINGS_SHOW_LOCATIONS_S, false);
+ g_idle_add([](gpointer settings){
+ static_cast<Settings*>(settings)->show_locations.set(false);
return G_SOURCE_REMOVE;
- }, settings);
+ }, m_settings.get());
g_main_loop_run(loop);
EXPECT_TRUE(locations_changed);
- std::vector<Location> l = locations.locations.get();
+ const auto l = locations.locations.get();
EXPECT_EQ(2, l.size());
- EXPECT_EQ("Chicago", l[0].name);
- EXPECT_EQ(chicago, l[0].zone);
- EXPECT_EQ("New York", l[1].name);
- EXPECT_EQ(nyc, l[1].zone);
+ EXPECT_EQ("Chicago", l[0].name());
+ EXPECT_EQ(chicago, l[0].zone());
+ EXPECT_EQ("New York", l[1].name());
+ EXPECT_EQ(nyc, l[1].zone());
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 03:52:36 +0000