Add QItemSelectionRange::operator<()

Reviewed-by: Olivier Goffart
Merge-Request: 688

1 files changed, 159 insertions, 0 deletions

diff --git a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
index bfe306d..46bd4a2 100644
--- a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
+++ b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
@@ -95,6 +95,8 @@ private slots:
     void QTBUG5671_layoutChangedWithAllSelected();
     void QTBUG2804_layoutChangedTreeSelection();
     void deselectRemovedMiddleRange();
+    void rangeOperatorLessThan_data();
+    void rangeOperatorLessThan();
 
 private:
     QAbstractItemModel *model;
@@ -2401,6 +2403,163 @@ void tst_QItemSelectionModel::deselectRemovedMiddleRange()
     QVERIFY(spy.size() == 1);
 }
 
+static QStandardItemModel* getModel(QObject *parent)
+{
+    QStandardItemModel *model = new QStandardItemModel(parent);
+
+    for (int i = 0; i < 4; ++i) {
+        QStandardItem *parentItem = model->invisibleRootItem();
+        QList<QStandardItem*> list;
+        for (int j = 0; j < 4; ++j) {
+            list.append(new QStandardItem(QString("item %1, %2").arg(i).arg(j)));
+        }
+        parentItem->appendRow(list);
+        parentItem = list.first();
+        for (int j = 0; j < 4; ++j) {
+            QList<QStandardItem*> list;
+            for (int k = 0; k < 4; ++k) {
+                list.append(new QStandardItem(QString("item %1, %2").arg(i).arg(j)));
+            }
+            parentItem->appendRow(list);
+        }
+    }
+    return model;
+}
+
+enum Result {
+  LessThan,
+  NotLessThan,
+  NotEqual
+};
+
+Q_DECLARE_METATYPE(Result);
+
+void tst_QItemSelectionModel::rangeOperatorLessThan_data()
+{
+    QTest::addColumn<int>("parent1");
+    QTest::addColumn<int>("top1");
+    QTest::addColumn<int>("left1");
+    QTest::addColumn<int>("bottom1");
+    QTest::addColumn<int>("right1");
+    QTest::addColumn<int>("parent2");
+    QTest::addColumn<int>("top2");
+    QTest::addColumn<int>("left2");
+    QTest::addColumn<int>("bottom2");
+    QTest::addColumn<int>("right2");
+    QTest::addColumn<Result>("result");
+
+    QTest::newRow("lt01") << -1 << 0 << 0 << 3 << 3
+                          << -1 << 0 << 0 << 3 << 3 << NotLessThan;
+
+    QTest::newRow("lt02") << -1 << 0 << 0 << 2 << 3
+                          << -1 << 0 << 0 << 3 << 3 << LessThan;
+    QTest::newRow("lt03") << -1 << 0 << 0 << 3 << 2
+                          << -1 << 0 << 0 << 3 << 3 << LessThan;
+    QTest::newRow("lt04") << -1 << 0 << 0 << 2 << 2
+                          << -1 << 0 << 0 << 3 << 3 << LessThan;
+
+    QTest::newRow("lt05") << -1 << 0 << 0 << 3 << 3
+                          << -1 << 0 << 0 << 2 << 3 << NotLessThan;
+    QTest::newRow("lt06") << -1 << 0 << 0 << 3 << 3
+                          << -1 << 0 << 0 << 3 << 2 << NotLessThan;
+    QTest::newRow("lt07") << -1 << 0 << 0 << 3 << 3
+                          << -1 << 0 << 0 << 2 << 2 << NotLessThan;
+
+    QTest::newRow("lt08") << -1 << 0 << 0 << 3 << 3
+                          << 0 << 0 << 0 << 3 << 3 << NotEqual;
+    QTest::newRow("lt09") << 1 << 0 << 0 << 3 << 3
+                          << 0 << 0 << 0 << 3 << 3 << NotEqual;
+    QTest::newRow("lt10") << 1 << 0 << 0 << 1 << 1
+                          << 0 << 2 << 2 << 3 << 3 << NotEqual;
+    QTest::newRow("lt11") << 1 << 2 << 2 << 3 << 3
+                          << 0 << 0 << 0 << 1 << 1 << NotEqual;
+
+    QTest::newRow("lt12") << -1 << 0 << 0 << 1 << 1
+                          << -1 << 2 << 2 << 3 << 3 << LessThan;
+    QTest::newRow("lt13") << -1 << 2 << 2 << 3 << 3
+                          << -1 << 0 << 0 << 1 << 1 << NotLessThan;
+    QTest::newRow("lt14") << 1 << 0 << 0 << 1 << 1
+                          << 1 << 2 << 2 << 3 << 3 << LessThan;
+    QTest::newRow("lt15") << 1 << 2 << 2 << 3 << 3
+                          << 1 << 0 << 0 << 1 << 1 << NotLessThan;
+
+    QTest::newRow("lt16") << -1 << 0 << 0 << 2 << 2
+                          << -1 << 1 << 1 << 3 << 3 << LessThan;
+    QTest::newRow("lt17") << -1 << 1 << 1 << 3 << 3
+                          << -1 << 0 << 0 << 2 << 2 << NotLessThan;
+    QTest::newRow("lt18") << 1 << 0 << 0 << 2 << 2
+                          << 1 << 1 << 1 << 3 << 3 << LessThan;
+    QTest::newRow("lt19") << 1 << 1 << 1 << 3 << 3
+                          << 1 << 0 << 0 << 2 << 2 << NotLessThan;
+}
+
+void tst_QItemSelectionModel::rangeOperatorLessThan()
+{
+  QStandardItemModel *model1 = getModel(this);
+  QStandardItemModel *model2 = getModel(this);
+
+  QFETCH(int, parent1);
+  QFETCH(int, top1);
+  QFETCH(int, left1);
+  QFETCH(int, bottom1);
+  QFETCH(int, right1);
+  QFETCH(int, parent2);
+  QFETCH(int, top2);
+  QFETCH(int, left2);
+  QFETCH(int, bottom2);
+  QFETCH(int, right2);
+  QFETCH(Result, result);
+
+  QModelIndex p1 = model1->index(parent1, 0);
+
+  QModelIndex tl1 = model1->index(top1, left1, p1);
+  QModelIndex br1 = model1->index(bottom1, right1, p1);
+
+  QItemSelectionRange r1(tl1, br1);
+
+  QModelIndex p2 = model1->index(parent2, 0);
+
+  QModelIndex tl2 = model1->index(top2, left2, p2);
+  QModelIndex br2 = model1->index(bottom2, right2, p2);
+
+  QItemSelectionRange r2(tl2, br2);
+
+  if (result == LessThan)
+      QVERIFY(r1 < r2);
+  else if (result == NotLessThan)
+      QVERIFY(!(r1 < r2));
+  else if (result == NotEqual)
+      if (!(r1 < r2))
+          QVERIFY(r2 < r1);
+
+  // Ranges in different models are always non-equal
+
+  QModelIndex p3 = model2->index(parent1, 0);
+
+  QModelIndex tl3 = model2->index(top1, left1, p3);
+  QModelIndex br3 = model2->index(bottom1, right1, p3);
+
+  QItemSelectionRange r3(tl3, br3);
+
+  if (!(r1 < r3))
+    QVERIFY(r3 < r1);
+
+  if (!(r2 < r3))
+    QVERIFY(r3 < r2);
+
+  QModelIndex p4 = model2->index(parent2, 0);
+
+  QModelIndex tl4 = model2->index(top2, left2, p4);
+  QModelIndex br4 = model2->index(bottom2, right2, p4);
+
+  QItemSelectionRange r4(tl4, br4);
+
+  if (!(r1 < r4))
+    QVERIFY(r4 < r1);
+
+  if (!(r2 < r4))
+    QVERIFY(r4 < r2);
+}
 
 QTEST_MAIN(tst_QItemSelectionModel)
 #include "tst_qitemselectionmodel.moc"