summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2018-03-08 13:03:30 +0100
committerBastien Nocera <hadess@hadess.net>2018-03-08 23:45:01 +0100
commit34f1cdccc622a382dcdca40d00a9ab3a29482f0f (patch)
treeddac9922f067a8bd1d5d19f4756d5f9e03f83193
parent81d39c6198f329ac2554f362b26cc9500b8fa83b (diff)
downloadlibgweather-34f1cdccc622a382dcdca40d00a9ab3a29482f0f.tar.gz
tests: Rename "bad" duplicate weather station test
Rename the test as it's checking whether weather stations are badly duplicated, not whether they're unique in the state or country. Duplicate weather stations are allowed across state and country borders. https://bugzilla.gnome.org/show_bug.cgi?id=792328
-rw-r--r--libgweather/test_libgweather.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
index 5342d35..4b56cb3 100644
--- a/libgweather/test_libgweather.c
+++ b/libgweather/test_libgweather.c
@@ -292,9 +292,9 @@ test_metar_weather_stations (void)
}
static void
-check_duplicate_weather_stations (gpointer key,
- gpointer value,
- gpointer user_data)
+check_bad_duplicate_weather_stations (gpointer key,
+ gpointer value,
+ gpointer user_data)
{
GPtrArray *stations = value;
GHashTable *dedup;
@@ -327,8 +327,8 @@ out:
}
static void
-test_duplicate_weather_stations_children (GWeatherLocation *location,
- GHashTable *stations_ht)
+test_bad_duplicate_weather_stations_children (GWeatherLocation *location,
+ GHashTable *stations_ht)
{
GWeatherLocation **children;
guint i;
@@ -347,25 +347,26 @@ test_duplicate_weather_stations_children (GWeatherLocation *location,
g_ptr_array_add (stations, children[i]);
g_hash_table_insert (stations_ht, g_strdup (code), stations);
} else {
- test_duplicate_weather_stations_children (children[i], stations_ht);
+ test_bad_duplicate_weather_stations_children (children[i], stations_ht);
}
}
}
static void
-test_duplicate_weather_stations (void)
+test_bad_duplicate_weather_stations (void)
{
GWeatherLocation *world;
GHashTable *stations_ht;
+ g_setenv ("LIBGWEATHER_LOCATIONS_NO_NEAREST", "1", TRUE);
world = gweather_location_get_world ();
g_assert (world);
stations_ht = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, (GDestroyNotify) NULL);
- test_duplicate_weather_stations_children (world, stations_ht);
+ test_bad_duplicate_weather_stations_children (world, stations_ht);
- g_hash_table_foreach (stations_ht, check_duplicate_weather_stations, NULL);
+ g_hash_table_foreach (stations_ht, check_bad_duplicate_weather_stations, NULL);
}
static void
@@ -393,7 +394,8 @@ main (int argc, char *argv[])
g_test_add_func ("/weather/timezones", test_timezones);
g_test_add_func ("/weather/airport_distance_sanity", test_airport_distance_sanity);
g_test_add_func ("/weather/metar_weather_stations", test_metar_weather_stations);
- g_test_add_func ("/weather/duplicate_weather_stations", test_duplicate_weather_stations);
+ /* Modifies environment, so needs to run last */
+ g_test_add_func ("/weather/bad_duplicate_weather_stations", test_bad_duplicate_weather_stations);
return g_test_run ();
}