Unit tests for style proxy model smart group filter

qgis · Sep 12, 2018 · 68c0d7f · 68c0d7f
1 parent 95d65ae
commit 68c0d7f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/core/symbology/qgsstylemodel.cpp b/src/core/symbology/qgsstylemodel.cpp
@@ -479,8 +479,8 @@ void QgsStyleProxyModel::setSmartGroupId( int id )
 
   if ( mSmartGroupId >= 0 )
   {
-    mSmartGroupSymbolNames = mStyle->symbolsOfSmartgroup( QgsStyle::SymbolEntity, mTagId );
-    mSmartGroupSymbolNames.append( mStyle->symbolsOfSmartgroup( QgsStyle::ColorrampEntity, mTagId ) );
+    mSmartGroupSymbolNames = mStyle->symbolsOfSmartgroup( QgsStyle::SymbolEntity, mSmartGroupId );
+    mSmartGroupSymbolNames.append( mStyle->symbolsOfSmartgroup( QgsStyle::ColorrampEntity, mSmartGroupId ) );
   }
   else
   {

diff --git a/tests/src/python/test_qgsstylemodel.py b/tests/src/python/test_qgsstylemodel.py
@@ -692,7 +692,28 @@ def test_filter_proxy(self):
         self.assertEqual(model.rowCount(), 8)
 
         # smart group filter
-        # can't test in Python -- smart groups cannot be set here!
+        style.addSmartgroup('smart', 'AND', ['tag 3'], [], ['c'], [])
+        self.assertEqual(model.smartGroupId(), -1)
+        model.setSmartGroupId(1)
+        self.assertEqual(model.smartGroupId(), 1)
+        self.assertEqual(model.rowCount(), 1)
+        self.assertEqual(model.data(model.index(0, 0)), 'C')
+        style.addSmartgroup('smart', 'OR', ['tag 3'], [], ['c'], [])
+        model.setSmartGroupId(2)
+        self.assertEqual(model.rowCount(), 2)
+        self.assertEqual(model.data(model.index(0, 0)), 'C')
+        self.assertEqual(model.data(model.index(1, 0)), 'ramp c')
+        style.tagSymbol(QgsStyle.SymbolEntity, 'a', ['tag 3'])
+        self.assertEqual(model.rowCount(), 3)
+        self.assertEqual(model.data(model.index(0, 0)), 'a')
+        self.assertEqual(model.data(model.index(1, 0)), 'C')
+        self.assertEqual(model.data(model.index(2, 0)), 'ramp c')
+        style.renameColorRamp('ramp c', 'x')
+        self.assertEqual(model.rowCount(), 2)
+        self.assertEqual(model.data(model.index(0, 0)), 'a')
+        self.assertEqual(model.data(model.index(1, 0)), 'C')
+        model.setSmartGroupId(-1)
+        self.assertEqual(model.rowCount(), 8)
 
 
 if __name__ == '__main__':