Fix DependencySorter.sortedLayerIds. Fixes #14281

qgis · Feb 12, 2016 · 6bbe3b93a22a310754f55f739c6cef8b1043a902 · 6bbe3b9
1 parent 0c478d0
commit 6bbe3b93a22a310754f55f739c6cef8b1043a902
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/core/qgslayerdefinition.cpp b/src/core/qgslayerdefinition.cpp
@@ -230,6 +230,7 @@ void QgsLayerDefinition::DependencySorter::init( const QDomDocument& doc )
     {
       sortedLayers << id;
       mSortedLayerNodes << node;
+      mSortedLayerIds << id;
     }
     else
       layersToSort << qMakePair( id, node );

diff --git a/tests/src/python/test_qgslayerdefinition.py b/tests/src/python/test_qgslayerdefinition.py
@@ -52,10 +52,13 @@ def testDependency(self):
         doc.setContent(inDoc)
         dep = QgsLayerDefinition.DependencySorter(doc)
         nodes = dep.sortedLayerNodes()
+        nodeIds = dep.sortedLayerIds()
         self.assertTrue(not dep.hasCycle())
         self.assertTrue(not dep.hasMissingDependency())
         self.assertEqual(nodes[0].firstChildElement("id").text(), "layerA")
         self.assertEqual(nodes[1].firstChildElement("id").text(), "layerB")
+        self.assertEqual(nodeIds[0], "layerA")
+        self.assertEqual(nodeIds[1], "layerB")
 
     def testMissingDependency(self):
         inDoc = """
@@ -76,7 +79,6 @@ def testMissingDependency(self):
         doc = QDomDocument("testdoc")
         doc.setContent(inDoc)
         dep = QgsLayerDefinition.DependencySorter(doc)
-        nodes = dep.sortedLayerNodes()
         self.assertTrue(not dep.hasCycle())
         self.assertTrue(dep.hasMissingDependency())
 
@@ -99,7 +101,6 @@ def testCyclicDependency(self):
         doc = QDomDocument("testdoc")
         doc.setContent(inDoc)
         dep = QgsLayerDefinition.DependencySorter(doc)
-        nodes = dep.sortedLayerNodes()
         self.assertTrue(dep.hasCycle())
 
     def testVectorAndRaster(self):