Fix #15025 (settings: match cert c premium options better)

Author: danmar

lib/settings.cpp

@@ -759,16 +759,22 @@ bool Settings::isPremiumEnabled(const char id[]) const
         return false;
     if (premiumArgs.find("autosar") != std::string::npos && autosarCheckers.count(id))
         return true;
-    if (premiumArgs.find("cert-c-") != std::string::npos && certCCheckers.count(id))
-        return true;
     if (premiumArgs.find("cert-c++") != std::string::npos && certCppCheckers.count(id))
         return true;
+    if (premiumArgs.find("cert-cpp") != std::string::npos && certCppCheckers.count(id))
+        return true;
+    if (premiumArgs.find("cert-c") != std::string::npos && certCCheckers.count(id))
+        return true;
     if (premiumArgs.find("misra-c-") != std::string::npos && (misrac2012Checkers.count(id) || misrac2023Checkers.count(id) || misrac2025Checkers.count(id)))
         return true;
     if (premiumArgs.find("misra-c++-2008") != std::string::npos && misracpp2008Checkers.count(id))
         return true;
+    if (premiumArgs.find("misra-cpp-2008") != std::string::npos && misracpp2008Checkers.count(id))
+        return true;
     if (premiumArgs.find("misra-c++-2023") != std::string::npos && misracpp2023Checkers.count(id))
         return true;
+    if (premiumArgs.find("misra-cpp-2023") != std::string::npos && misracpp2023Checkers.count(id))
+        return true;
     return false;
 }
 

test/testsettings.cpp

@@ -42,6 +42,8 @@ class TestSettings : public TestFixture {
         TEST_CASE(getMaxConfigsDefines);
         TEST_CASE(getMaxConfigsDefinesAndOpt);
         TEST_CASE(getMaxConfigsOptAndProject);
+
+        TEST_CASE(isPremiumEnabledCert);
     }
 
     void simpleEnableGroup() const {
@@ -356,6 +358,14 @@ class TestSettings : public TestFixture {
         s.maxConfigsProject = 10;
         ASSERT_EQUALS(3, s.getMaxConfigs());
     }
+
+    void isPremiumEnabledCert() const {
+        Settings s;
+        s.premiumArgs = "cert-c-2016";
+        ASSERT(s.isPremiumEnabled("uninitvar"));
+        s.premiumArgs = "cert-c";
+        ASSERT(s.isPremiumEnabled("uninitvar"));
+    }
 };
 
 REGISTER_TEST(TestSettings)