aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/locations.cpp23
-rw-r--r--tests/test-settings.cpp6
-rw-r--r--tests/test-timezone-geoclue.cpp59
3 files changed, 5 insertions, 83 deletions
diff --git a/src/locations.cpp b/src/locations.cpp
index c59f988..0690acd 100644
--- a/src/locations.cpp
+++ b/src/locations.cpp
@@ -54,29 +54,6 @@ Location::Location(const std::string& zone_, const std::string& name_):
g_time_zone_unref (gzone);
}
-#if 0
-DateTime Location::localtime(const DateTime& reference_point) const
-{
-GDateTime * g_date_time_to_timezone (GDateTime *datetime,
- GTimeZone *tz);
- auto gzone = g_time_zone_new(zone().c_str());
- const auto gtime = reference_point.get();
- auto glocal = g_date_time_new (gzone,
- g_date_time_get_year(gtime),
- g_date_time_get_month(gtime),
- g_date_time_get_day_of_month(gtime),
- g_date_time_get_hour(gtime),
- g_date_time_get_minute(gtime),
- g_date_time_get_seconds(gtime));
- DateTime local(glocal);
- g_date_time_unref(glocal);
- g_message("reference: %zu", (size_t)reference_point.to_unix(), (size_t)local.to_unix());
- //g_date_time_unref(gtime);
- g_time_zone_unref(gzone);
- return local;
-}
-#endif
-
} // namespace datetime
} // namespace indicator
} // namespace unity
diff --git a/tests/test-settings.cpp b/tests/test-settings.cpp
index df01cd7..980e7fa 100644
--- a/tests/test-settings.cpp
+++ b/tests/test-settings.cpp
@@ -189,9 +189,3 @@ TEST_F(SettingsFixture, Locations)
g_strfreev(tmp);
EXPECT_EQ(bv, vtmp);
}
-
-#if 0
- core::Property<std::vector<std::string>> locations;
- core::Property<TimeFormatMode> time_format_mode;
-
-#endif
diff --git a/tests/test-timezone-geoclue.cpp b/tests/test-timezone-geoclue.cpp
index 4bf08a7..3cc1393 100644
--- a/tests/test-timezone-geoclue.cpp
+++ b/tests/test-timezone-geoclue.cpp
@@ -21,64 +21,17 @@
#include <datetime/timezone-geoclue.h>
-//#include <libdbustest/dbus-test.h>
-
using unity::indicator::datetime::GeoclueTimezone;
-/***
-****
-***/
-
-class TimezoneGeoclueFixture : public GeoclueFixture
-{
-};
-
-#if 0
-namespace
+// This test looks small because the interesting
+// work is all happening in GeoclueFixture...
+TEST_F(GeoclueFixture, ChangeDetected)
{
- struct EmitAddressChangedData
- {
- DbusTestDbusMock * mock = nullptr;
- DbusTestDbusMockObject * obj_client = nullptr;
- std::string timezone;
- EmitAddressChangedData(DbusTestDbusMock * mock_,
- DbusTestDbusMockObject * obj_client_,
- const std::string& timezone_): mock(mock_), obj_client(obj_client_), timezone(timezone_) {}
- };
-
- gboolean emit_address_changed_idle(gpointer gdata)
- {
- auto data = static_cast<EmitAddressChangedData*>(gdata);
-
- GError * error = nullptr;
- dbus_test_dbus_mock_object_emit_signal(data->mock, data->obj_client,
- "org.freedesktop.Geoclue.Address",
- "AddressChanged",
- G_VARIANT_TYPE("(ia{ss}(idd))"),
- g_variant_new_parsed("(1385238033, {'timezone': 'America/Chicago'}, (3, 0.0, 0.0))"),
- &error);
- if (error)
- {
- g_warning("%s: %s", G_STRFUNC, error->message);
- g_error_free(error);
- }
-
- delete data;
- return G_SOURCE_REMOVE;
- }
-}
-#endif
-
-TEST_F(TimezoneGeoclueFixture, ChangeDetected)
-{
-// const std::string timezone_1 = "America/Denver";
- const std::string timezone_2 = "America/Chicago";
-
GeoclueTimezone tz;
wait_msec(500); // wait for the bus to get set up
EXPECT_EQ(timezone_1, tz.timezone.get());
- // start listening for a timezone change, then change the timezone
+ // Start listening for a timezone change, then change the timezone.
bool changed = false;
auto connection = tz.timezone.changed().connect(
@@ -88,10 +41,8 @@ TEST_F(TimezoneGeoclueFixture, ChangeDetected)
g_main_loop_quit(loop);
});
+ const std::string timezone_2 = "America/Chicago";
setGeoclueTimezoneOnIdle(timezone_2);
- //g_timeout_add(50, emit_address_changed_idle, new EmitAddressChangedData(mock, obj_client, timezone_2.c_str()));
g_main_loop_run(loop);
EXPECT_EQ(timezone_2, tz.timezone.get());
}
-
-