From fdedb49b76b8f9ad69611fbfea6b8371ae1ec3a1 Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Fri, 20 Jan 2012 01:55:51 +0200 Subject: Blow up earlier when adding test rows without columns. Previously, the assertation triggered was rather unhelpful: QFATAL : tst_QHash::qhash_qt4() ASSERT: "d->dataCount < d->parent->elementCount()" in file qtestdata.cpp, line 88" We now try a bit harder to be user-friendly. Change-Id: I2e3a5ae27914d44fc1dc89af2a084e3d798fe221 Reviewed-by: Jonas Gastal Reviewed-by: Giuseppe D'Angelo Reviewed-by: Jason McDonald --- src/testlib/qtestcase.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/testlib/qtestcase.cpp') diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 666a0e880f..0c2fe2dbd8 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2286,6 +2286,7 @@ QTestData &QTest::newRow(const char *dataTag) QTEST_ASSERT_X(dataTag, "QTest::newRow()", "Data tag can not be null"); QTestTable *tbl = QTestTable::currentTestTable(); QTEST_ASSERT_X(tbl, "QTest::newRow()", "Cannot add testdata outside of a _data slot."); + QTEST_ASSERT_X(tbl->elementCount(), "QTest::newRow()", "Must add columns before attempting to add rows."); return *tbl->newData(dataTag); } -- cgit v1.2.3