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

[users] Sanitize tests

Browse Source 
- move the testing of config-object methods to its own tests
- simplify file structure for the password job tests
This commit is contained in:
Adriaan de Groot 2020-07-29 13:31:39 +02:00
parent cc1136fb0e
commit 892e9798f4
6 changed files with 141 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/users/CMakeLists.txt
View File

@ -55,7 +55,6 @@ calamares_add_test(
SOURCES
TestCreateUserJob.cpp
CreateUserJob.cpp
Config.cpp
)
calamares_add_test(
@ -66,3 +65,10 @@ calamares_add_test(
LIBRARIES
Qt5::DBus
)
calamares_add_test(
userstest
SOURCES
Tests.cpp
Config.cpp
)

58
src/modules/users/TestCreateUserJob.cpp
View File

@ -17,7 +17,6 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include "Config.h"
#include "CreateUserJob.h"
#include "utils/Logger.h"
@ -27,7 +26,6 @@
// Implementation details
extern QStringList groupsInTargetSystem( const QDir& targetRoot ); // CreateUserJob
extern void setConfigurationDefaultGroups( const QVariantMap& map, QStringList& defaultGroups );
class CreateUserTests : public QObject
{
@ -40,7 +38,6 @@ private Q_SLOTS:
void initTestCase();
void testReadGroup();
void testDefaultGroups();
};
CreateUserTests::CreateUserTests() {}
@ -75,61 +72,6 @@ CreateUserTests::testReadGroup()
}
}
void
CreateUserTests::testDefaultGroups()
{
{
QStringList groups;
QVariantMap hweelGroup;
QVERIFY( groups.isEmpty() );
hweelGroup.insert( "defaultGroups", QStringList { "hweel" } );
setConfigurationDefaultGroups( hweelGroup, groups );
QCOMPARE( groups.count(), 1 );
QVERIFY( groups.contains( "hweel" ) );
}
{
QStringList desired { "wheel", "root", "operator" };
QStringList groups;
QVariantMap threeGroup;
QVERIFY( groups.isEmpty() );
threeGroup.insert( "defaultGroups", desired );
setConfigurationDefaultGroups( threeGroup, groups );
QCOMPARE( groups.count(), 3 );
QVERIFY( !groups.contains( "hweel" ) );
QCOMPARE( groups, desired );
}
{
QStringList groups;
QVariantMap explicitEmpty;
QVERIFY( groups.isEmpty() );
explicitEmpty.insert( "defaultGroups", QStringList() );
setConfigurationDefaultGroups( explicitEmpty, groups );
QCOMPARE( groups.count(), 0 );
}
{
QStringList groups;
QVariantMap missing;
QVERIFY( groups.isEmpty() );
setConfigurationDefaultGroups( missing, groups );
QCOMPARE( groups.count(), 6 ); // because of fallback!
QVERIFY( groups.contains( "lp" ) );
}
{
QStringList groups;
QVariantMap typeMismatch;
QVERIFY( groups.isEmpty() );
typeMismatch.insert( "defaultGroups", 1 );
setConfigurationDefaultGroups( typeMismatch, groups );
QCOMPARE( groups.count(), 6 ); // because of fallback!
QVERIFY( groups.contains( "lp" ) );
}
}
QTEST_GUILESS_MAIN( CreateUserTests )
#include "utils/moc-warnings.h"

23
src/modules/users/TestPasswordJob.cpp
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2017, Adriaan de Groot <groot@kde.org>
* SPDX-FileCopyrightText: 2017 Adriaan de Groot <groot@kde.org>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -18,11 +19,19 @@
#include "SetPasswordJob.h"
#include "TestPasswordJob.h"
#include <QtTest/QtTest>
QTEST_GUILESS_MAIN( PasswordTests )
class PasswordTests : public QObject
{
Q_OBJECT
public:
PasswordTests();
~PasswordTests() override;
private Q_SLOTS:
void initTestCase();
void testSalt();
};
PasswordTests::PasswordTests() {}
@ -48,3 +57,9 @@ PasswordTests::testSalt()
QVERIFY( s.endsWith( '$' ) );
qDebug() << "Obtained salt" << s;
}
QTEST_GUILESS_MAIN( PasswordTests )
#include "utils/moc-warnings.h"
#include "TestPasswordJob.moc"

36
src/modules/users/TestPasswordJob.h
View File

@ -1,36 +0,0 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2017, Adriaan de Groot <groot@kde.org>
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Calamares is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PASSWORDTESTS_H
#define PASSWORDTESTS_H
#include <QObject>
class PasswordTests : public QObject
{
Q_OBJECT
public:
PasswordTests();
~PasswordTests() override;
private Q_SLOTS:
void initTestCase();
void testSalt();
};
#endif

3
src/modules/users/TestSetHostNameJob.cpp
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2020, Adriaan de Groot <groot@kde.org>
* SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

113
src/modules/users/Tests.cpp Normal file
View File

@ -0,0 +1,113 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Calamares is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include "Config.h"
#include "utils/Logger.h"
#include <QtTest/QtTest>
// Implementation details
extern void setConfigurationDefaultGroups( const QVariantMap& map, QStringList& defaultGroups );
/** @brief Test Config object methods and internals
*
*/
class UserTests : public QObject
{
Q_OBJECT
public:
UserTests();
virtual ~UserTests() {}
private Q_SLOTS:
void initTestCase();
void testDefaultGroups();
};
UserTests::UserTests() {}
void
UserTests::initTestCase()
{
Logger::setupLogLevel( Logger::LOGDEBUG );
cDebug() << "Users test started.";
}
void
UserTests::testDefaultGroups()
{
{
QStringList groups;
QVariantMap hweelGroup;
QVERIFY( groups.isEmpty() );
hweelGroup.insert( "defaultGroups", QStringList { "hweel" } );
setConfigurationDefaultGroups( hweelGroup, groups );
QCOMPARE( groups.count(), 1 );
QVERIFY( groups.contains( "hweel" ) );
}
{
QStringList desired { "wheel", "root", "operator" };
QStringList groups;
QVariantMap threeGroup;
QVERIFY( groups.isEmpty() );
threeGroup.insert( "defaultGroups", desired );
setConfigurationDefaultGroups( threeGroup, groups );
QCOMPARE( groups.count(), 3 );
QVERIFY( !groups.contains( "hweel" ) );
QCOMPARE( groups, desired );
}
{
QStringList groups;
QVariantMap explicitEmpty;
QVERIFY( groups.isEmpty() );
explicitEmpty.insert( "defaultGroups", QStringList() );
setConfigurationDefaultGroups( explicitEmpty, groups );
QCOMPARE( groups.count(), 0 );
}
{
QStringList groups;
QVariantMap missing;
QVERIFY( groups.isEmpty() );
setConfigurationDefaultGroups( missing, groups );
QCOMPARE( groups.count(), 6 ); // because of fallback!
QVERIFY( groups.contains( "lp" ) );
}
{
QStringList groups;
QVariantMap typeMismatch;
QVERIFY( groups.isEmpty() );
typeMismatch.insert( "defaultGroups", 1 );
setConfigurationDefaultGroups( typeMismatch, groups );
QCOMPARE( groups.count(), 6 ); // because of fallback!
QVERIFY( groups.contains( "lp" ) );
}
}
QTEST_GUILESS_MAIN( UserTests )
#include "utils/moc-warnings.h"
#include "Tests.moc"