fly/flightgear
1
0
Fork 0
Code Activity

Add-ons: minor changes

Browse source 
Changes to test_AddonManagement.cxx:

  - in testAddonVersionSuffix(), fgtest::initTestGlobals() was called
    with the wrong test name (not used anyway, but might be in the
    future);

  - in testAddon():
      * rename variable 'm' to 'addon' ('m' used to stand for the old
        class name AddonMetadata);
      * call fgtest::initTestGlobals() and fgtest::shutdownTestGlobals()
        (not technically needed, but cleaner).
This commit is contained in:
Florent Rougon 2017-12-28 08:35:39 +01:00
parent 8cfa799284
commit 3d12ed6ce0
2 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Add-ons/AddonVersion.cxx
View file

@ -264,8 +264,7 @@ AddonVersion::versionStringToTuple(const std::string& versionStr)
// <https://www.python.org/dev/peps/pep-0440/> (always 3 components in the
// release segment, pre-release segment + development release segment; no
// post-release segment allowed).
std::regex versionRegexp(
R"((\d+)\.(\d+).(\d+)(.*))");
std::regex versionRegexp(R"((\d+)\.(\d+).(\d+)(.*))");
std::smatch results;
if (std::regex_match(versionStr, results, versionRegexp)) {

38
src/Add-ons/test_AddonManagement.cxx
View file

@ -47,7 +47,7 @@ void testAddonVersionSuffix()
{
using AddonRelType = flightgear::addons::AddonVersionSuffixPrereleaseType;
fgtest::initTestGlobals("AddonVersion");
fgtest::initTestGlobals("AddonVersionSuffix");
AddonVersionSuffix v1(AddonRelType::beta, 2, true, 5);
AddonVersionSuffix v1Copy(v1);
@ -207,38 +207,42 @@ void testAddonVersion()
void testAddon()
{
Addon m;
std::string addonId = "org.FlightGear.addons.MyGreatAddon";
m.setId(addonId);
m.setVersion(AddonVersion("2017.2.5rc3"));
m.setBasePath(SGPath("/path/to/MyGreatAddon"));
m.setMinFGVersionRequired("2017.4.1");
m.setMaxFGVersionRequired("none");
fgtest::initTestGlobals("Addon");
SG_CHECK_EQUAL(m.getId(), addonId);
SG_CHECK_EQUAL(*m.getVersion(), AddonVersion("2017.2.5rc3"));
SG_CHECK_EQUAL(m.getBasePath(), SGPath("/path/to/MyGreatAddon"));
SG_CHECK_EQUAL(m.getMinFGVersionRequired(), "2017.4.1");
Addon addon;
std::string addonId = "org.FlightGear.addons.MyGreatAddon";
addon.setId(addonId);
addon.setVersion(AddonVersion("2017.2.5rc3"));
addon.setBasePath(SGPath("/path/to/MyGreatAddon"));
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");
const string refText = "addon '" + addonId + "' (version = 2017.2.5rc3, "
"base path = '/path/to/MyGreatAddon', "
"minFGVersionRequired = '2017.4.1', "
"maxFGVersionRequired = 'none')";
SG_CHECK_EQUAL(m.str(), refText);
SG_CHECK_EQUAL(addon.str(), refText);
// Check stream output
std::ostringstream oss;
oss << m;
oss << addon;
SG_CHECK_EQUAL(oss.str(), refText);
// Set a max FG version and recheck
m.setMaxFGVersionRequired("2018.2.5");
addon.setMaxFGVersionRequired("2018.2.5");
const string refText2 = "addon '" + addonId + "' (version = 2017.2.5rc3, "
"base path = '/path/to/MyGreatAddon', "
"minFGVersionRequired = '2017.4.1', "
"maxFGVersionRequired = '2018.2.5')";
SG_CHECK_EQUAL(m.getMaxFGVersionRequired(), "2018.2.5");
SG_CHECK_EQUAL(m.str(), refText2);
SG_CHECK_EQUAL(addon.getMaxFGVersionRequired(), "2018.2.5");
SG_CHECK_EQUAL(addon.str(), refText2);
fgtest::shutdownTestGlobals();
}
int main(int argc, const char* const* argv)