fly/flightgear
1
0
Fork 0
Code Activity

TestSuite: Migration of the Add-ons management unit tests.

Browse source
This commit is contained in:
Edward d'Auvergne 2018-03-13 10:37:44 +01:00
parent d51e21c667
commit 85ad420be1
7 changed files with 155 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Add-ons/CMakeLists.txt
View file

@ -21,7 +21,3 @@ set(HEADERS addon_fwd.hxx
)
flightgear_component(AddonManagement "${SOURCES}" "${HEADERS}")
if (COMMAND flightgear_test)
flightgear_test(test_AddonManagement test_AddonManagement.cxx)
endif()

1
test_suite/CMakeLists.txt
View file

@ -52,6 +52,7 @@ endif()
# System test suites.
# Unit test suites.
add_test(AddonManagementUnitTests ${TESTSUITE_OUTPUT_DIR}/run_test_suite --ctest -u AddonManagementTests)
add_test(FlightplanUnitTests ${TESTSUITE_OUTPUT_DIR}/run_test_suite --ctest -u FlightplanTests)
add_test(LaRCSimMatrixUnitTests ${TESTSUITE_OUTPUT_DIR}/run_test_suite --ctest -u LaRCSimMatrixTests)
add_test(MktimeUnitTests ${TESTSUITE_OUTPUT_DIR}/run_test_suite --ctest -u MktimeTests)

12
test_suite/unit_tests/Add-ons/CMakeLists.txt Normal file
View file

