intel · dawagner · Dec 17, 2015 · Dec 16, 2015 · Dec 16, 2015 · Dec 15, 2015
diff --git a/ctest/CTestCustom.cmake b/ctest/CTestCustom.cmake
@@ -4,4 +4,5 @@ SET(CTEST_CUSTOM_MEMCHECK_IGNORE
   # runing python based tests would be long and useless.
   fix_point_parameter
   functional-test-legacy
+  xml-generator
   )
diff --git a/parameter/FileIncluderElementBuilder.h b/parameter/FileIncluderElementBuilder.h
@@ -41,17 +41,20 @@
 class CFileIncluderElementBuilder : public CElementBuilder
 {
 public:
-    CFileIncluderElementBuilder(bool bValidateWithSchemas)
-        : CElementBuilder(), _bValidateWithSchemas(bValidateWithSchemas)
+    CFileIncluderElementBuilder(bool bValidateWithSchemas, const std::string &schemaBaseUri)
+        : CElementBuilder(),
+          _bValidateWithSchemas(bValidateWithSchemas),
+          _schemaBaseUri(schemaBaseUri)
     {
     }
 
     virtual CElement *createElement(const CXmlElement &xmlElement) const
     {
         return new CXmlFileIncluderElement(xmlElement.getNameAttribute(), xmlElement.getType(),
-                                           _bValidateWithSchemas);
+                                           _bValidateWithSchemas, _schemaBaseUri);
     }
 
 private:
     bool _bValidateWithSchemas;
+    const std::string _schemaBaseUri;
 };
