test: Simplify IndexFilter tests

Author: oKcerG

tests/tst_indexfilter.qml

@@ -7,73 +7,62 @@ Item {
     property list<IndexFilter> filters: [
         IndexFilter {
             property string tag: "basicUsage"
-            property int expectedModelCount: 3
-            property var expectedValues: [3, 1, 2];
+            property var expectedValues: [3, 1, 2]
             minimumIndex: 1; maximumIndex: 3
         },
         IndexFilter {
             property string tag: "outOfBounds"
-            property int expectedModelCount: 0
+            property var expectedValues: []
             minimumIndex: 3; maximumIndex: 1
         },
         IndexFilter {
             property string tag: "0to0Inverted"
-            property int expectedModelCount: 4
             property var expectedValues: [3,1,2,4]
             minimumIndex: 0; maximumIndex: 0; inverted: true
         },
         IndexFilter {
             property string tag: "0to0" // bug / issue #15
-            property int expectedModelCount: 1
             property var expectedValues: [5]
             minimumIndex: 0; maximumIndex: 0
         },
         IndexFilter {
             property string tag: "basicUsageInverted"
-            property int expectedModelCount: 2
             property var expectedValues: [5,4]
             minimumIndex: 1; maximumIndex: 3; inverted: true
         },
         IndexFilter {
             property string tag: "last"
-            property int expectedModelCount: 1
             property var expectedValues: [4]
             minimumIndex: -1
         },
         IndexFilter {
             property string tag: "fromEnd"
-            property int expectedModelCount: 2
             property var expectedValues: [2, 4]
             minimumIndex: -2
         },
         IndexFilter {
             property string tag: "fromEndRange"
-            property int expectedModelCount: 2
             property var expectedValues: [1, 2]
             minimumIndex: -3
             maximumIndex: -2
         },
         IndexFilter {
             property string tag: "mixedSignRange"
-            property int expectedModelCount: 3
             property var expectedValues: [3, 1, 2]
             minimumIndex: 1
             maximumIndex: -2
         },
         IndexFilter {
             property string tag: "toBigFilter"
-            property int expectedModelCount: 0
             property var expectedValues: []
             minimumIndex: 5
         },
         IndexFilter {
             property string tag: "noFilter"
-            property int expectedModelCount: 5
             property var expectedValues: [5, 3, 1, 2, 4]
         },
         IndexFilter {
             property string tag: "undefinedFilter"
-            property int expectedModelCount: 5
             property var expectedValues: [5, 3, 1, 2, 4]
             minimumIndex: undefined
             maximumIndex: null
@@ -105,14 +94,11 @@ Item {
         function test_minMax(filter) {
             testModel.filters = filter;
 
-            verify(testModel.count === filter.expectedModelCount,
-                   "Expected count " + filter.expectedModelCount + ", actual count: " + testModel.count);
+            var actualValues = [];
             for (var i = 0; i < testModel.count; i++)
-            {
-                var modelValue = testModel.data(testModel.index(i, 0));
-                verify(modelValue === filter.expectedValues[i],
-                       "Expected testModel value " + filter.expectedValues[i] + ", actual: " + modelValue);
-            }
+                actualValues.push(testModel.data(testModel.index(i, 0)));
+
+            compare(actualValues, filter.expectedValues);
         }
     }
 }