@ -0,0 +1,12 @@
set(TESTSUITE_SOURCES
${TESTSUITE_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/TestSuite.cxx
${CMAKE_CURRENT_SOURCE_DIR}/test_AddonManagement.cxx
PARENT_SCOPE
)
set(TESTSUITE_HEADERS
${TESTSUITE_HEADERS}
${CMAKE_CURRENT_SOURCE_DIR}/test_AddonManagement.hxx
PARENT_SCOPE
)

24
test_suite/unit_tests/Add-ons/TestSuite.cxx Normal file
View file

@ -0,0 +1,24 @@
/*
* Copyright (C) 2018 Edward d'Auvergne
*
* This file is part of the program FlightGear.
*
* This program 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 2 of the License, or
* (at your option) any later version.
*
* This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "test_AddonManagement.hxx"
// Set up the unit tests.
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(AddonManagementTests, "Unit tests");

137
src/Add-ons/test_AddonManagement.cxx → test_suite/unit_tests/Add-ons/test_AddonManagement.cxx
View file

@ -18,8 +18,10 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include "test_AddonManagement.hxx"
#include "config.h"
#include "unitTestHelpers.hxx"
#include "tests/unitTestHelpers.hxx"
#include <sstream>
#include <string>
@ -30,11 +32,10 @@
#include <cassert>
#include <cstddef>
#include <simgear/misc/test_macros.hxx>
#include "Add-ons/Addon.hxx"
#include "Add-ons/AddonVersion.hxx"
using std::string;
using std::vector;
@ -43,7 +44,8 @@ using flightgear::addons::AddonVersion;
using flightgear::addons::AddonVersionSuffix;
void testAddonVersionSuffix()
void AddonManagementTests::testAddonVersionSuffix()
{
using AddonRelType = flightgear::addons::AddonVersionSuffixPrereleaseType;
@ -52,44 +54,44 @@ void testAddonVersionSuffix()
AddonVersionSuffix v1(AddonRelType::beta, 2, true, 5);
AddonVersionSuffix v1Copy(v1);
AddonVersionSuffix v1NonDev(AddonRelType::beta, 2, false);
SG_CHECK_EQUAL(v1, v1Copy);
SG_CHECK_EQUAL(v1, AddonVersionSuffix("b2.dev5"));
SG_CHECK_EQUAL_NOSTREAM(v1.makeTuple(),
CPPUNIT_ASSERT_EQUAL(v1, v1Copy);
CPPUNIT_ASSERT_EQUAL(v1, AddonVersionSuffix("b2.dev5"));
CPPUNIT_ASSERT(v1.makeTuple() ==
std::make_tuple(AddonRelType::beta, 2, true, 5));
SG_CHECK_EQUAL(AddonVersionSuffix(), AddonVersionSuffix(""));
CPPUNIT_ASSERT_EQUAL(AddonVersionSuffix(), AddonVersionSuffix(""));
// A simple comparison
SG_CHECK_LT(v1, v1NonDev); // b2.dev5 < b2
CPPUNIT_ASSERT(v1 < v1NonDev); // b2.dev5 < b2
// Check string representation with str()
SG_CHECK_EQUAL(AddonVersionSuffix(AddonRelType::none).str(), "");
SG_CHECK_EQUAL(AddonVersionSuffix(AddonRelType::none, 0, true, 12).str(),
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::none).str() == "");
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::none, 0, true, 12).str() ==
".dev12");
SG_CHECK_EQUAL(AddonVersionSuffix(AddonRelType::alpha, 1).str(), "a1");
SG_CHECK_EQUAL(AddonVersionSuffix(AddonRelType::alpha, 1, false).str(), "a1");
SG_CHECK_EQUAL(AddonVersionSuffix(AddonRelType::alpha, 2, true, 4).str(),
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::alpha, 1).str() == "a1");
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::alpha, 1, false).str() == "a1");
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::alpha, 2, true, 4).str() ==
"a2.dev4");
SG_CHECK_EQUAL(AddonVersionSuffix(AddonRelType::beta, 1).str(), "b1");
SG_CHECK_EQUAL(AddonVersionSuffix(AddonRelType::beta, 1, false).str(), "b1");
SG_CHECK_EQUAL(AddonVersionSuffix(AddonRelType::beta, 2, true, 4).str(),
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::beta, 1).str() == "b1");
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::beta, 1, false).str() == "b1");
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::beta, 2, true, 4).str() ==
"b2.dev4");
SG_CHECK_EQUAL(AddonVersionSuffix(AddonRelType::candidate, 1).str(), "rc1");
SG_CHECK_EQUAL(AddonVersionSuffix(AddonRelType::candidate, 1, false).str(),
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::candidate, 1).str() == "rc1");
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::candidate, 1, false).str() ==
"rc1");
SG_CHECK_EQUAL(AddonVersionSuffix(AddonRelType::candidate, 2, true, 4).str(),
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::candidate, 2, true, 4).str() ==
"rc2.dev4");
// Check stream output
std::ostringstream oss;
oss << AddonVersionSuffix(AddonRelType::candidate, 2, true, 4);
SG_CHECK_EQUAL(oss.str(), "rc2.dev4");
CPPUNIT_ASSERT(oss.str() == "rc2.dev4");
// Check ordering with all types of transitions, using operator<()
auto checkStrictOrdering = [](const vector<AddonVersionSuffix>& v) {
assert(v.size() > 1);
for (std::size_t i=0; i < v.size() - 1; i++) {
SG_CHECK_LT(v[i], v[i+1]);
CPPUNIT_ASSERT(v[i] < v[i+1]);
}
};
@ -120,27 +122,27 @@ void testAddonVersionSuffix()
});
// Check operator>() and operator!=()
SG_CHECK_GT(AddonVersionSuffix(AddonRelType::none),
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::none) >
AddonVersionSuffix(AddonRelType::candidate, 21, false));
SG_CHECK_NE(AddonVersionSuffix(AddonRelType::none),
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::none) !=
AddonVersionSuffix(AddonRelType::candidate, 21, false));
// Check operator<=() and operator>=()
SG_CHECK_LE(AddonVersionSuffix(AddonRelType::candidate, 2, false),
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::candidate, 2, false) <=
AddonVersionSuffix(AddonRelType::candidate, 2, false));
SG_CHECK_LE(AddonVersionSuffix(AddonRelType::candidate, 2, false),
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::candidate, 2, false) <=
AddonVersionSuffix(AddonRelType::none));
SG_CHECK_GE(AddonVersionSuffix(AddonRelType::none),
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::none) >=
AddonVersionSuffix(AddonRelType::none));
SG_CHECK_GE(AddonVersionSuffix(AddonRelType::none),
CPPUNIT_ASSERT(AddonVersionSuffix(AddonRelType::none) >=
AddonVersionSuffix(AddonRelType::candidate, 21, false));
fgtest::shutdownTestGlobals();
}
void testAddonVersion()
void AddonManagementTests::testAddonVersion()
{
using AddonRelType = flightgear::addons::AddonVersionSuffixPrereleaseType;
@ -153,43 +155,43 @@ void testAddonVersion()
AddonVersion v3(std::move(v1Copy));
AddonVersion v4 = std::move(v2);
SG_CHECK_EQUAL(v1, AddonVersion("2017.4.7b2.dev5"));
SG_CHECK_EQUAL(v1, AddonVersion(std::make_tuple(2017, 4, 7, suffix)));
SG_CHECK_EQUAL(v1, v3);
SG_CHECK_EQUAL(v1, v4);
SG_CHECK_LT(v1, AddonVersion("2017.4.7b2"));
SG_CHECK_LE(v1, AddonVersion("2017.4.7b2"));
SG_CHECK_LE(v1, v1);
SG_CHECK_GT(AddonVersion("2017.4.7b2"), v1);
SG_CHECK_GE(AddonVersion("2017.4.7b2"), v1);
SG_CHECK_GE(v1, v1);
SG_CHECK_NE(v1, AddonVersion("2017.4.7b3"));
CPPUNIT_ASSERT_EQUAL(v1, AddonVersion("2017.4.7b2.dev5"));
CPPUNIT_ASSERT_EQUAL(v1, AddonVersion(std::make_tuple(2017, 4, 7, suffix)));
CPPUNIT_ASSERT_EQUAL(v1, v3);
CPPUNIT_ASSERT_EQUAL(v1, v4);
CPPUNIT_ASSERT(v1 < AddonVersion("2017.4.7b2"));
CPPUNIT_ASSERT(v1 <= AddonVersion("2017.4.7b2"));
CPPUNIT_ASSERT(v1 <= v1);
CPPUNIT_ASSERT(AddonVersion("2017.4.7b2") > v1);
CPPUNIT_ASSERT(AddonVersion("2017.4.7b2") >= v1);
CPPUNIT_ASSERT(v1 >= v1);
CPPUNIT_ASSERT(v1 != AddonVersion("2017.4.7b3"));
SG_CHECK_EQUAL(v1.majorNumber(), 2017);
SG_CHECK_EQUAL(v1.minorNumber(), 4);
SG_CHECK_EQUAL(v1.patchLevel(), 7);
SG_CHECK_EQUAL(v1.suffix(), suffix);
CPPUNIT_ASSERT_EQUAL(v1.majorNumber(), 2017);
CPPUNIT_ASSERT_EQUAL(v1.minorNumber(), 4);
CPPUNIT_ASSERT_EQUAL(v1.patchLevel(), 7);
CPPUNIT_ASSERT_EQUAL(v1.suffix(), suffix);
// Round-trips std::string <-> AddonVersion
SG_CHECK_EQUAL(AddonVersion("2017.4.7.dev13").str(), "2017.4.7.dev13");
SG_CHECK_EQUAL(AddonVersion("2017.4.7a2.dev8").str(), "2017.4.7a2.dev8");
SG_CHECK_EQUAL(AddonVersion("2017.4.7a2").str(), "2017.4.7a2");
SG_CHECK_EQUAL(AddonVersion("2017.4.7b2.dev5").str(), "2017.4.7b2.dev5");
SG_CHECK_EQUAL(AddonVersion("2017.4.7b2").str(), "2017.4.7b2");
SG_CHECK_EQUAL(AddonVersion("2017.4.7rc1.dev3").str(), "2017.4.7rc1.dev3");
SG_CHECK_EQUAL(AddonVersion("2017.4.7rc1").str(), "2017.4.7rc1");
SG_CHECK_EQUAL(AddonVersion("2017.4.7").str(), "2017.4.7");
CPPUNIT_ASSERT(AddonVersion("2017.4.7.dev13").str() == "2017.4.7.dev13");
CPPUNIT_ASSERT(AddonVersion("2017.4.7a2.dev8").str() == "2017.4.7a2.dev8");
CPPUNIT_ASSERT(AddonVersion("2017.4.7a2").str() == "2017.4.7a2");
CPPUNIT_ASSERT(AddonVersion("2017.4.7b2.dev5").str() == "2017.4.7b2.dev5");
CPPUNIT_ASSERT(AddonVersion("2017.4.7b2").str() == "2017.4.7b2");
CPPUNIT_ASSERT(AddonVersion("2017.4.7rc1.dev3").str() == "2017.4.7rc1.dev3");
CPPUNIT_ASSERT(AddonVersion("2017.4.7rc1").str() == "2017.4.7rc1");
CPPUNIT_ASSERT(AddonVersion("2017.4.7").str() == "2017.4.7");
// Check stream output
std::ostringstream oss;
oss << AddonVersion("2017.4.7b2.dev5");
SG_CHECK_EQUAL(oss.str(), "2017.4.7b2.dev5");
CPPUNIT_ASSERT(oss.str() == "2017.4.7b2.dev5");
// Check ordering with all types of transitions, using operator<()
auto checkStrictOrdering = [](const vector<AddonVersion>& v) {
assert(v.size() > 1);
for (std::size_t i=0; i < v.size() - 1; i++) {
SG_CHECK_LT(v[i], v[i+1]);
CPPUNIT_ASSERT(v[i] < v[i+1]);
}
};
@ -205,7 +207,7 @@ void testAddonVersion()
fgtest::shutdownTestGlobals();
}
void testAddon()
void AddonManagementTests::testAddon()
{
fgtest::initTestGlobals("Addon");
@ -216,21 +218,21 @@ void testAddon()
addon.setMinFGVersionRequired("2017.4.1");
addon.setMaxFGVersionRequired("none");
SG_CHECK_EQUAL(addon.getId(), addonId);
SG_CHECK_EQUAL(*addon.getVersion(), AddonVersion("2017.2.5rc3"));
SG_CHECK_EQUAL(addon.getBasePath(), SGPath("/path/to/MyGreatAddon"));
SG_CHECK_EQUAL(addon.getMinFGVersionRequired(), "2017.4.1");
CPPUNIT_ASSERT_EQUAL(addon.getId(), addonId);
CPPUNIT_ASSERT_EQUAL(*addon.getVersion(), AddonVersion("2017.2.5rc3"));
CPPUNIT_ASSERT_EQUAL(addon.getBasePath(), SGPath("/path/to/MyGreatAddon"));
CPPUNIT_ASSERT(addon.getMinFGVersionRequired() == "2017.4.1");
const string refText = "addon '" + addonId + "' (version = 2017.2.5rc3, "
"base path = '/path/to/MyGreatAddon', "
"minFGVersionRequired = '2017.4.1', "
"maxFGVersionRequired = 'none')";
SG_CHECK_EQUAL(addon.str(), refText);
CPPUNIT_ASSERT_EQUAL(addon.str(), refText);
// Check stream output
std::ostringstream oss;
oss << addon;
SG_CHECK_EQUAL(oss.str(), refText);
CPPUNIT_ASSERT_EQUAL(oss.str(), refText);
// Set a max FG version and recheck
addon.setMaxFGVersionRequired("2018.2.5");
@ -238,17 +240,8 @@ void testAddon()
"base path = '/path/to/MyGreatAddon', "
"minFGVersionRequired = '2017.4.1', "
"maxFGVersionRequired = '2018.2.5')";
SG_CHECK_EQUAL(addon.getMaxFGVersionRequired(), "2018.2.5");
SG_CHECK_EQUAL(addon.str(), refText2);
CPPUNIT_ASSERT(addon.getMaxFGVersionRequired() == "2018.2.5");
CPPUNIT_ASSERT_EQUAL(addon.str(), refText2);
fgtest::shutdownTestGlobals();
}
int main(int argc, const char* const* argv)
{
testAddonVersionSuffix();
testAddonVersion();
testAddon();
return EXIT_SUCCESS;
}

52
test_suite/unit_tests/Add-ons/test_AddonManagement.hxx Normal file
View file

@ -0,0 +1,52 @@
/*
* Copyright (C) 2018 Edward d'Auvergne
*
* This file is part of the program FlightGear.
*
* This program 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 2 of the License, or
* (at your option) any later version.
*
* This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _FG_ADDON_MANAGEMENT_UNIT_TESTS_HXX
#define _FG_ADDON_MANAGEMENT_UNIT_TESTS_HXX
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/TestFixture.h>
// The unit tests of the Add-on system.
class AddonManagementTests : public CppUnit::TestFixture
{
// Set up the test suite.
CPPUNIT_TEST_SUITE(AddonManagementTests);
CPPUNIT_TEST(testAddon);
CPPUNIT_TEST(testAddonVersion);
CPPUNIT_TEST(testAddonVersionSuffix);
CPPUNIT_TEST_SUITE_END();
public:
// Set up function for each test.
void setUp() {}
// Clean up after each test.
void tearDown() {}
// The tests.
void testAddon();
void testAddonVersion();
void testAddonVersionSuffix();
};
#endif // _FG_ADDON_MANAGEMENT_UNIT_TESTS_HXX

1
test_suite/unit_tests/CMakeLists.txt
View file

@ -1,5 +1,6 @@
# Add each unit test category.
foreach( unit_test_category
Add-ons
general
FDM
Navaids