BUG: Fix SubjectHierarchyGenericSelfTest

Follow-up of 5f7ae8d (ENH: Improve empty folder visibility logic): - The test assumed incorrect shown item count including the empty folder (which flag is enabled by default), expected item counts has been fixed - Update testAttributeFilters to check for showEmptyHierarchyItems flag, which has not been tested until now Re #7288 Co-authored-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Slicer · Oct 18, 2023 · 4bf2f13 · 4bf2f13
1 parent 0721272
commit 4bf2f13
Showing 1 changed file with 24 additions and 19 deletions.
diff --git a/Modules/Loadable/SubjectHierarchy/Testing/Python/SubjectHierarchyGenericSelfTest.py b/Modules/Loadable/SubjectHierarchy/Testing/Python/SubjectHierarchyGenericSelfTest.py
@@ -473,44 +473,47 @@ def section_AttributeFilters(self):
 
         shProxyModel = shTreeView.sortFilterProxyModel()
 
-        def testAttributeFilters(filteredObject, proxyModel):
+        def testAttributeFilters(filteredObject, proxyModel, showEmptyHierarchyItems=True):
+
+            expectedEmptyHierarchyItemCount = 1 if showEmptyHierarchyItems else 0
+
             # Check include node attribute name filter
             self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 9)
             filteredObject.includeNodeAttributeNamesFilter = ['Markups.MovingInSliceView']
-            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 6)
+            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 5 + expectedEmptyHierarchyItemCount)
             filteredObject.addNodeAttributeFilter('Sajt')
             self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 9)
             filteredObject.includeNodeAttributeNamesFilter = []
             self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 9)
             # Check attribute value filter
             filteredObject.addNodeAttributeFilter('Markups.MovingMarkupIndex', 3)
-            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 4)
+            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 3 + expectedEmptyHierarchyItemCount)
             filteredObject.includeNodeAttributeNamesFilter = []
             self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 9)
             filteredObject.addNodeAttributeFilter('Markups.MovingMarkupIndex', '3')
-            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 4)
+            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 3 + expectedEmptyHierarchyItemCount)
             filteredObject.includeNodeAttributeNamesFilter = []
             self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 9)
 
             # Check exclude node attribute name filter (overrides include node attribute name filter)
             filteredObject.excludeNodeAttributeNamesFilter = ['Markups.MovingInSliceView']
-            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 5)
+            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 4 + expectedEmptyHierarchyItemCount)
             filteredObject.excludeNodeAttributeNamesFilter = []
             self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 9)
             # Check if exclude indeed overrides include node attribute name filter
             filteredObject.includeNodeAttributeNamesFilter = ['Markups.MovingMarkupIndex']
             self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 9)
             filteredObject.excludeNodeAttributeNamesFilter = ['Markups.MovingInSliceView']
-            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 5)
+            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 4 + expectedEmptyHierarchyItemCount)
             filteredObject.includeNodeAttributeNamesFilter = []
             filteredObject.excludeNodeAttributeNamesFilter = []
             self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 9)
 
             # Check include item attribute name filter
             filteredObject.includeItemAttributeNamesFilter = ['ItemAttribute1']
-            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 3)
+            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 2 + expectedEmptyHierarchyItemCount)
             filteredObject.includeItemAttributeNamesFilter = ['ItemAttribute1', 'FolderAttribute1']
-            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 3)
+            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 2 + expectedEmptyHierarchyItemCount)
             filteredObject.addItemAttributeFilter('ItemAttribute2')
             self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 4)
             filteredObject.includeItemAttributeNamesFilter = ['ItemAttribute1', 'ItemAttribute2']
@@ -521,7 +524,7 @@ def testAttributeFilters(filteredObject, proxyModel):
             # Check legacy (item) attribute value filter
             filteredObject.attributeNameFilter = 'ItemAttribute1'
             filteredObject.attributeValueFilter = '1'
-            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 3)
+            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 2 + expectedEmptyHierarchyItemCount)
             filteredObject.attributeNameFilter = ''
             self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 9)
 
@@ -532,9 +535,10 @@ def testAttributeFilters(filteredObject, proxyModel):
             self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 9)
             # Check if exclude indeed overrides include item attribute filter
             filteredObject.includeItemAttributeNamesFilter = ['ItemAttribute1']
-            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 3)
+            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 2 + expectedEmptyHierarchyItemCount)
             filteredObject.excludeItemAttributeNamesFilter = ['ItemAttribute1']
-            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 2)
+            expectedEmptyHierarchyItemCountAferExclude = 2 if showEmptyHierarchyItems else 0
+            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 0 + expectedEmptyHierarchyItemCountAferExclude)
             filteredObject.includeItemAttributeNamesFilter = []
             filteredObject.excludeItemAttributeNamesFilter = []
             self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 9)
@@ -546,7 +550,7 @@ def testAttributeFilters(filteredObject, proxyModel):
 
             # Check attribute filtering with class name and attribute value
             filteredObject.addNodeAttributeFilter('Markups.MovingMarkupIndex', 3, True, 'vtkMRMLMarkupsCurveNode')
-            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 4)
+            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 3 + expectedEmptyHierarchyItemCount)
             filteredObject.addNodeAttributeFilter('ParentAttribute', '', True, 'vtkMRMLMarkupsAngleNode')
             self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 5)
             filteredObject.addNodeAttributeFilter('ChildAttribute', '', True, 'vtkMRMLMarkupsAngleNode')
@@ -555,20 +559,21 @@ def testAttributeFilters(filteredObject, proxyModel):
             self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 9)
             # Check with empty attribute value
             filteredObject.addNodeAttributeFilter('Markups.MovingMarkupIndex', '', True, 'vtkMRMLMarkupsCurveNode')
-            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 5)
+            self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 4 + expectedEmptyHierarchyItemCount)
             filteredObject.includeNodeAttributeNamesFilter = []
             self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 9)
 
-        logging.info('Test attribute filters on proxy model directly')
+        logging.info('Test attribute filters on proxy model directly (showEmptyHierarchyItems=True)')
         testAttributeFilters(shProxyModel, shProxyModel)
-        logging.info('Test attribute filters on tree view')
+        logging.info('Test attribute filters on tree view (showEmptyHierarchyItems=True)')
         testAttributeFilters(shTreeView, shProxyModel)
 
-        # Test show empty hierarchy items filter
-        shProxyModel.addNodeAttributeFilter('Markups.MovingMarkupIndex', 3)
-        self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 4)
         shProxyModel.showEmptyHierarchyItems = False
-        self.assertEqual(shProxyModel.acceptedItemCount(shNode.GetSceneItemID()), 3)
+
+        logging.info('Test attribute filters on proxy model directly (showEmptyHierarchyItems=False)')
+        testAttributeFilters(shProxyModel, shProxyModel, showEmptyHierarchyItems=False)
+        logging.info('Test attribute filters on tree view (showEmptyHierarchyItems=False)')
+        testAttributeFilters(shTreeView, shProxyModel, showEmptyHierarchyItems=False)
 
     # ------------------------------------------------------------------------------
     def section_ComboboxFeatures(self):