whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QVariant: fix the test 

8a375341cf added swap() to QJson* classes
and marked them shared-not-movable-until-qt6.

That unveiled a broken test in QVariant which was relying on QJsonDocument
being not relocatable. So fix the test by using a proper datatype for the task.

Change-Id: Ic35f09f936b00dfaeb368ccb42aecf35cc506029
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
bb10
Giuseppe D'Angelo 2017-04-19 20:17:02 +01:00 committed by Liang Qi
parent 7950b6b283
commit af211b3993
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
View File

@ -3395,21 +3395,6 @@ void tst_QVariant::toIntFromDouble() const
QCOMPARE(result, 2147483630);
}
void tst_QVariant::setValue()
{
QJsonDocument t; //we just take a value so that we're sure that it will be shared
QVariant v1 = QVariant::fromValue(t);
QVERIFY( v1.isDetached() );
QVariant v2 = v1;
QVERIFY( !v1.isDetached() );
QVERIFY( !v2.isDetached() );
v2.setValue(3); //set an integer value
QVERIFY( v1.isDetached() );
QVERIFY( v2.isDetached() );
}
void tst_QVariant::fpStringRoundtrip_data() const
{
QTest::addColumn<QVariant>("number");
@ -3641,6 +3626,20 @@ Q_DECLARE_METATYPE(MyMovable *)
Q_DECLARE_METATYPE(MyNotMovable *)
Q_DECLARE_METATYPE(QSharedDataPointer<MyShared>)
void tst_QVariant::setValue()
{
MyNotMovable t; //we just take a value so that we're sure that it will be shared
QVariant v1 = QVariant::fromValue(t);
QVERIFY( v1.isDetached() );
QVariant v2 = v1;
QVERIFY( !v1.isDetached() );
QVERIFY( !v2.isDetached() );
v2.setValue(3); //set an integer value
QVERIFY( v1.isDetached() );
QVERIFY( v2.isDetached() );
}
void tst_QVariant::moreCustomTypes()
{