From cd6640536390c7e6d9aabc880f263a48964a0003 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 15 Apr 2020 14:30:10 +0200
Subject: [PATCH] [locale] Test TZ images properly

 - the test wasn't built with DEBUG_TIMEZONES, so it didn't get the
   overlap-checking code at all.
---
 src/modules/locale/CMakeLists.txt | 1 +
 src/modules/locale/Tests.cpp      | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt
index 9813d17b1..a09bde282 100644
--- a/src/modules/locale/CMakeLists.txt
+++ b/src/modules/locale/CMakeLists.txt
@@ -40,6 +40,7 @@ calamares_add_test(
         timezonewidget/TimeZoneImage.cpp
     DEFINITIONS
         SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images"
+        DEBUG_TIMEZONES=1
     LIBRARIES
         Qt5::Gui
 )
diff --git a/src/modules/locale/Tests.cpp b/src/modules/locale/Tests.cpp
index f547af0f8..8104966a4 100644
--- a/src/modules/locale/Tests.cpp
+++ b/src/modules/locale/Tests.cpp
@@ -28,9 +28,9 @@
 QTEST_MAIN( LocaleTests )
 
 
-LocaleTests::LocaleTests() {}
+LocaleTests::LocaleTests() { }
 
-LocaleTests::~LocaleTests() {}
+LocaleTests::~LocaleTests() { }
 
 void
 LocaleTests::initTestCase()
@@ -126,6 +126,7 @@ LocaleTests::testTZImages()
         Logger::setupLogLevel( Logger::LOGERROR );
 
         const auto zones = region->zones();
+        QVERIFY( zones.count() > 0 );
         for ( const auto* pz : zones )
         {
             const TZZone* zone = dynamic_cast< const TZZone* >( pz );
@@ -134,6 +135,7 @@ LocaleTests::testTZImages()
             int overlap = 0;
             auto pos = images.getLocationPosition( zone->longitude(), zone->latitude() );
             QVERIFY( images.index( pos, overlap ) >= 0 );
+            QVERIFY( overlap > 0 );  // At least one image contains the spot
             if ( overlap > 1 )
             {
                 Logger::setupLogLevel( Logger::LOGDEBUG );