diff options
Diffstat (limited to 'tests/auto/corelib/serialization/qcborvalue_json')
3 files changed, 31 insertions, 51 deletions
diff --git a/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt b/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt new file mode 100644 index 0000000000..14ac0514f9 --- /dev/null +++ b/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt @@ -0,0 +1,17 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +##################################################################### +## tst_qcborvalue_json Test: +##################################################################### + +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qcborvalue_json LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + +qt_internal_add_test(tst_qcborvalue_json + SOURCES + tst_qcborvalue_json.cpp +) diff --git a/tests/auto/corelib/serialization/qcborvalue_json/qcborvalue_json.pro b/tests/auto/corelib/serialization/qcborvalue_json/qcborvalue_json.pro deleted file mode 100644 index c11000b7c2..0000000000 --- a/tests/auto/corelib/serialization/qcborvalue_json/qcborvalue_json.pro +++ /dev/null @@ -1,7 +0,0 @@ -QT = core testlib -TARGET = tst_qcborvalue_json -CONFIG += testcase -SOURCES += \ - tst_qcborvalue_json.cpp - -DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp b/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp index 76f2bb924a..941bfa4008 100644 --- a/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp +++ b/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp @@ -1,44 +1,14 @@ -/**************************************************************************** -** -** Copyright (C) 2018 Intel Corporation. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/qcborvalue.h> -#include <QtTest> +#include <QTest> +#include <QJsonValue> +#include <QJsonObject> +#include <QJsonArray> +#include <QVariant> +#include <QVariantMap> +#include <QVariantList> Q_DECLARE_METATYPE(QCborValue) @@ -80,7 +50,7 @@ void tst_QCborValue_Json::toVariant_data() if (v.type() == QCborValue::Double) return QTest::addRow("Double:%g", exp.toDouble()); if (v.type() == QCborValue::ByteArray || v.type() == QCborValue::String) - return QTest::addRow("%s:%d", typeString, exp.toString().size()); + return QTest::addRow("%s:%zd", typeString, size_t(exp.toString().size())); if (v.type() >= 0x10000) return QTest::newRow(exp.typeName()); return QTest::newRow(typeString); @@ -89,7 +59,7 @@ void tst_QCborValue_Json::toVariant_data() }; // good JSON matching: - add(QCborValue(), QVariant(), QJsonValue::Undefined); + add(QCborValue(), QVariant(), QJsonValue::Null); add(nullptr, QVariant::fromValue(nullptr), QJsonValue::Null); add(false, false, false); add(true, true, true); @@ -148,8 +118,8 @@ void tst_QCborValue_Json::toVariant() QCOMPARE(v.toVariant(), variant); if (variant.isValid()) { QVariant variant2 = QVariant::fromValue(v); - QVERIFY(variant2.canConvert(variant.userType())); - QVERIFY(variant2.convert(variant.userType())); + QVERIFY(variant2.canConvert(variant.metaType())); + QVERIFY(variant2.convert(variant.metaType())); QCOMPARE(variant2, variant); } @@ -224,7 +194,7 @@ void tst_QCborValue_Json::fromVariant() QCOMPARE(QCborArray::fromVariantList({variant}), QCborArray{v}); QCOMPARE(QCborArray::fromVariantList({variant, variant}), QCborArray({v, v})); - if (variant.type() == QVariant::String) { + if (variant.metaType() == QMetaType(QMetaType::QString)) { QString s = variant.toString(); QCOMPARE(QCborArray::fromStringList({s}), QCborArray{v}); QCOMPARE(QCborArray::fromStringList({s, s}), QCborArray({v, v})); |