[fsresizer] Add tests

- Test the parsing of configuration values, that it gets the right
   values when given correct(-ish) configurations. Doesn't test
   any situations with bad config.

src/modules/fsresizer/CMakeLists.txt

@@ -1,5 +1,3 @@
-find_package(ECM ${ECM_VERSION} REQUIRED NO_MODULE)
-
 find_package( KPMcore 3.3 )
 find_package( Qt5 REQUIRED DBus )  # Needed for KPMCore
 find_package( KF5 REQUIRED I18n WidgetsAddons )  # Needed for KPMCore
@@ -22,6 +20,26 @@ if ( 1 ) # KPMcore_FOUND )
             calamares
         SHARED_LIB
     )
+    
+    if( ECM_FOUND )
+        find_package( Qt5 COMPONENTS Test REQUIRED )
+        include( ECMAddTests )
+
+        ecm_add_test(
+                Tests.cpp
+            TEST_NAME
+                fsresizertest
+            LINK_LIBRARIES
+                ${CALAMARES_LIBRARIES}
+                calamares
+                calamares_job_fsresizer  # From above
+                ${YAMLCPP_LIBRARY}
+                Qt5::Core
+                Qt5::Test
+        )
+        set_target_properties( fsresizertest PROPERTIES AUTOMOC TRUE )
+        target_include_directories(fsresizertest PRIVATE /usr/local/include )
+    endif()
 else()
     calamares_skip_module( "fsresizer (missing suitable KPMcore)" )
 endif()

src/modules/fsresizer/Tests.cpp

@@ -0,0 +1,126 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2017-2018, 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 "Tests.h"
+
+#include "GlobalStorage.h"
+#include "JobQueue.h"
+#include "Settings.h"
+
+#include "utils/Logger.h"
+#include "utils/YamlUtils.h"
+
+#include <yaml-cpp/yaml.h>
+
+#include <QtTest/QtTest>
+
+#include <QFileInfo>
+#include <QStringList>
+
+#define private public
+#include "ResizeFSJob.h"
+#undef private
+
+QTEST_GUILESS_MAIN( FSResizerTests )
+
+FSResizerTests::FSResizerTests()
+{
+}
+
+FSResizerTests::~FSResizerTests()
+{
+}
+
+void
+FSResizerTests::initTestCase()
+{
+}
+
+void FSResizerTests::testConfigurationRobust()
+{
+    ResizeFSJob j;
+    
+    // Empty config
+    j.setConfigurationMap( QVariantMap() );
+    QVERIFY( j.m_fsname.isEmpty() );
+    QVERIFY( j.m_devicename.isEmpty() );
+    QCOMPARE( j.m_size.unit(), ResizeFSJob::RelativeSize::None );
+    QCOMPARE( j.m_atleast.unit(), ResizeFSJob::RelativeSize::None );
+
+    // Config is missing fs and dev, so it isn't valid
+    YAML::Node doc0 = YAML::Load( R"(---
+size: 100%
+atleast: 600MiB
+)" );
+    j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() );
+    QVERIFY( j.m_fsname.isEmpty() );
+    QVERIFY( j.m_devicename.isEmpty() );
+    QCOMPARE( j.m_size.unit(), ResizeFSJob::RelativeSize::None );
+    QCOMPARE( j.m_atleast.unit(), ResizeFSJob::RelativeSize::None );
+    QCOMPARE( j.m_size.value(), 0 );
+    QCOMPARE( j.m_atleast.value(), 0 );
+}    
+
+void FSResizerTests::testConfigurationValues()
+{
+    ResizeFSJob j;
+
+    // Check both 
+    YAML::Node doc0 = YAML::Load( R"(---
+fs: /
+size: 100%
+atleast: 600MiB
+)" );
+    j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() );
+    QVERIFY( !j.m_fsname.isEmpty() );
+    QVERIFY( j.m_devicename.isEmpty() );
+    QCOMPARE( j.m_size.unit(), ResizeFSJob::RelativeSize::Percent );
+    QCOMPARE( j.m_atleast.unit(), ResizeFSJob::RelativeSize::Absolute );
+    QCOMPARE( j.m_size.value(), 100 );
+    QCOMPARE( j.m_atleast.value(), 600 );
+
+    // Silly config
+    doc0 = YAML::Load( R"(---
+fs: /
+dev: /dev/m00
+size: 72  MiB
+atleast: 127 %
+)" );
+    j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() );
+    QVERIFY( !j.m_fsname.isEmpty() );
+    QVERIFY( !j.m_devicename.isEmpty() );
+    QCOMPARE( j.m_size.unit(), ResizeFSJob::RelativeSize::Absolute );
+    QCOMPARE( j.m_atleast.unit(), ResizeFSJob::RelativeSize::Percent );
+    QCOMPARE( j.m_size.value(), 72 );
+    QCOMPARE( j.m_atleast.value(), 127 );
+
+    // Silly config
+    doc0 = YAML::Load( R"(---
+fs: /
+# dev: /dev/m00
+size: 71MiB
+# atleast: 127%
+)" );
+    j.setConfigurationMap( CalamaresUtils::yamlMapToVariant( doc0 ).toMap() );
+    QVERIFY( !j.m_fsname.isEmpty() );
+    QVERIFY( j.m_devicename.isEmpty() );
+    QCOMPARE( j.m_size.unit(), ResizeFSJob::RelativeSize::Absolute );
+    QCOMPARE( j.m_atleast.unit(), ResizeFSJob::RelativeSize::None );
+    QCOMPARE( j.m_size.value(), 71 );
+    QCOMPARE( j.m_atleast.value(), 0 );
+}

src/modules/fsresizer/Tests.h

@@ -0,0 +1,39 @@
+/* === This file is part of Calamares - <https://github.com/calamares> ===
+ *
+ *   Copyright 2018, 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 TESTS_H
+#define TESTS_H
+
+#include <QObject>
+
+class FSResizerTests : public QObject
+{
+    Q_OBJECT
+public:
+    FSResizerTests();
+    ~FSResizerTests() override;
+
+private Q_SLOTS:
+    void initTestCase();
+    // Can handle missing values
+    void testConfigurationRobust();
+    // Can parse % and MiB values
+    void testConfigurationValues();
+};
+
+#endif