libcriterion: Fix default state display for InclusiveCriterion

InclusiveCriterion has a default state called "none", this state was
displayed through default Criterion behavior which is: if no valid state
is available, let's display "<none>".

This patch test explicitly the default value when formatting the state
of an InclusiveCriterion. It also introduces the test getLiteralValue
return when formatting a standard Criterion rather than testing the
generated string emptiness.
A difference can now be made between an inclusive criterion default
value and an exclusive criterion with an unknown state.

Signed-off-by: Jules Clero <julesx.clero@intel.com>

Author: clero

parameter/criterion/include/criterion/Criterion.h

@@ -137,18 +137,6 @@ class Criterion : public IXmlSource, public CriterionInterface
               const ValuePairs& derivedValuePairs,
               const MatchMethods& derivedMatchMethods);
 
-    /** Set a "default formatted state" when no criterion state is set
-     *
-     * @param formattedState, the formatted state string to check
-     * @result the reference of the string passed in parameter filled with the default value
-     * if it was empty
-     *
-     * This method returns a reference on his referenced parameter in order to have the easy
-     * notation.
-     *    return checkFormattedStateEmptyness(myFormattedStateToReturn);
-     */
-    std::string& checkFormattedStateEmptyness(std::string& formattedState) const;
-
     /** Contains pair association between literal and numerical value */
     ValuePairs mValuePairs;
 

parameter/criterion/src/Criterion.cpp

@@ -221,9 +221,10 @@ bool Criterion::getLiteralValue(int numericalValue, std::string& literalValue) c
 std::string Criterion::getFormattedState() const
 {
     std::string formattedState;
-    getLiteralValue(mState, formattedState);
-
-    return Criterion::checkFormattedStateEmptyness(formattedState);
+    if (!getLiteralValue(mState, formattedState)) {
+        formattedState = "<none>";
+    }
+    return formattedState;
 }
 
 std::string Criterion::listPossibleValues() const
@@ -246,14 +247,6 @@ std::string Criterion::listPossibleValues() const
     return possibleValues;
 }
 
-std::string& Criterion::checkFormattedStateEmptyness(std::string& formattedState) const
-{
-    if (formattedState.empty()) {
-        formattedState = "<none>";
-    }
-    return formattedState;
-}
-
 bool Criterion::match(const std::string& method, int32_t state) const
 {
     return mMatchMethods.at(method)(state);

parameter/criterion/src/InclusiveCriterion.cpp

@@ -31,6 +31,7 @@
 #include "Tokenizer.h"
 
 #include <sstream>
+#include <cassert>
 
 namespace core
 {
@@ -92,6 +93,12 @@ bool InclusiveCriterion::getNumericalValue(const std::string& literalValue,
 std::string InclusiveCriterion::getFormattedState() const
 {
     std::string formattedState;
+    if (mState == 0) {
+        // Default inclusive criterion state is always present
+        getLiteralValue(0, formattedState);
+        return formattedState;
+    }
+
     uint32_t bit;
     bool first = true;
 
@@ -117,8 +124,7 @@ std::string InclusiveCriterion::getFormattedState() const
 
         formattedState += atomicState;
     }
-
-    return Criterion::checkFormattedStateEmptyness(formattedState);
+    return formattedState;
 }
 
 } /** criterion namespace */