b-169 tests for new container feature

Author: lbellonda

src/modules/namespace/regolaprefixes.cpp

@@ -182,6 +182,54 @@ void Element::collectPrefixes(PrefixInfo & info, Element * selection, const bool
     }
 }
 
+void Element::collectAllPrefixes(PrefixInfo & info, Element * selection, const bool inSelection, const bool inBookmark)
+{
+    QSet<QString> prefixes;
+    QString name, prefix;
+    XmlUtils::decodeQualifiedName(tag(), prefix, name);
+    if(!prefix.isEmpty()) {
+        prefixes.insert(prefix);
+    }
+    foreach(Attribute * attr, getAttributesList()) {
+        XmlUtils::decodeQualifiedName(attr->name, prefix, name);
+        if(!prefix.isEmpty() && XmlUtils::isDataAttribute(attr->name)) {
+            prefixes.insert(prefix);
+        } else if(!prefix.isEmpty() && XmlUtils::isDeclaringNS(attr->name)) {
+            // handles xmlns:XXX
+            if(!name.isEmpty()) {
+                prefixes.insert(name);
+            }
+        }
+    }
+    bool thisBookmark = false ;
+    bool isSelection = this == selection;
+    if(NULL != parentRule) {
+        if(parentRule->isBookmarked(this)) {
+            thisBookmark = true;
+        }
+    }
+    foreach(const QString & prefix, prefixes.values()) {
+        info.allPrefixes.insert(prefix);
+        if(isSelection) {
+            info.selectionPrefixes.insert(prefix);
+        }
+        if(inSelection || isSelection) {
+            info.selectionPrefixesRecursive.insert(prefix);
+        }
+        if(thisBookmark) {
+            info.bookmarksPrefixesRecursive.insert(prefix);
+        }
+        if(inBookmark || thisBookmark) {
+            info.bookmarksPrefixesRecursive.insert(prefix);
+        }
+    }
+    foreach(Element * child, getChildItemsRef()) {
+        if(child->isElement()) {
+            child->collectAllPrefixes(info, selection, inSelection || isSelection, inBookmark || thisBookmark);
+        }
+    }
+}
+
 bool Regola::removePrefix(const QString &removedPrefix, QList<Element*> elements, TargetSelection::Type targetSelection,
                           const bool isAllPrefixes, ElementUndoObserver *observer)
 {

src/modules/xml/regolaContainer.cpp

@@ -331,10 +331,9 @@ bool Regola::removeParentAction(Element *element, QTreeWidget *tree, int &insPos
 
 QString Regola::unusedPrefixByElement(Element *element)
 {
-    Utils::TEST_ME("");
     if(NULL != element) {
         PrefixInfo info;
-        element->collectPrefixes(info, element, true, false);
+        element->collectAllPrefixes(info, element, true, false);
         {
             const QString stdPrefix = "xsl";
             if(!info.allPrefixes.contains(stdPrefix)) {

test/data/container/pr_0_start.xml

@@ -0,0 +1,5 @@
+<root>
+    <a1><b/></a1>
+    <a2><b/></a2>
+    <a3><b/></a3>
+</root>

test/data/container/pr_1_start.xml

@@ -0,0 +1,5 @@
+<root>
+    <a1><b/></a1>
+    <a2 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"><b/></a2>
+    <a3><b/></a3>
+</root>

test/data/container/pr_3_start.xml

@@ -0,0 +1,5 @@
+<root xmlns:xsl="xxcvxcvxcvxcbv" xmlns:xsl3="xxcvxcvxcvxcbv">
+    <a1><b/></a1>
+    <a2 xmlns:xsl="xxcvxcvxcvxcbv" xmlns:xsl0="xxcvxcvxcvxcbv" xmlns:xsl4="xxcvxcvxcvxcbv" ><b xmlns:xsl1="xxcvxcvxcvxcbv" /></a2>
+    <a3><b/></a3>
+</root>

test/testcontainer.cpp

@@ -865,9 +865,31 @@ bool TestContainer::testEnable(const bool isInsert, const QString &fileStart, co
 #define ISP_NRIS_START "../test/data/container/dp_4_start.xml"
 #define ISP_NRIS_END "../test/data/container/dp_4_end.xml"
 
+#define PR_0_START "../test/data/container/pr_0_start.xml"
+#define PR_1_START "../test/data/container/pr_1_start.xml"
+#define PR_2_START "../test/data/container/pr_3_start.xml"
+
 bool TestContainer::testInsertDisablingParent()
 {
     _testName = "testInsertDisablingParent";
+
+    {
+        QList<int> selectPath;
+        selectPath << 0 << 1 ;
+        // none
+        if( !testUnusedPrefix("testUnusedPrefix0", PR_0_START, selectPath, "xsl") ) {
+            return false;
+        }
+        // exists
+        if( !testUnusedPrefix("testUnusedPrefix1", PR_1_START, selectPath, "xsl0") ) {
+            return false;
+        }
+        // exists, but other
+        if( !testUnusedPrefix("testUnusedPrefix2", PR_2_START, selectPath, "xsl2") ) {
+            return false;
+        }
+    }
+
     QList<int> selectPath;
     selectPath.clear();
     selectPath << 0 << 1 ;
@@ -988,3 +1010,29 @@ bool TestContainer::testGeneric2(const QString &testName, const QString &fileSta
     }
     return true;
 }
+
+bool TestContainer::testUnusedPrefix(const QString &testName, const QString &fileStart, QList<int> selectPath, const QString &expectedPrefix)
+{
+    _testName = testName ;
+    QString actionName = "testUnusedPrefix" ;
+    QString msgFile = QString(" file:'%1'").arg(fileStart);
+
+    App app;
+    if(!app.init()) {
+        return error(QString("init app %1").arg(msgFile));
+    }
+    if( !app.mainWindow()->loadFile(fileStart) ){
+        return error(QString("Unable to load file:%1").arg(fileStart));
+    }
+    Regola *regola = app.mainWindow()->getRegola();
+    Element *selectedElement = NULL ;
+    selectedElement = regola->findElementByArray(selectPath);
+    if( NULL == selectedElement ) {
+        return error(QString("Unable to find element for path:'%1' file:'%2'").arg(listIntToString(selectPath)).arg(fileStart));
+    }
+    const QString resultingPrefix = regola->unusedPrefixByElement(selectedElement);
+    if( resultingPrefix != expectedPrefix ) {
+        return error(QString("Expecting '%1', found:'%2'").arg(expectedPrefix).arg(resultingPrefix));
+    }
+    return true;
+}

test/testcontainer.h

@@ -33,6 +33,7 @@ class TestContainer : public TestBase
     bool testGeneric(const bool isInsert, const QString &testName, const QString &fileStart, const QString &fileEnd , QList<int> selectPath, const bool expected);
     bool testGeneric2(const QString &testName, const QString &fileStart, const QString &fileEnd, QList<int> selectPath);
     bool testEnableRegola(MainWindow *window, const QString &fileName, QList<int> &selectPath, const bool expected, const QString &actionName, Element *&selectedElement);
+    bool testUnusedPrefix(const QString &testName, const QString &fileStart, QList<int> selectPath, const QString &expectedPrefix);
 public:
     TestContainer();
     ~TestContainer();