Xml generation: check conflicting elements

parameter/ConfigurableDomain.cpp

@@ -686,8 +686,6 @@ bool CConfigurableDomain::deleteConfiguration(const string &strName, string &str
 
 void CConfigurableDomain::listAssociatedToElements(string &strResult) const
 {
-    strResult = "\n";
-
     ConfigurableElementListIterator it;
 
     // Browse all configurable elements

parameter/ConfigurableDomains.cpp

@@ -317,8 +317,6 @@ bool CConfigurableDomains::split(const string &domainName, CConfigurableElement
 
 void CConfigurableDomains::listAssociatedElements(string &strResult) const
 {
-    strResult = "\n";
-
     std::set<const CConfigurableElement *> configurableElementSet;
 
     // Get all owned configurable elements
@@ -341,8 +339,6 @@ void CConfigurableDomains::listAssociatedElements(string &strResult) const
 
 void CConfigurableDomains::listConflictingElements(string &strResult) const
 {
-    strResult = "\n";
-
     std::set<const CConfigurableElement *> configurableElementSet;
 
     // Get all owned configurable elements
@@ -369,8 +365,6 @@ void CConfigurableDomains::listConflictingElements(string &strResult) const
 
 void CConfigurableDomains::listDomains(string &strResult) const
 {
-    strResult = "\n";
-
     // List domains
     size_t uiNbConfigurableDomains = getNbChildren();
 

parameter/ConfigurableElement.cpp

@@ -468,8 +468,6 @@ void CConfigurableElement::listBelongingDomains(std::string &strResult, bool bVe
 // Elements with no domains
 void CConfigurableElement::listRogueElements(std::string &strResult) const
 {
-    strResult = "\n";
-
     // Get rogue element aggregate list (no associated domain)
     std::list<const CConfigurableElement *> rogueElementList;
 
@@ -568,11 +566,6 @@ void CConfigurableElement::listDomains(
     const std::list<const CConfigurableDomain *> &configurableDomainList, std::string &strResult,
     bool bVertical) const
 {
-    if (bVertical && configurableDomainList.empty()) {
-
-        strResult = "\n";
-    }
-
     // Fill list
     ConfigurableDomainListConstIterator it;
     bool bFirst = true;

parameter/Element.cpp

@@ -122,7 +122,6 @@ string CElement::dumpContent(utility::ErrorContext &errorContext, const size_t d
 // Element properties
 void CElement::showProperties(string &strResult) const
 {
-    strResult = "\n";
     strResult += "Kind: " + getKind() + "\n";
     showDescriptionProperty(strResult);
 }
@@ -330,8 +329,6 @@ bool CElement::removeChild(CElement *pChild)
 
 void CElement::listChildren(string &strChildList) const
 {
-    strChildList = "\n";
-
     // Get list of children names
     for (CElement *pChild : _childArray) {
 

parameter/MappingData.cpp

@@ -38,7 +38,7 @@ bool CMappingData::init(const std::string &rawMapping, std::string &error)
 
     std::string strMappingElement;
 
-    while (!(strMappingElement = mappingTok.next()).empty()) {
+    for (const auto &strMappingElement : mappingTok.split()) {
 
         std::string::size_type iFistDelimiterOccurrence = strMappingElement.find_first_of(':');
 

parameter/ParameterMgr.cpp

@@ -1370,8 +1370,6 @@ CParameterMgr::CCommandHandler::CommandStatus CParameterMgr::listElementsCommand
         return CCommandHandler::EFailed;
     }
 
-    strResult = string("\n");
-
     if (!pLocatedElement) {
 
         // List from root folder
@@ -1399,8 +1397,6 @@ CParameterMgr::CCommandHandler::CommandStatus CParameterMgr::listParametersComma
         return CCommandHandler::EFailed;
     }
 
-    strResult = string("\n");
-
     if (!pLocatedElement) {
 
         // List from root folder

remote-processor/RemoteCommandHandlerTemplate.h

@@ -194,8 +194,6 @@ class TRemoteCommandHandlerTemplate : public IRemoteCommandHandler
     {
         initMaxCommandUsageLength();
 
-        strResult = "\n";
-
         // Show usages
         for (const auto *pRemoteCommandParserItem : _remoteCommandParserVector) {
 

test/tokenizer/Test.cpp

@@ -39,76 +39,74 @@
 using std::string;
 using std::vector;
 
+using Expected = vector<string>;
+
 SCENARIO("Tokenizer tests")
 {
     GIVEN ("A default tokenizer") {
 
         GIVEN ("A trivial string") {
             Tokenizer tokenizer("a bcd ef");
+            Expected expected{"a", "bcd", "ef"};
 
-            THEN ("next() api should work") {
-                CHECK(tokenizer.next() == "a");
-                CHECK(tokenizer.next() == "bcd");
-                CHECK(tokenizer.next() == "ef");
-                CHECK(tokenizer.next() == "");
-            }
             THEN ("split() api should work") {
-                vector<string> expected;
-                expected.push_back("a");
-                expected.push_back("bcd");
-                expected.push_back("ef");
-
                 CHECK(tokenizer.split() == expected);
             }
         }
 
         GIVEN ("An empty string") {
             Tokenizer tokenizer("");
+            Expected expected{};
 
-            THEN ("next() api should work") {
-                CHECK(tokenizer.next() == "");
+            THEN ("split() should be empty") {
+                CHECK(tokenizer.split() == expected);
             }
-            THEN ("split() api should work") {
-                vector<string> expected;
+        }
 
-                CHECK(tokenizer.split().empty());
+        GIVEN ("Multiple separators in a row") {
+            Tokenizer tokenizer("  a \n\t bc  ");
+            Expected expected{"a", "bc"};
+
+            THEN ("split() api should work") {
+                CHECK(tokenizer.split() == expected);
             }
         }
+    }
 
-        GIVEN ("A slash-separated string and tokenizer") {
-            Tokenizer tokenizer("/a/bcd/ef g/h/", "/");
+    GIVEN ("A slash-separated string and tokenizer") {
+        Tokenizer tokenizer("/a/bcd/ef g/h/", "/");
+        Expected expected{"a", "bcd", "ef g", "h"};
 
-            THEN ("next() api should work") {
-                CHECK(tokenizer.next() == "a");
-                CHECK(tokenizer.next() == "bcd");
-                CHECK(tokenizer.next() == "ef g");
-                CHECK(tokenizer.next() == "h");
-                CHECK(tokenizer.next() == "");
+        THEN ("split() api should work") {
+            CHECK(tokenizer.split() == expected);
+        }
+    }
+
+    GIVEN ("A tokenizer that doesn't merge consecutive separators") {
+
+        GIVEN ("An empty string") {
+            Tokenizer tokenizer("", Tokenizer::defaultDelimiters, false);
+            Expected expected{};
+
+            THEN ("split() should be empty") {
+                CHECK(tokenizer.split() == expected);
             }
-            THEN ("split() api should work") {
-                vector<string> expected;
-                expected.push_back("a");
-                expected.push_back("bcd");
-                expected.push_back("ef g");
-                expected.push_back("h");
+        }
+
+        GIVEN ("A string consisting only of a delimiter") {
+            Tokenizer tokenizer(",", ",", false);
+            Expected expected{"", ""};
 
+            THEN ("split() should return two empty tokens") {
                 CHECK(tokenizer.split() == expected);
             }
         }
 
         GIVEN ("Multiple separators in a row") {
-            Tokenizer tokenizer("  a \n\t bc  ");
+            Tokenizer tokenizer(" a  b \nc d ", Tokenizer::defaultDelimiters, false);
+            Expected expected{"", "a", "", "b", "", "c", "d", ""};
 
-            THEN ("next() api should work") {
-                CHECK(tokenizer.next() == "a");
-                CHECK(tokenizer.next() == "bc");
-                CHECK(tokenizer.next() == "");
-            }
             THEN ("split() api should work") {
-                vector<string> expected;
-                expected.push_back("a");
-                expected.push_back("bc");
-
                 CHECK(tokenizer.split() == expected);
             }
         }

test/xml-generator/PFConfig/duplicate_criterion_value.txt

@@ -0,0 +1 @@
+InclusiveCriterion Duplicate : Foo Foo

test/xml-generator/PFConfig/structure.xml

@@ -10,6 +10,9 @@
         <InstanceDefinition>
 
             <Component Name="included" Type="Included"/>
+            <ParameterBlock Name="inline">
+                <BooleanParameter Name="bool"/>
+            </ParameterBlock>
 
             <ParameterBlock Name="block" ArrayLength="5">
                 <FixedPointParameter Name="q2.5" Size="8" Integral="2" Fractional="5"/>

test/xml-generator/test.py

@@ -90,27 +90,42 @@ def check(self, reference=None, expectedErrors=0):
 config_dir = os.path.join(basedir, "PFConfig")
 vector_dir = os.path.join(basedir, "testVector")
 class TestCase(unittest.TestCase):
-    nominal_reference = open(os.path.join(vector_dir, "reference.xml")).read().splitlines()
-    nominal_pfconfig = PfConfig(os.path.join(config_dir, "configuration.xml"),
-                                os.path.join(config_dir, "criteria.txt"),
-                                os.path.join(basedir, "../../schemas"))
-    nominal_vector = TestVector(os.path.join(vector_dir, "initialSettings.xml"),
-                                [os.path.join(vector_dir, "first.pfw"),
-                                 os.path.join(vector_dir, "second.pfw"),
-                                 os.path.join(vector_dir, "complex.pfw")],
-                                [os.path.join(vector_dir, "third.xml"),
-                                 os.path.join(vector_dir, "fourth.xml")])
+    def setUp(self):
+        self.nominal_reference = open(os.path.join(vector_dir, "reference.xml")).read().splitlines()
+        self.nominal_pfconfig = PfConfig(os.path.join(config_dir, "configuration.xml"),
+                                         os.path.join(config_dir, "criteria.txt"),
+                                         os.path.join(basedir, "../../schemas"))
+        self.nominal_vector = TestVector(os.path.join(vector_dir, "initialSettings.xml"),
+                                         [os.path.join(vector_dir, "first.pfw"),
+                                          os.path.join(vector_dir, "second.pfw"),
+                                          os.path.join(vector_dir, "complex.pfw")],
+                                         [os.path.join(vector_dir, "third.xml"),
+                                          os.path.join(vector_dir, "fourth.xml")])
 
     def test_nominal(self):
         tester = Tester(self.nominal_pfconfig, self.nominal_vector)
         tester.check(self.nominal_reference)
 
     def test_nonfatalError(self):
-        vector = copy.copy(self.nominal_vector)
-        vector.edds.append(os.path.join(vector_dir, "duplicate.pfw"))
+        self.nominal_vector.edds.append(os.path.join(vector_dir, "duplicate.pfw"))
 
-        tester = Tester(self.nominal_pfconfig, vector)
+        tester = Tester(self.nominal_pfconfig, self.nominal_vector)
         tester.check(self.nominal_reference, expectedErrors=1)
 
+    def test_conflicting(self):
+        vector = TestVector(edds=[os.path.join(vector_dir, "conflicting.pfw")])
+
+        tester = Tester(self.nominal_pfconfig, vector)
+        tester.check(expectedErrors=1)
+
+    def test_fail_criteria(self):
+        self.nominal_pfconfig.criteria = os.path.join(config_dir, "duplicate_criterion_value.txt")
+        # Empty test vector: we want to make sure that the erroneous criterion
+        # is the only source of error
+        empty_vector = TestVector()
+
+        tester = Tester(self.nominal_pfconfig, empty_vector)
+        tester.check(expectedErrors=1)
+
 if __name__ == "__main__":
     unittest.main()

test/xml-generator/testVector/complex.pfw

@@ -33,8 +33,8 @@ domainGroup: Red sequenceAware
 						Colors Includes Blue
 
 						component: /Test/test
-							component: block/3
+							component: block/0
 								q2.5 = 1.18750
 								string = 12 ab @ 	 <![CDATA[ < > \n \0 ✔ "'\
-							component: included
+							component: inline
 								bool = 1

test/xml-generator/testVector/conflicting.pfw

@@ -0,0 +1,7 @@
+# Causes a conflicting-element error
+domain: First
+	conf: Default
+		/Test/test/included/bool = 1
+domain: Second
+	conf: Default
+		/Test/test/included/bool = 0

test/xml-generator/testVector/first.pfw

@@ -15,7 +15,8 @@ domainGroup: EddGroup
 
 				component: /Test/test/block/1
 					q2.5 = 1.2
-					string = some string
+					# set to an empty string
+					string =
 
 			# Inherits from "EddGroup" domainGroup, "First" domain
 			# and from "Green" confGroup

test/xml-generator/testVector/reference.xml

@@ -94,7 +94,7 @@
           <FixedPointParameter Name="q2.5">1.18750</FixedPointParameter>
         </ConfigurableElement>
         <ConfigurableElement Path="/Test/test/block/1/string">
-          <StringParameter Name="string">some string</StringParameter>
+          <StringParameter Name="string"></StringParameter>
         </ConfigurableElement>
       </Configuration>
       <Configuration Name="Green.Off">
@@ -200,19 +200,19 @@
       </Configuration>
     </Configurations>
     <ConfigurableElements>
-      <ConfigurableElement Path="/Test/test/block/3/q2.5"/>
-      <ConfigurableElement Path="/Test/test/block/3/string"/>
-      <ConfigurableElement Path="/Test/test/included/bool"/>
+      <ConfigurableElement Path="/Test/test/block/0/q2.5"/>
+      <ConfigurableElement Path="/Test/test/block/0/string"/>
+      <ConfigurableElement Path="/Test/test/inline/bool"/>
     </ConfigurableElements>
     <Settings>
       <Configuration Name="green.confGroup..On.Blue.dot">
-        <ConfigurableElement Path="/Test/test/block/3/q2.5">
+        <ConfigurableElement Path="/Test/test/block/0/q2.5">
           <FixedPointParameter Name="q2.5">1.18750</FixedPointParameter>
         </ConfigurableElement>
-        <ConfigurableElement Path="/Test/test/block/3/string">
+        <ConfigurableElement Path="/Test/test/block/0/string">
           <StringParameter Name="string">12 ab @ 	 &lt;![CDATA[ &lt; &gt; \n \0 ✔ "'\</StringParameter>
         </ConfigurableElement>
-        <ConfigurableElement Path="/Test/test/included/bool">
+        <ConfigurableElement Path="/Test/test/inline/bool">
           <BooleanParameter Name="bool">1</BooleanParameter>
         </ConfigurableElement>
       </Configuration>