diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-03-13 17:24:40 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-04-09 20:04:15 +0200 |
| commit | 56ebc2363de1100f49b6b74499df0698ee9ce1e1 (patch) | |
| tree | cbe0f84a78561afef5e9709f32a85e94bedcca3e /tests/auto/dbus | |
| parent | 8a984ab772dd194e39094e728b869e65912912a7 (diff) | |
Fix autotests after the QHash changes
Some test cases are sensitive to the exact ordering inside
QHash, and need adjustments when we change QHash or the
hashing functions.
Some rcc tests now also need 32bit specific data, as the hashing
functions for 32 and 64 bit are different now (as we use size_t).
Change-Id: Ieab01cd55b1288336493b13c41d27e42a008bdd9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'tests/auto/dbus')
| -rw-r--r-- | tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp index 9689f40292..264dbe127f 100644 --- a/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp +++ b/tests/auto/dbus/qdbusxmlparser/tst_qdbusxmlparser.cpp @@ -486,19 +486,19 @@ void tst_QDBusXmlParser::properties_data() prop.type = "s"; prop.access = QDBusIntrospection::Property::Read; map << prop; - QTest::newRow("one-readable") << "<property name=\"foo\" type=\"s\" access=\"read\"/>" << map; + QTest::newRow("one-readable") << "<property access=\"read\" type=\"s\" name=\"foo\" />" << map; // one writable signal prop.access = QDBusIntrospection::Property::Write; map.clear(); map << prop; - QTest::newRow("one-writable") << "<property name=\"foo\" type=\"s\" access=\"write\"/>" << map; + QTest::newRow("one-writable") << "<property access=\"write\" type=\"s\" name=\"foo\"/>" << map; // one read- & writable signal prop.access = QDBusIntrospection::Property::ReadWrite; map.clear(); map << prop; - QTest::newRow("one-read-writable") << "<property name=\"foo\" type=\"s\" access=\"readwrite\"/>" + QTest::newRow("one-read-writable") << "<property access=\"readwrite\" type=\"s\" name=\"foo\"/>" << map; // two, mixed properties @@ -507,13 +507,13 @@ void tst_QDBusXmlParser::properties_data() prop.access = QDBusIntrospection::Property::Read; map << prop; QTest::newRow("two-1") << - "<property name=\"foo\" type=\"s\" access=\"readwrite\"/>" - "<property name=\"bar\" type=\"i\" access=\"read\"/>" << map; + "<property access=\"readwrite\" type=\"s\" name=\"foo\"/>" + "<property access=\"read\" type=\"i\" name=\"bar\"/>" << map; // invert the order of the declaration QTest::newRow("two-2") << - "<property name=\"bar\" type=\"i\" access=\"read\"/>" - "<property name=\"foo\" type=\"s\" access=\"readwrite\"/>" << map; + "<property access=\"read\" type=\"i\" name=\"bar\"/>" + "<property access=\"readwrite\" type=\"s\" name=\"foo\"/>" << map; // add a third with annotations prop.name = "baz"; @@ -523,21 +523,21 @@ void tst_QDBusXmlParser::properties_data() prop.annotations.insert("foo.annotation2", "Goodbye, World"); map << prop; QTest::newRow("complex") << - "<property name=\"bar\" type=\"i\" access=\"read\"/>" - "<property name=\"baz\" type=\"as\" access=\"write\">" + "<property access=\"read\" type=\"i\" name=\"bar\"/>" + "<property access=\"write\" type=\"as\" name=\"baz\">" "<annotation name=\"foo.annotation\" value=\"Hello, World\" />" "<annotation name=\"foo.annotation2\" value=\"Goodbye, World\" />" "</property>" - "<property name=\"foo\" type=\"s\" access=\"readwrite\"/>" << map; + "<property access=\"readwrite\" type=\"s\" name=\"foo\"/>" << map; // and now change the order QTest::newRow("complex2") << - "<property name=\"baz\" type=\"as\" access=\"write\">" + "<property access=\"write\" type=\"as\" name=\"baz\">" "<annotation name=\"foo.annotation2\" value=\"Goodbye, World\" />" "<annotation name=\"foo.annotation\" value=\"Hello, World\" />" "</property>" - "<property name=\"bar\" type=\"i\" access=\"read\"/>" - "<property name=\"foo\" type=\"s\" access=\"readwrite\"/>" << map; + "<property access=\"read\" type=\"i\" name=\"bar\"/>" + "<property access=\"readwrite\" type=\"s\" name=\"foo\"/>" << map; } void tst_QDBusXmlParser::properties() |