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

[libcalamares] Test config filenames as well (custom vs standard)

Browse Source
This commit is contained in:
Adriaan de Groot 2020-08-11 13:27:15 +02:00
parent 1f57a99ff2
commit e507338f4c
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/libcalamares/Tests.cpp
View File

@ -421,13 +421,11 @@ sequence:
return d.isValid() && d.key().module() == moduleKey;
};
const auto it0 = std::find_if(
s.moduleInstances().constBegin(), s.moduleInstances().constEnd(), moduleFinder );
const auto it0 = std::find_if( s.moduleInstances().constBegin(), s.moduleInstances().constEnd(), moduleFinder );
QVERIFY( it0 != s.moduleInstances().constEnd() );
moduleKey = QString( "derp" );
const auto it1 = std::find_if(
s.moduleInstances().constBegin(), s.moduleInstances().constEnd(), moduleFinder );
const auto it1 = std::find_if( s.moduleInstances().constBegin(), s.moduleInstances().constEnd(), moduleFinder );
QVERIFY( it1 == s.moduleInstances().constEnd() );
int validCount = 0;
@ -435,10 +433,31 @@ sequence:
for ( const auto& d : s.moduleInstances() )
{
if ( d.isValid() )
{
validCount++;
}
if ( d.isCustom() )
{
customCount++;
}
QVERIFY( d.isCustom() ? d.isValid() : true ); // All custom entries are valid
if ( !d.isCustom() )
{
QCOMPARE( d.configFileName(), QString( "%1.conf" ).arg( d.key().module() ) );
}
else
{
// Specific cases from this config file
if ( d.key().id() == QString( "yo" ) )
{
QCOMPARE( d.configFileName(), QString( "yolo.conf" ) );
}
else
{
QCOMPARE( d.configFileName(), QString( "welcome.conf" ) ); // Not set in the settings data
}
}
}
QCOMPARE( customCount, 2 );
QCOMPARE( validCount, 4 ); // welcome@hi is listed twice, in *show* and *exec*