whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eliminate duplicate data row names in dbus, tools and xml autotests. 

Change-Id: Ic734435f57bb4f2160ecb3bc645e642207931a99
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
bb10
Jason McDonald 2012-02-14 13:13:05 +10:00 committed by Qt by Nokia
parent 6dfb1de099
commit eb64bb89cf
3 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp
View File

@ -470,12 +470,12 @@ void tst_QDBusXmlParser::properties_data()
prop.type = "i";
prop.access = QDBusIntrospection::Property::Read;
map << prop;
QTest::newRow("two") <<
QTest::newRow("two-1") <<
"<property name=\"foo\" type=\"s\" access=\"readwrite\"/>"
"<property name=\"bar\" type=\"i\" access=\"read\"/>" << map;
// invert the order of the declaration
QTest::newRow("two") <<
QTest::newRow("two-2") <<
"<property name=\"bar\" type=\"i\" access=\"read\"/>"
"<property name=\"foo\" type=\"s\" access=\"readwrite\"/>" << map;

6
tests/auto/tools/moc/tst_moc.cpp
View File

@ -1623,7 +1623,7 @@ void tst_Moc::warnings_data()
<< QString("standard input:1: Warning: Property declaration x has no READ accessor function. The property will be invalid.");
// Passing "-nn" should NOT suppress the warning
QTest::newRow("Invalid property warning")
QTest::newRow("Invalid property warning with -nn")
<< QByteArray("class X : public QObject { Q_OBJECT Q_PROPERTY(int x) };")
<< (QStringList() << "-nn")
<< 0
@ -1631,7 +1631,7 @@ void tst_Moc::warnings_data()
<< QString("standard input:1: Warning: Property declaration x has no READ accessor function. The property will be invalid.");
// Passing "-nw" should suppress the warning
QTest::newRow("Invalid property warning")
QTest::newRow("Invalid property warning with -nw")
<< QByteArray("class X : public QObject { Q_OBJECT Q_PROPERTY(int x) };")
<< (QStringList() << "-nw")
<< 0
@ -1655,7 +1655,7 @@ void tst_Moc::warnings_data()
<< QString("standard input:1: Error: Class contains Q_OBJECT macro but does not inherit from QObject");
// "-nw" should not suppress the error
QTest::newRow("Does not inherit QObject with -nn")
QTest::newRow("Does not inherit QObject with -nw")
<< QByteArray("class X { Q_OBJECT };")
<< (QStringList() << "-nw")
<< 1

51
tests/auto/xml/dom/qdom/tst_qdom.cpp
View File

