[partition] Expand tests to ClearMountsJob
- This is a tiny bit of TDD to replace the existing implementation (a shell pipeline) with processing inside Calamares. - The test fails right now, since the implementations are not the same.
This commit is contained in:
parent
b1ccd573f8
commit
d16c75b15c
@ -1,17 +1,9 @@
|
|||||||
find_package( Qt5 COMPONENTS Gui REQUIRED )
|
find_package( Qt5 COMPONENTS Gui REQUIRED )
|
||||||
|
|
||||||
|
# Roundabout way of saying ..
|
||||||
set( PartitionModule_SOURCE_DIR .. )
|
set( PartitionModule_SOURCE_DIR .. )
|
||||||
|
# This is set by parent CMakeLists.txt
|
||||||
set( partitionjobtests_SRCS
|
# set( _partition_defs )
|
||||||
${PartitionModule_SOURCE_DIR}/core/KPMHelpers.cpp
|
|
||||||
${PartitionModule_SOURCE_DIR}/core/PartitionInfo.cpp
|
|
||||||
${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionJob.cpp
|
|
||||||
${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionTableJob.cpp
|
|
||||||
${PartitionModule_SOURCE_DIR}/jobs/DeletePartitionJob.cpp
|
|
||||||
${PartitionModule_SOURCE_DIR}/jobs/PartitionJob.cpp
|
|
||||||
${PartitionModule_SOURCE_DIR}/jobs/ResizePartitionJob.cpp
|
|
||||||
PartitionJobTests.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
${Qt5Gui_INCLUDE_DIRS}
|
${Qt5Gui_INCLUDE_DIRS}
|
||||||
@ -21,7 +13,16 @@ include_directories(
|
|||||||
)
|
)
|
||||||
|
|
||||||
if( ECM_FOUND AND BUILD_TESTING )
|
if( ECM_FOUND AND BUILD_TESTING )
|
||||||
ecm_add_test( ${partitionjobtests_SRCS}
|
ecm_add_test(
|
||||||
|
${PartitionModule_SOURCE_DIR}/core/KPMHelpers.cpp
|
||||||
|
${PartitionModule_SOURCE_DIR}/core/PartitionInfo.cpp
|
||||||
|
${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionJob.cpp
|
||||||
|
${PartitionModule_SOURCE_DIR}/jobs/CreatePartitionTableJob.cpp
|
||||||
|
${PartitionModule_SOURCE_DIR}/jobs/DeletePartitionJob.cpp
|
||||||
|
${PartitionModule_SOURCE_DIR}/jobs/PartitionJob.cpp
|
||||||
|
${PartitionModule_SOURCE_DIR}/jobs/ResizePartitionJob.cpp
|
||||||
|
PartitionJobTests.cpp
|
||||||
|
|
||||||
TEST_NAME partitionjobtests
|
TEST_NAME partitionjobtests
|
||||||
LINK_LIBRARIES
|
LINK_LIBRARIES
|
||||||
${CALAMARES_LIBRARIES}
|
${CALAMARES_LIBRARIES}
|
||||||
@ -32,4 +33,20 @@ if( ECM_FOUND AND BUILD_TESTING )
|
|||||||
|
|
||||||
set_target_properties( partitionjobtests PROPERTIES AUTOMOC TRUE )
|
set_target_properties( partitionjobtests PROPERTIES AUTOMOC TRUE )
|
||||||
target_compile_definitions( partitionjobtests PRIVATE ${_partition_defs} )
|
target_compile_definitions( partitionjobtests PRIVATE ${_partition_defs} )
|
||||||
|
|
||||||
|
ecm_add_test(
|
||||||
|
${PartitionModule_SOURCE_DIR}/jobs/ClearMountsJob.cpp
|
||||||
|
ClearMountsJobTests.cpp
|
||||||
|
|
||||||
|
TEST_NAME clearmountsjobtests
|
||||||
|
LINK_LIBRARIES
|
||||||
|
${CALAMARES_LIBRARIES}
|
||||||
|
kpmcore
|
||||||
|
Qt5::Core
|
||||||
|
Qt5::Test
|
||||||
|
)
|
||||||
|
|
||||||
|
set_target_properties( clearmountsjobtests PROPERTIES AUTOMOC TRUE )
|
||||||
|
target_compile_definitions( clearmountsjobtests PRIVATE ${_partition_defs} )
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
55
src/modules/partition/tests/ClearMountsJobTests.cpp
Normal file
55
src/modules/partition/tests/ClearMountsJobTests.cpp
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
/* === This file is part of Calamares - <https://github.com/calamares> ===
|
||||||
|
*
|
||||||
|
* Copyright 2019, 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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "ClearMountsJobTests.h"
|
||||||
|
|
||||||
|
#include "utils/Logger.h"
|
||||||
|
|
||||||
|
#include <QtTest/QtTest>
|
||||||
|
|
||||||
|
QTEST_GUILESS_MAIN( ClearMountsJobTests )
|
||||||
|
|
||||||
|
|
||||||
|
/* Not exactly public API */
|
||||||
|
QStringList
|
||||||
|
getPartitionsForDevice( const QString& deviceName );
|
||||||
|
|
||||||
|
QStringList
|
||||||
|
getPartitionsForDevice_other(const QString& deviceName)
|
||||||
|
{
|
||||||
|
QStringList partitions;
|
||||||
|
|
||||||
|
return partitions;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
ClearMountsJobTests::ClearMountsJobTests()
|
||||||
|
{
|
||||||
|
Logger::setupLogLevel(6);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ClearMountsJobTests::testFindPartitions()
|
||||||
|
{
|
||||||
|
QStringList partitions = getPartitionsForDevice( "sda" );
|
||||||
|
QStringList other_part = getPartitionsForDevice_other( "sda" );
|
||||||
|
|
||||||
|
cDebug() << "Initial implementation:" << Logger::DebugList( partitions );
|
||||||
|
cDebug() << "Other implementation:" << Logger::DebugList( other_part );
|
||||||
|
|
||||||
|
QCOMPARE( partitions, other_part );
|
||||||
|
}
|
34
src/modules/partition/tests/ClearMountsJobTests.h
Normal file
34
src/modules/partition/tests/ClearMountsJobTests.h
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
/* === This file is part of Calamares - <https://github.com/calamares> ===
|
||||||
|
*
|
||||||
|
* Copyright 2019, 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 CLEARMOUNTSJOBTESTS_H
|
||||||
|
#define CLEARMOUNTSJOBTESTS_H
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
|
||||||
|
class ClearMountsJobTests : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
ClearMountsJobTests();
|
||||||
|
|
||||||
|
private Q_SLOTS:
|
||||||
|
void testFindPartitions();
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue
Block a user