napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[locale] Test TZ images properly

Browse Source 
- the test wasn't built with DEBUG_TIMEZONES, so it didn't get the
   overlap-checking code at all.
This commit is contained in:
Adriaan de Groot 2020-04-15 14:30:10 +02:00
parent d23eadbfda
commit cd66405363
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/locale/CMakeLists.txt
View File

@ -40,6 +40,7 @@ calamares_add_test(
timezonewidget/TimeZoneImage.cpp timezonewidget/TimeZoneImage.cpp
DEFINITIONS DEFINITIONS
SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images" SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images"
DEBUG_TIMEZONES=1
LIBRARIES LIBRARIES
Qt5::Gui Qt5::Gui
) )

6
src/modules/locale/Tests.cpp
View File

@ -28,9 +28,9 @@
QTEST_MAIN( LocaleTests ) QTEST_MAIN( LocaleTests )
LocaleTests::LocaleTests() {} LocaleTests::LocaleTests() { }
LocaleTests::~LocaleTests() {} LocaleTests::~LocaleTests() { }
void void
LocaleTests::initTestCase() LocaleTests::initTestCase()
@ -126,6 +126,7 @@ LocaleTests::testTZImages()
Logger::setupLogLevel( Logger::LOGERROR ); Logger::setupLogLevel( Logger::LOGERROR );
const auto zones = region->zones(); const auto zones = region->zones();
QVERIFY( zones.count() > 0 );
for ( const auto* pz : zones ) for ( const auto* pz : zones )
{ {
const TZZone* zone = dynamic_cast< const TZZone* >( pz ); const TZZone* zone = dynamic_cast< const TZZone* >( pz );
@ -134,6 +135,7 @@ LocaleTests::testTZImages()
int overlap = 0; int overlap = 0;
auto pos = images.getLocationPosition( zone->longitude(), zone->latitude() ); auto pos = images.getLocationPosition( zone->longitude(), zone->latitude() );
QVERIFY( images.index( pos, overlap ) >= 0 ); QVERIFY( images.index( pos, overlap ) >= 0 );
QVERIFY( overlap > 0 ); // At least one image contains the spot
if ( overlap > 1 ) if ( overlap > 1 )
{ {
Logger::setupLogLevel( Logger::LOGDEBUG ); Logger::setupLogLevel( Logger::LOGDEBUG );