diff --git a/parameter/ParameterMgr.cpp b/parameter/ParameterMgr.cpp
@@ -636,8 +636,7 @@ bool CParameterMgr::xmlParse(CXmlElementSerializingContext &elementSerializingCo
     CXmlDocSource docSource(doc, _bValidateSchemasOnStart, pRootElement->getXmlElementName(),
                             pRootElement->getName(), strNameAttributeName);
 
-    // Schema Uri
-    setSchemaUri(docSource.getSchemaUri());
+    docSource.setSchemaBaseUri(getSchemaUri());
 
     // Start clean
     auto clean = [replace, &pRootElement] {
@@ -2644,7 +2643,7 @@ bool CParameterMgr::serializeElement(std::ostream &output,
 
     // Use a doc source by loading data from instantiated Configurable Domains
     CXmlMemoryDocSource memorySource(&element, _bValidateSchemasOnStart,
-                                     element.getXmlElementName(), getSchemaUri(),
+                                     element.getXmlElementName(),
                                      "parameter-framework", getVersion());
 
     // Use a doc sink to write the doc data in a stream
@@ -2814,7 +2813,8 @@ void CParameterMgr::feedElementLibraries()
     pParameterCreationLibrary->addElementBuilder(
         "FloatingPointParameter", new TNamedElementBuilderTemplate<CFloatingPointParameterType>);
     pParameterCreationLibrary->addElementBuilder(
-        "SubsystemInclude", new CFileIncluderElementBuilder(_bValidateSchemasOnStart));
+        "SubsystemInclude", new CFileIncluderElementBuilder(_bValidateSchemasOnStart,
+                                                            getSchemaUri()));
 
     _pElementLibrarySet->addElementLibrary(pParameterCreationLibrary);
 

diff --git a/parameter/XmlFileIncluderElement.cpp b/parameter/XmlFileIncluderElement.cpp
@@ -38,8 +38,11 @@
 #define base CKindElement
 CXmlFileIncluderElement::CXmlFileIncluderElement(const std::string &strName,
                                                  const std::string &strKind,
-                                                 bool bValidateWithSchemas)
-    : base(strName, strKind), _bValidateSchemasOnStart(bValidateWithSchemas)
+                                                 bool bValidateWithSchemas,
+                                                 const std::string &schemaBaseUri)
+    : base(strName, strKind),
+      _bValidateSchemasOnStart(bValidateWithSchemas),
+      _schemaBaseUri(schemaBaseUri)
 {
 }
 
@@ -63,6 +66,10 @@ bool CXmlFileIncluderElement::fromXml(const CXmlElement &xmlElement,
 
         CXmlDocSource docSource(doc, _bValidateSchemasOnStart, strIncludedElementType);
 
+        if (not _schemaBaseUri.empty()) {
+            docSource.setSchemaBaseUri(_schemaBaseUri);
+        }
+
         if (!docSource.isParsable()) {
 
             elementSerializingContext.setError("Could not parse document \"" + strPath + "\"");

diff --git a/parameter/XmlFileIncluderElement.h b/parameter/XmlFileIncluderElement.h
@@ -38,12 +38,13 @@ class CXmlFileIncluderElement : public CKindElement
 {
 public:
     CXmlFileIncluderElement(const std::string &strName, const std::string &strKind,
-                            bool bValidateWithSchemas);
+                            bool bValidateWithSchemas, const std::string &schemaBaseUri);
     // From IXmlSink
     virtual bool fromXml(const CXmlElement &xmlElement, CXmlSerializingContext &serializingContext);
 
 private:
     // Element type
     std::string getIncludedElementType() const;
     bool _bValidateSchemasOnStart;
+    const std::string _schemaBaseUri;
 };
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -35,3 +35,4 @@ add_subdirectory(test-platform)
 add_subdirectory(test-subsystem)
 add_subdirectory(introspection-subsystem)
 add_subdirectory(tokenizer)
+add_subdirectory(xml-generator)
diff --git a/test/functional-tests-legacy/CMakeLists.txt b/test/functional-tests-legacy/CMakeLists.txt
@@ -32,8 +32,6 @@ if(BUILD_TESTING)
     set(PFW_ROOT ${PROJECT_BINARY_DIR}/tmp/test-parameters)
     set(PFW_RESULT ${PFW_ROOT}/result)
 
-    file(COPY ${PROJECT_SOURCE_DIR}/schemas/ DESTINATION ${PFW_ROOT}/xml/schemas)
-
     configure_file(
         ${CMAKE_CURRENT_SOURCE_DIR}/xml/configuration/Structure/Test/TestSubsystem.xml.in
         ${PFW_ROOT}/xml/configuration/Structure/Test/TestSubsystem.xml @ONLY)
@@ -62,5 +60,6 @@ if(BUILD_TESTING)
     set_test_env(functional-test-legacy)
     set_property(TEST functional-test-legacy APPEND PROPERTY ENVIRONMENT
                  PFW_ROOT=${PFW_ROOT}
-                 PFW_RESULT=${PFW_RESULT})
+                 PFW_RESULT=${PFW_RESULT}
+                 PFW_SCHEMAS=${PROJECT_SOURCE_DIR}/schemas)
 endif()
diff --git a/test/functional-tests-legacy/Util/PfwUnitTestLib.py b/test/functional-tests-legacy/Util/PfwUnitTestLib.py
@@ -113,6 +113,7 @@ def createExclusiveCriterion(self, name, nb):
 
     # Starts the Pfw
     def start(self):
+        self.sendCmd("setSchemaUri", os.environ["PFW_SCHEMAS"])
         self.sendCmd("setValidateSchemasOnStart", "true")
         self.sendCmd("start")
         self.pfw.setRemoteProcess(self.remoteProcess)

diff --git a/test/functional-tests-legacy/xml/XML_Test/Reference_Compliant.xml b/test/functional-tests-legacy/xml/XML_Test/Reference_Compliant.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ConfigurableDomains
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../schemas/ConfigurableDomains.xsd"
   SystemClassName="Test">
 	<ConfigurableDomain Name="Domain_1">
 		<Configurations>

diff --git a/test/functional-tests-legacy/xml/XML_Test/Reference_Criteria.xml b/test/functional-tests-legacy/xml/XML_Test/Reference_Criteria.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ConfigurableDomains xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../schemas/ConfigurableDomains.xsd" SystemClassName="Test">
+<ConfigurableDomains SystemClassName="Test">
 	<ConfigurableDomain Name="Domain_1">
 		<Configurations>
 			<Configuration Name="Conf_1_0">

diff --git a/test/functional-tests-legacy/xml/XML_Test/Reference_Split_Domain.xml b/test/functional-tests-legacy/xml/XML_Test/Reference_Split_Domain.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--DOMAIN 1 DEFINITION-->
 <ConfigurableDomains
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../schemas/ConfigurableDomains.xsd"
   SystemClassName="Test">
 	<ConfigurableDomain Name="Domain_1">
 		<Configurations>

diff --git a/test/functional-tests-legacy/xml/XML_Test/Reference_dumpDomains.xml b/test/functional-tests-legacy/xml/XML_Test/Reference_dumpDomains.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ConfigurableDomains
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../schemas/ConfigurableDomains.xsd"
   SystemClassName="Test">
 
 	<ConfigurableDomain Name="Domain_0_1">

diff --git a/test/functional-tests-legacy/xml/XML_Test/Uncompliant_OutboundParameter.xml b/test/functional-tests-legacy/xml/XML_Test/Uncompliant_OutboundParameter.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ConfigurableDomains
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../schemas/ConfigurableDomains.xsd"
   SystemClassName="Test">
 	<ConfigurableDomain Name="Domain_1">
 		<Configurations>

diff --git a/test/functional-tests-legacy/xml/XML_Test/Uncompliant_UndeclaredConfigurableElement.xml b/test/functional-tests-legacy/xml/XML_Test/Uncompliant_UndeclaredConfigurableElement.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ConfigurableDomains
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../schemas/ConfigurableDomains.xsd"
   SystemClassName="Test">
 	<ConfigurableDomain Name="Domain_1">
 		<Configurations>

diff --git a/test/functional-tests-legacy/xml/XML_Test/Uncompliant_UndeclaredParameter.xml b/test/functional-tests-legacy/xml/XML_Test/Uncompliant_UndeclaredParameter.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ConfigurableDomains
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../schemas/ConfigurableDomains.xsd"
   SystemClassName="Test">
 	<ConfigurableDomain Name="Domain_1">
 		<Configurations>

diff --git a/test/functional-tests-legacy/xml/XML_Test/Uncompliant_UnorderConfigurableElement.xml b/test/functional-tests-legacy/xml/XML_Test/Uncompliant_UnorderConfigurableElement.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ConfigurableDomains xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../schemas/ConfigurableDomains.xsd" SystemClassName="Test">
+<ConfigurableDomains SystemClassName="Test">
 	<ConfigurableDomain Name="Domain_1">
 		<Configurations>
 			<Configuration Name="Conf_1_0">

diff --git a/test/functional-tests-legacy/xml/configuration/ParameterFrameworkConfiguration.xml b/test/functional-tests-legacy/xml/configuration/ParameterFrameworkConfiguration.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ParameterFrameworkConfiguration
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../schemas/ParameterFrameworkConfiguration.xsd"
  SystemClassName="Test" ServerPort="5000" TuningAllowed="true">
     <SubsystemPlugins>
         <Location Folder="">

diff --git a/test/functional-tests-legacy/xml/configuration/Settings/Test/TestConfigurableDomains.xml b/test/functional-tests-legacy/xml/configuration/Settings/Test/TestConfigurableDomains.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ConfigurableDomains
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../schemas/ConfigurableDomains.xsd"
   SystemClassName="Test">
 	<ConfigurableDomain Name="Domain_0">
 		<Configurations>

diff --git a/test/functional-tests-legacy/xml/configuration/Structure/Test/TestClass.xml b/test/functional-tests-legacy/xml/configuration/Structure/Test/TestClass.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemClass
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../schemas/SystemClass.xsd"
   Name="Test">
     <SubsystemInclude Path="TestSubsystem.xml"/>
 </SystemClass>
diff --git a/test/functional-tests-legacy/xml/configuration/Structure/Test/TestSubsystem.xml.in b/test/functional-tests-legacy/xml/configuration/Structure/Test/TestSubsystem.xml.in
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Subsystem
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../schemas/Subsystem.xsd"
   Name="Test" Type="TEST">
 	<ComponentLibrary>
 		<ComponentType Name="TEST_DIR">

diff --git a/test/functional-tests/Handle.cpp b/test/functional-tests/Handle.cpp
@@ -192,9 +192,7 @@ struct AllParamsPF : public ParameterFramework
 
     static string rootNode(string name, string attributes, string content)
     {
-        return '<' + name + " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'"
-                            " xsi:noNamespaceSchemaLocation='" +
-               name + ".xsd'" + ' ' + attributes + '>' + content + "</" + name + '>';
+        return '<' + name + ' ' + attributes + '>' + content + "</" + name + '>';
     }
 };
 

