Changeset 65154 in vbox for trunk/src/VBox/ValidationKit/testmanager/core

Timestamp:

Jan 5, 2017 1:41:32 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

112657

Message:

TestManager: Added clickable element-of / not-an-element-of on filters to avoid a lot of clicking just to remove a couple of items from the output.

Location:

trunk/src/VBox/ValidationKit/testmanager/core

Files:

• base.py (modified) (3 diffs)
• testresults.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testmanager/core/base.py

@@ -1180 +1180 @@
     ## @name The kind of filtering.
     ## @{
-    ksKind_AnyOf = 'any-of';    ##< Any of the selected values are included (common).
-    ksKind_AllOf = 'all-of';    ##< All of the selected values must be matched (rare).
+    ## 'Element of' by default, 'not an element of' when fInverted is False.
+    ksKind_ElementOfOrNot = 'element-of-or-not';
+    ## The criterion is a special one and cannot be inverted.
+    ksKind_Special        = 'special';
     ## @}
 
@@ -1190 +1192 @@
     ## @}
 
-    def __init__(self, sName, sVarNm = None, sType = ksType_UInt, sState = ksState_NotSelected, sKind = ksKind_AnyOf,
+    def __init__(self, sName, sVarNm = None, sType = ksType_UInt, sState = ksState_NotSelected, sKind = ksKind_ElementOfOrNot,
                  sTable = None, sColumn = None, oSub = None):
-        assert len(sVarNm) in (2,3); # required by wuimain.py
+        assert len(sVarNm) == 2;    # required by wuimain.py for filtering.
         self.sName      = sName;
         self.sState     = sState;
-        self.sVarNm     = sVarNm if sVarNm is not None else sName;
         self.sType      = sType;
         self.sKind      = sKind;
-        self.aoSelected = [];       ##< Single value, any type.
+        self.sVarNm     = sVarNm;
+        self.aoSelected = [];       ##< User input from sVarNm. Single value, type according to sType.
+        self.sInvVarNm  = 'i' + sVarNm if sKind == self.ksKind_ElementOfOrNot else None;
+        self.fInverted  = False;    ##< User input from sInvVarNm. Inverts the operation (-> not an element of).
         self.aoPossible = [];       ##< type: list[FilterCriterionValueAndDescription]
         self.sTable     = sTable;
@@ -1251 +1255 @@
             assert False;
         if len(oCriterion.aoSelected) > 0:
-            oCriterion.sState     = FilterCriterion.ksState_Selected;
+            oCriterion.sState = FilterCriterion.ksState_Selected;
         else:
-            oCriterion.sState     = FilterCriterion.ksState_NotSelected;
+            oCriterion.sState = FilterCriterion.ksState_NotSelected;
+
+        if oCriterion.sKind == FilterCriterion.ksKind_ElementOfOrNot:
+            oCriterion.fInverted = oDisp.getBoolParam(oCriterion.sInvVarNm, fDefault = False);
 
         if oCriterion.oSub is not None:

trunk/src/VBox/ValidationKit/testmanager/core/testresults.py

@@ -720 +720 @@
         assert self.aCriteria[self.kiMemory] is oCrit;
 
-        oCrit = FilterCriterion('Misc', sVarNm = 'cf', sTable = 'TestBoxesWithStrings', sColumn = 'it_is_complicated');
+        oCrit = FilterCriterion('Misc', sVarNm = 'cf', sKind = FilterCriterion.ksKind_Special,
+                                sTable = 'TestBoxesWithStrings', sColumn = 'it_is_complicated');
         oCrit.aoPossible = [
             FilterCriterionValueAndDescription(self.kiMisc_NestedPaging,      "req nested paging"),
@@ -775 +776 @@
             else:
                 if iCrit == self.kiMemory:
-                    sQuery += '%s   AND (%s.%s / 1024) IN (' % (sExtraIndent, oCrit.sTable, oCrit.sColumn,);
+                    sQuery += '%s   AND (%s.%s / 1024)' % (sExtraIndent, oCrit.sTable, oCrit.sColumn,);
                 else:
-                    sQuery += '%s   AND %s.%s IN (' % (sExtraIndent, oCrit.sTable, oCrit.sColumn,);
+                    sQuery += '%s   AND %s.%s' % (sExtraIndent, oCrit.sTable, oCrit.sColumn,);
+                if not oCrit.fInverted:
+                    sQuery += ' IN (';
+                else:
+                    sQuery += ' NOT IN (';
                 if oCrit.sType == FilterCriterion.ksType_String:
                     sQuery += ', '.join('\'%s\'' % (sValue,) for sValue in oCrit.aoSelected) + ')\n';