@ -555,7 +555,6 @@ void tst_QDom::saveWithSerialization_data() const
if (prefix.isEmpty())
QFAIL("Cannot find testdata!");
QTest::newRow("doc01.xml") << QString(prefix + "/doc01.xml");
QTest::newRow("doc01.xml") << QString(prefix + "/doc01.xml");
QTest::newRow("doc02.xml") << QString(prefix + "/doc02.xml");
QTest::newRow("doc03.xml") << QString(prefix + "/doc03.xml");
QTest::newRow("doc04.xml") << QString(prefix + "/doc04.xml");
@ -1868,34 +1867,34 @@ void tst_QDom::setContentWhitespace_data() const
QTest::addColumn<QString>("doc");
QTest::addColumn<bool>("expectedValidity");
QTest::newRow("") << QString::fromLatin1(" <e/>") << true;
QTest::newRow("") << QString::fromLatin1(" <e/>") << true;
QTest::newRow("") << QString::fromLatin1(" <e/>") << true;
QTest::newRow("") << QString::fromLatin1(" <e/>") << true;
QTest::newRow("") << QString::fromLatin1("\n<e/>") << true;
QTest::newRow("") << QString::fromLatin1("\n\n<e/>") << true;
QTest::newRow("") << QString::fromLatin1("\n\n\n<e/>") << true;
QTest::newRow("") << QString::fromLatin1("\n\n\n\n<e/>") << true;
QTest::newRow("") << QString::fromLatin1("\t<e/>") << true;
QTest::newRow("") << QString::fromLatin1("\t\t<e/>") << true;
QTest::newRow("") << QString::fromLatin1("\t\t\t<e/>") << true;
QTest::newRow("") << QString::fromLatin1("\t\t\t\t<e/>") << true;
QTest::newRow("data1") << QString::fromLatin1(" <e/>") << true;
QTest::newRow("data2") << QString::fromLatin1(" <e/>") << true;
QTest::newRow("data3") << QString::fromLatin1(" <e/>") << true;
QTest::newRow("data4") << QString::fromLatin1(" <e/>") << true;
QTest::newRow("data5") << QString::fromLatin1("\n<e/>") << true;
QTest::newRow("data6") << QString::fromLatin1("\n\n<e/>") << true;
QTest::newRow("data7") << QString::fromLatin1("\n\n\n<e/>") << true;
QTest::newRow("data8") << QString::fromLatin1("\n\n\n\n<e/>") << true;
QTest::newRow("data9") << QString::fromLatin1("\t<e/>") << true;
QTest::newRow("data10") << QString::fromLatin1("\t\t<e/>") << true;
QTest::newRow("data11") << QString::fromLatin1("\t\t\t<e/>") << true;
QTest::newRow("data12") << QString::fromLatin1("\t\t\t\t<e/>") << true;
/* With XML prolog. */
QTest::newRow("") << QString::fromLatin1("<?xml version='1.0' ?><e/>") << true;
QTest::newRow("data13") << QString::fromLatin1("<?xml version='1.0' ?><e/>") << true;
QTest::newRow("") << QString::fromLatin1(" <?xml version='1.0' ?><e/>") << false;
QTest::newRow("") << QString::fromLatin1(" <?xml version='1.0' ?><e/>") << false;
QTest::newRow("") << QString::fromLatin1(" <?xml version='1.0' ?><e/>") << false;
QTest::newRow("") << QString::fromLatin1(" <?xml version='1.0' ?><e/>") << false;
QTest::newRow("") << QString::fromLatin1("\n<?xml version='1.0' ?><e/>") << false;
QTest::newRow("") << QString::fromLatin1("\n\n<?xml version='1.0' ?><e/>") << false;
QTest::newRow("") << QString::fromLatin1("\n\n\n<?xml version='1.0' ?><e/>") << false;
QTest::newRow("") << QString::fromLatin1("\n\n\n\n<?xml version='1.0' ?><e/>") << false;
QTest::newRow("") << QString::fromLatin1("\t<?xml version='1.0' ?><e/>") << false;
QTest::newRow("") << QString::fromLatin1("\t\t<?xml version='1.0' ?><e/>") << false;
QTest::newRow("") << QString::fromLatin1("\t\t\t<?xml version='1.0' ?><e/>") << false;
QTest::newRow("") << QString::fromLatin1("\t\t\t\t<?xml version='1.0' ?><e/>") << false;
QTest::newRow("data14") << QString::fromLatin1(" <?xml version='1.0' ?><e/>") << false;
QTest::newRow("data15") << QString::fromLatin1(" <?xml version='1.0' ?><e/>") << false;
QTest::newRow("data16") << QString::fromLatin1(" <?xml version='1.0' ?><e/>") << false;
QTest::newRow("data17") << QString::fromLatin1(" <?xml version='1.0' ?><e/>") << false;
QTest::newRow("data18") << QString::fromLatin1("\n<?xml version='1.0' ?><e/>") << false;
QTest::newRow("data19") << QString::fromLatin1("\n\n<?xml version='1.0' ?><e/>") << false;
QTest::newRow("data20") << QString::fromLatin1("\n\n\n<?xml version='1.0' ?><e/>") << false;
QTest::newRow("data21") << QString::fromLatin1("\n\n\n\n<?xml version='1.0' ?><e/>") << false;
QTest::newRow("data22") << QString::fromLatin1("\t<?xml version='1.0' ?><e/>") << false;
QTest::newRow("data23") << QString::fromLatin1("\t\t<?xml version='1.0' ?><e/>") << false;
QTest::newRow("data24") << QString::fromLatin1("\t\t\t<?xml version='1.0' ?><e/>") << false;
QTest::newRow("data25") << QString::fromLatin1("\t\t\t\t<?xml version='1.0' ?><e/>") << false;
}
void tst_QDom::taskQTBUG4595_dontAssertWhenDocumentSpecifiesUnknownEncoding() const