From cef8ff2944413678129a87218ff4595f0e9c0c83 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Sat, 23 Nov 2013 01:03:10 +0100
Subject: [PATCH] Debugger: Fix some of the QMap dumper autotests
The order of entries was changed ab52154010.
Task-number: QTCREATORBUG-10888
Change-Id: I50f97396fd0f94e4bbaefb30fae8419e89bd4f4d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
---
tests/auto/debugger/tst_dumpers.cpp | 33 ++++++++++-------------------
1 file changed, 11 insertions(+), 22 deletions(-)
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index 4a5568a19a7..b48602e7f64 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -1962,14 +1962,12 @@ void tst_Dumpers::dumper_data()
% CoreProfile()
% Check("map", "<3 items>", "@QMap<@QString, @QPointer<@QObject>>")
% Check("map.0", "[0]", "", "@QMapNode<@QString, @QPointer<@QObject>>")
- % Check("map.0.key", Value4("\".\""), "@QString")
- % Check("map.0.key", Value5("\"Hallo\""), "@QString")
+ % Check("map.0.key", "\".\"", "@QString")
% Check("map.0.value", "", "@QPointer<@QObject>")
//% Check("map.0.value.o", Pointer(), "@QObject")
// FIXME: it's '.wp' in Qt 5
% Check("map.1", "[1]", "", "@QMapNode<@QString, @QPointer<@QObject>>")
- % Check("map.1.key", Value4("\"Hallo\""), "@QString")
- % Check("map.1.key", Value5("\".\""), "@QString")
+ % Check("map.1.key", "\"Hallo\"", "@QString")
% Check("map.2", "[2]", "", "@QMapNode<@QString, @QPointer<@QObject>>")
% Check("map.2.key", "\"Welt\"", "@QString");
@@ -1989,8 +1987,7 @@ void tst_Dumpers::dumper_data()
% CoreProfile()
% Check("map", "<4 items>", "@QMap<@QString, @QList<nsA::nsB::SomeType*>>")
% Check("map.0", "[0]", "", "@QMapNode<@QString, @QList<nsA::nsB::SomeType*>>")
- % Check("map.0.key", Value4("\"1\""), "@QString")
- % Check("map.0.key", Value5("\"bar\""), "@QString")
+ % Check("map.0.key", "\"1\"", "@QString")
% Check("map.0.value", "<3 items>", "@QList<nsA::nsB::SomeType*>")
% Check("map.0.value.0", "[0]", "", "nsA::nsB::SomeType")
% Check("map.0.value.0.a", "1", "int")
@@ -1999,8 +1996,7 @@ void tst_Dumpers::dumper_data()
% Check("map.0.value.2", "[2]", "", "nsA::nsB::SomeType")
% Check("map.0.value.2.a", "3", "int")
% Check("map.3", "[3]", "", "@QMapNode<@QString, @QList<nsA::nsB::SomeType*>>")
- % Check("map.3.key", Value4("\"foo\""), "@QString")
- % Check("map.3.key", Value5("\"2\""), "@QString")
+ % Check("map.3.key", "\"foo\"", "@QString")
% Check("map.3.value", "<3 items>", "@QList<nsA::nsB::SomeType*>")
% Check("map.3.value.2", "[2]", "", "nsA::nsB::SomeType")
% Check("map.3.value.2.a", "3", "int")
@@ -2071,17 +2067,14 @@ void tst_Dumpers::dumper_data()
% CoreProfile()
% Check("map", "<4 items>", "@QMultiMap<@QString, @QPointer<@QObject>>")
% Check("map.0", "[0]", "", "@QMapNode<@QString, @QPointer<@QObject>>")
- % Check("map.0.key", Value4("\".\""), "@QString")
- % Check("map.0.key", Value5("\"Hallo\""), "@QString")
+ % Check("map.0.key", "\".\"", "@QString")
% Check("map.0.value", "", "@QPointer<@QObject>")
% Check("map.1", "[1]", "", "@QMapNode<@QString, @QPointer<@QObject>>")
% Check("map.1.key", "\".\"", "@QString")
% Check("map.2", "[2]", "", "@QMapNode<@QString, @QPointer<@QObject>>")
- % Check("map.2.key", Value4("\"Hallo\""), "@QString")
- % Check("map.2.key", Value5("\"Welt\""), "@QString")
+ % Check("map.2.key", "\"Hallo\"", "@QString")
% Check("map.3", "[3]", "", "@QMapNode<@QString, @QPointer<@QObject>>")
- % Check("map.3.key", Value4("\"Welt\""), "@QString")
- % Check("map.3.key", Value5("\".\""), "@QString");
+ % Check("map.3.key", "\"Welt\"", "@QString");
QTest::newRow("QObject1")
@@ -3703,15 +3696,11 @@ void tst_Dumpers::dumper_data()
% CoreProfile()
% Check("vm", "<6 items>", "@QVariantMap")
% Check("vm.0", "[0]", "", "@QMapNode<@QString, @QVariant>")
- % Check("vm.0.key", Value4("\"a\""), "@QString")
- % Check("vm.0.value", Value4("1"), "@QVariant (int)")
- % Check("vm.0.key", Value5("\"b\""), "@QString")
- % Check("vm.0.value", Value5("2"), "@QVariant (int)")
+ % Check("vm.0.key", "\"a\"", "@QString")
+ % Check("vm.0.value", "1", "@QVariant (int)")
% Check("vm.5", "[5]", "", "@QMapNode<@QString, @QVariant>")
- % Check("vm.5.key", Value4("\"f\""), "@QString")
- % Check("vm.5.value", Value4("\"2Some String\""), "@QVariant (QString)")
- % Check("vm.5.key", Value5("\"f\""), "@QString")
- % Check("vm.5.value", Value5("\"2Some String\""), "@QVariant (QString)");
+ % Check("vm.5.key", "\"f\"", "@QString")
+ % Check("vm.5.value", "\"2Some String\"", "@QVariant (QString)");
QTest::newRow("QVariantHash1")
<< Data("#include <QVariant>\n",
--
GitLab