From b3deb6a1616582e89a88870f30c69bec74c6baed Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 23 Jun 2021 10:43:48 +0200 Subject: [PATCH] Expand a test that QVariant isn't null even when what it wraps is MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Match the checks in the constructor test that are similar. Change-Id: Ifb62af09e31aac339f001f44bc30789330c85be6 Reviewed-by: Mårten Nordheim --- tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index 4e5eb430a2..600a99e72c 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2016 Olivier Goffart ** Copyright (C) 2016 Intel Corporation. ** Contact: https://www.qt.io/licensing/ @@ -410,9 +410,11 @@ void tst_QVariant::isNull() QVariant var; QVERIFY( var.isNull() ); - QString str1; - QVariant var1( str1 ); - QVERIFY( !var1.isNull() ); + QVariant empty = QString(); + QVERIFY(empty.toString().isNull()); + QVERIFY(!empty.isNull()); + QVERIFY(empty.isValid()); + QCOMPARE(empty.typeName(), "QString"); QVariant var3( QString( "blah" ) ); QVERIFY( !var3.isNull() );