summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-11-01 13:53:11 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-02 02:22:50 +0100
commit98992786f3ecb477e7b178237b6afee1153d59ef (patch)
treef03a4a1159b3c8f9458db25d4cb89f90a8cf92ec /tests/auto/widgets
parent238bdc2e913399a40a74f53c7c2c8496a49b637d (diff)
Remove redundant code from qsortfilterproxymodel test
Remove a couple of "#if 1" directives (but not their contents), which have been present since before the tests were imported into the Qt repository in 2006. Change-Id: Id43aff37843e7a44ed96973f809de3838ba0e5b9 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/widgets')
-rw-r--r--tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
index 497034bd2a..8922f055bc 100644
--- a/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
@@ -414,20 +414,18 @@ void tst_QSortFilterProxyModel::sortHierarchy_data()
QTest::addColumn<QStringList>("initial");
QTest::addColumn<QStringList>("expected");
-#if 1
QTest::newRow("flat ascending")
<< static_cast<int>(Qt::AscendingOrder)
<< (QStringList()
<< "c" << "f" << "d" << "e" << "a" << "b")
<< (QStringList()
<< "a" << "b" << "c" << "d" << "e" << "f");
-#endif
+
QTest::newRow("simple hierarchy")
<< static_cast<int>(Qt::AscendingOrder)
<< (QStringList() << "a" << "<" << "b" << "<" << "c" << ">" << ">")
<< (QStringList() << "a" << "<" << "b" << "<" << "c" << ">" << ">");
-#if 1
QTest::newRow("hierarchical ascending")
<< static_cast<int>(Qt::AscendingOrder)
<< (QStringList()
@@ -488,7 +486,6 @@ void tst_QSortFilterProxyModel::sortHierarchy_data()
<< ">"
<< "i"
<< ">");
-#endif
}
void tst_QSortFilterProxyModel::sortHierarchy()