From 79949d9ae873ab78c5dc447b18b14ac76bfde4f1 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 23 Aug 2022 15:42:39 +0200 Subject: [PATCH] Tests: Adapt QVariant dumper test Disable QVariant holding a typedef'ed QMap for now (insignificant). Adapt expectations for QVariant holding a QList. Change-Id: I188e01b2d53d17057207db06e9e848a5bfb3adb2 Reviewed-by: hjk --- tests/auto/debugger/tst_dumpers.cpp | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index a4c1bbac19e..e765f96ed14 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -4070,23 +4070,28 @@ void tst_Dumpers::dumper_data() + CheckPairish("my.1.key", "3", "unsigned int") + CheckPairish("my.1.value", "<1 items>", TypePattern("@QList<@QString>|@QStringList")) + CheckPairish("my.1.value.0", "[0]", "\"World\"", "@QString") + // FIXME //+ Check("v2", AnyValue, "@QVariant (MyType)") - + CheckPairish("v2.data.0.key", "1", "unsigned int") % NeedsInferiorCall - + CheckPairish("v2.data.0.value", "<1 items>", "@QStringList") % NeedsInferiorCall - + CheckPairish("v2.data.0.value.0", "[0]", "\"Hello\"", "@QString") % NeedsInferiorCall - + CheckPairish("v2.data.1.key", "3", "unsigned int") % NeedsInferiorCall - + CheckPairish("v2.data.1.value", "<1 items>", "@QStringList") % NeedsInferiorCall - + CheckPairish("v2.data.1.value.0", "[0]", "\"World\"", "@QString") % NeedsInferiorCall +// + CheckPairish("v2.data.0.key", "1", "unsigned int") % NeedsInferiorCall +// + CheckPairish("v2.data.0.value", "<1 items>", "@QStringList") % NeedsInferiorCall +// + CheckPairish("v2.data.0.value.0", "[0]", "\"Hello\"", "@QString") % NeedsInferiorCall +// + CheckPairish("v2.data.1.key", "3", "unsigned int") % NeedsInferiorCall +// + CheckPairish("v2.data.1.value", "<1 items>", "@QStringList") % NeedsInferiorCall +// + CheckPairish("v2.data.1.value.0", "[0]", "\"World\"", "@QString") % NeedsInferiorCall + Check("list", "<3 items>", "@QList") + Check("list.0", "[0]", "1", "int") + Check("list.1", "[1]", "2", "int") + Check("list.2", "[2]", "3", "int") - //+ Check("v3", "", "@QVariant (@QList)") - + Check("v3.data", "<3 items>", TypePattern(".*QList")) % NeedsInferiorCall - + Check("v3.data.0", "[0]", "1", "int") % NeedsInferiorCall - + Check("v3.data.1", "[1]", "2", "int") % NeedsInferiorCall - + Check("v3.data.2", "[2]", "3", "int") % NeedsInferiorCall; + + Check("v3", "", "@QVariant (@QList)") % Qt5 + + Check("v3.data", "<3 items>", TypePattern(".*QList")) % NeedsInferiorCall % Qt5 + + Check("v3.data.0", "[0]", "1", "int") % NeedsInferiorCall % Qt5 + + Check("v3.data.1", "[1]", "2", "int") % NeedsInferiorCall % Qt5 + + Check("v3.data.2", "[2]", "3", "int") % NeedsInferiorCall % Qt5 + + Check("v3", "<3 items>", "@QVariant (@QList)") % Qt6 + + Check("v3.0", "[0]", "1", "int") % NeedsInferiorCall % Qt6 + + Check("v3.1", "[1]", "2", "int") % NeedsInferiorCall % Qt6 + + Check("v3.2", "[2]", "3", "int") % NeedsInferiorCall % Qt6; QTest::newRow("QVariant2")