diff --git a/test/test-platform/TestPlatform.cpp b/test/test-platform/TestPlatform.cpp
@@ -125,6 +125,11 @@ bool CTestPlatform::run(std::string &strError)
         &CTestPlatform::getter<&CParameterMgrPlatformConnector::getValidateSchemasOnStart>, 0, "",
         "Get policy for schema validation based on .xsd files.");
 
+    commandHandler.addCommandParser("getSchemaUri", &CTestPlatform::getSchemaUri, 0,
+        "", "Get the directory where schemas can be found.");
+    commandHandler.addCommandParser("setSchemaUri", &CTestPlatform::setSchemaUri, 1,
+        "<directory>", "Set the directory where schemas can be found.");
+
     return mRemoteProcessorServer.process(commandHandler);
 }
 
@@ -202,6 +207,20 @@ CTestPlatform::CommandReturn CTestPlatform::getter(const IRemoteCommand & /*comm
     return CTestPlatform::CCommandHandler::ESucceeded;
 }
 
+CTestPlatform::CommandReturn CTestPlatform::getSchemaUri(const IRemoteCommand & /*remotecommand*/,
+                                                         string &result)
+{
+    result = mParameterMgrPlatformConnector.getSchemaUri();
+    return CTestPlatform::CCommandHandler::EDone;
+}
+
+CTestPlatform::CommandReturn CTestPlatform::setSchemaUri(const IRemoteCommand &remotecommand,
+                                                         string & /*result*/)
+{
+    mParameterMgrPlatformConnector.setSchemaUri(remotecommand.getArgument(0));
+    return CTestPlatform::CCommandHandler::EDone;
+}
+
 CTestPlatform::CommandReturn CTestPlatform::setCriterionState(const IRemoteCommand &remoteCommand,
                                                               string &strResult)
 {

diff --git a/test/test-platform/TestPlatform.h b/test/test-platform/TestPlatform.h
@@ -64,6 +64,9 @@ class CTestPlatform
     CommandReturn createInclusiveSelectionCriterion(const IRemoteCommand &remoteCommand,
                                                     std::string &strResult);
 
+    CommandReturn getSchemaUri(const IRemoteCommand &remotecommand, std::string &result);
+    CommandReturn setSchemaUri(const IRemoteCommand &remotecommand, std::string &result);
+
     /** Callback to set a criterion's value, see ISelectionCriterionInterface::setCriterionState.
      * @see CCommandHandler::RemoteCommandParser for detail on each arguments and return
      *

diff --git a/tools/xmlGenerator/portAllocator.py → test/xml-generator/CMakeLists.txt b/tools/xmlGenerator/portAllocator.py → test/xml-generator/CMakeLists.txt
@@ -1,6 +1,4 @@
-#!/usr/bin/python2
-#
-# Copyright (c) 2011-2014, Intel Corporation
+# Copyright (c) 2015, Intel Corporation
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -28,21 +26,14 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import sys, socket
-
-serversock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-try:
-    # Create a listening socket on a random available port on localhost
-    serversock.bind(('127.0.0.1',0))
-    serversock.listen(0)
+if (BUILD_TESTING AND PYTHON_BINDINGS)
 
-    # Print the chosen port
-    print(serversock.getsockname()[1])
-    serversock.close()
+    find_package(PythonInterp 2 REQUIRED)
 
-except socket.error, (errno,message):
-    sys.stderr.write("portAllocator: Socket creation error " + str(errno) + ": " + message + '\n')
-    if serversock:
-        serversock.close()
-    sys.exit(1)
+    add_test(NAME xml-generator
+             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tools/xmlGenerator
+             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test.py)
 
+    # Custom function defined in the top-level CMakeLists
+    set_test_env(xml-generator)
+endif()
diff --git a/test/xml-generator/Class.xml b/test/xml-generator/Class.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemClass Name="Test">
+    <SubsystemInclude Path="Subsystem.xml"/>
+</SystemClass>
diff --git a/test/xml-generator/ParameterFrameworkConfiguration.xml b/test/xml-generator/ParameterFrameworkConfiguration.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ParameterFrameworkConfiguration SystemClassName="Test" ServerPort="5066" TuningAllowed="false">
+    <SubsystemPlugins>
+    </SubsystemPlugins>
+    <StructureDescriptionFileLocation Path="Class.xml"/>
+</ParameterFrameworkConfiguration>
diff --git a/test/xml-generator/Subsystem.xml b/test/xml-generator/Subsystem.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Subsystem Name="test" Type="Virtual" xmlns:xi="http://www.w3.org/2001/XInclude">
+    <ComponentLibrary>
+        <xi:include href="TuningStructure.xml"/>
+    </ComponentLibrary>
+    <InstanceDefinition>
+
+        <Component Type="Tuning" Name="tuning"/>
+
+        <ParameterBlock Name="block" ArrayLength="5">
+            <FixedPointParameter Name="q2.5" Size="8" Integral="2" Fractional="5"/>
+            <IntegerParameter Name="uint8" Signed="false" Size="8"/>
+            <StringParameter Name="string" MaxLength="20"/>
+        </ParameterBlock>
+
+    </InstanceDefinition>
+</Subsystem>
diff --git a/test/xml-generator/TuningSettings.xml b/test/xml-generator/TuningSettings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ConfigurableDomains SystemClassName="Test">
+    <ConfigurableDomain Name="Calibration" SequenceAware="false">
+        <Configurations>
+            <Configuration Name="default">
+                <CompoundRule Type="All">
+                </CompoundRule>
+            </Configuration>
+        </Configurations>
+
+        <ConfigurableElements>
+            <ConfigurableElement Path="/Test/test/tuning/bool"/>
+        </ConfigurableElements>
+
+        <Settings>
+            <Configuration Name="default">
+                <ConfigurableElement Path="/Test/test/tuning/bool">
+                    <BooleanParameter Name="bool">1</BooleanParameter>
+                </ConfigurableElement>
+            </Configuration>
+        </Settings>
+    </ConfigurableDomain>
+</ConfigurableDomains>
diff --git a/test/xml-generator/TuningStructure.xml b/test/xml-generator/TuningStructure.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ComponentLibrary>
+    <ComponentType Name="Tuning">
+        <BooleanParameter Name="bool"/>
+    </ComponentType>
+</ComponentLibrary>
diff --git a/test/xml-generator/criteria.txt b/test/xml-generator/criteria.txt
@@ -0,0 +1,2 @@
+InclusiveCriterion Colors : Red Green Blue
+ExclusiveCriterion Switch : On Off
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		InclusiveCriterion Colors : Red Green Blue
		ExclusiveCriterion Switch : On Off