From c06d3e39d84c60511713e9eb8aa46245e3bd95d7 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 7 Dec 2020 11:59:50 +0100 Subject: [PATCH] Debugger: Adapt dumper test for QTCREATORBUG-4904 Maps have changed. Task-number: QTCREATORBUG-24098 Change-Id: I3a078e0168fb0e2a95d4c92fefc7c3cdeba9114f Reviewed-by: David Schulz --- tests/auto/debugger/tst_dumpers.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 969c7a9df49..a4c448ff048 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -6886,13 +6886,13 @@ void tst_Dumpers::dumper_data() << Data("#include \n" "struct CustomStruct {\n" " int id;\n" - " double dvalue;\n" + " double dval;\n" "};", "QMap map;\n" "CustomStruct cs1;\n" "cs1.id = 1;\n" - "cs1.dvalue = 3.14;\n" + "cs1.dval = 3.14;\n" "CustomStruct cs2 = cs1;\n" "cs2.id = -1;\n" "map.insert(cs1.id, cs1);\n" @@ -6904,10 +6904,11 @@ void tst_Dumpers::dumper_data() + CoreProfile() + Check("map", "<2 items>", "@QMap") - + Check("map.0.key", "-1", "int") - + CheckType("map.0.value", "CustomStruct") - + Check("map.0.value.dvalue", FloatValue("3.14"), "double") - + Check("map.0.value.id", "-1", "int"); + + CheckPairish("map.0.key", "-1", "int") + + CheckType("map.0.value", "CustomStruct") % Qt5 + + CheckType("map.0.second", "CustomStruct") % Qt6 + + CheckPairish("map.0.value.dval", FloatValue("3.14"), "double") + + CheckPairish("map.0.value.id", "-1", "int"); #if 0