diff options
Diffstat (limited to 'tests/auto/corelib/serialization')
692 files changed, 2649 insertions, 4898 deletions
diff --git a/tests/auto/corelib/serialization/CMakeLists.txt b/tests/auto/corelib/serialization/CMakeLists.txt index c8af35b011..3792336255 100644 --- a/tests/auto/corelib/serialization/CMakeLists.txt +++ b/tests/auto/corelib/serialization/CMakeLists.txt @@ -1,18 +1,20 @@ -# Generated from serialization.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(json) add_subdirectory(qcborstreamreader) add_subdirectory(qcborstreamwriter) -add_subdirectory(qcborvalue) +if(NOT WASM) + add_subdirectory(qcborvalue) +endif() add_subdirectory(qcborvalue_json) if(TARGET Qt::Gui) add_subdirectory(qdatastream) add_subdirectory(qdatastream_core_pixmap) endif() -if(TARGET Qt::Network) +if(TARGET Qt::Network AND NOT WASM) add_subdirectory(qtextstream) endif() -# QTBUG-87671 # special case -if(TARGET Qt::Network AND TARGET Qt::Xml AND NOT ANDROID) +if(TARGET Qt::Gui AND TARGET Qt::Network AND TARGET Qt::Xml AND NOT INTEGRITY AND NOT QNX AND NOT WASM) add_subdirectory(qxmlstream) endif() diff --git a/tests/auto/corelib/serialization/cborlargedatavalidation.cpp b/tests/auto/corelib/serialization/cborlargedatavalidation.cpp index 9d1eb9a81b..2fe1012f12 100644 --- a/tests/auto/corelib/serialization/cborlargedatavalidation.cpp +++ b/tests/auto/corelib/serialization/cborlargedatavalidation.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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) 2020 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QTest> #include <QtEndian> @@ -62,7 +26,6 @@ protected: qint64 readData(char *data, qint64 maxlen) override; qint64 writeData(const char *, qint64) override { return -1; } }; -}; qint64 LargeIODevice::readData(char *data, qint64 maxlen) { @@ -154,3 +117,4 @@ void addValidationHugeDevice(qsizetype byteArrayInvalid, qsizetype stringInvalid addSize("4GB", quint64(1) << 32); addSize("max", std::numeric_limits<qint64>::max() - sizeof(buf)); } +} // namespace diff --git a/tests/auto/corelib/serialization/json/CMakeLists.txt b/tests/auto/corelib/serialization/json/CMakeLists.txt index f8e209e620..c73a99a3b8 100644 --- a/tests/auto/corelib/serialization/json/CMakeLists.txt +++ b/tests/auto/corelib/serialization/json/CMakeLists.txt @@ -1,39 +1,35 @@ -# Generated from json.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_json Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_json LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + +set(json_resource_files + "bom.json" + "test.json" + "test2.json" + "test3.json" + "simple.duplicates.json" + "test.duplicates.json" + "test3.duplicates.json" +) + qt_internal_add_test(tst_json SOURCES tst_qtjson.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate + Qt::TestPrivate + TESTDATA ${json_resource_files} ) -## Scopes: -##################################################################### - -#### Keys ignored in scope 2:.:.:json.pro:NOT ANDROID: -# TESTDATA = "bom.json" "test.json" "test3.json" "test2.json" - -if(ANDROID) - # Resources: - set(json_resource_files - "bom.json" - "test.json" - "test2.json" - "test3.json" - ) - - qt_internal_add_resource(tst_json "json" - PREFIX - "/" - FILES - ${json_resource_files} - ) -endif() - qt_internal_extend_target(tst_json CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion DEFINES QT_NO_DOUBLECONVERSION diff --git a/tests/auto/corelib/serialization/json/json.qrc b/tests/auto/corelib/serialization/json/json.qrc deleted file mode 100644 index 49a6a95ecb..0000000000 --- a/tests/auto/corelib/serialization/json/json.qrc +++ /dev/null @@ -1,8 +0,0 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource prefix="/"> - <file>bom.json</file> - <file>test2.json</file> - <file>test3.json</file> - <file>test.json</file> -</qresource> -</RCC> diff --git a/tests/auto/corelib/serialization/json/simple.duplicates.json b/tests/auto/corelib/serialization/json/simple.duplicates.json new file mode 100644 index 0000000000..6f989e8aa9 --- /dev/null +++ b/tests/auto/corelib/serialization/json/simple.duplicates.json @@ -0,0 +1 @@ +{"":{"":0},"":0} diff --git a/tests/auto/corelib/serialization/json/test.duplicates.json b/tests/auto/corelib/serialization/json/test.duplicates.json new file mode 100644 index 0000000000..0d5af8ef74 --- /dev/null +++ b/tests/auto/corelib/serialization/json/test.duplicates.json @@ -0,0 +1,66 @@ +[ + "JSON Test Pattern pass1", + {"a":["array with 1 element"]}, + {}, + [], + -42, + true, + false, + null, + { + "a": 1234567890, + "a": -9876.543210, + "a": 0.123456789e-12, + "a": 1.234567890E+34, + "a": 23456789012E66, + "a": 0, + "a": 1, + "a": " ", + "a": "\"", + "a": "\\", + "a": "\b\f\n\r\t", + "a": "/ & \/", + "a": "abcdefghijklmnopqrstuvwxyz", + "a": "ABCDEFGHIJKLMNOPQRSTUVWXYZ", + "a": "0123456789", + "a": "digit", + "a": "`1~!@#$%^&*()_+-={':[,]}|;.</>?", + "a": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A", + "a": true, + "a": false, + "a": null, + "a":[ ], + "a":{ }, + "a": "50 St. James Street", + "a": "nix", + "a": "// /* <!-- --", + "a": " ", + "a":[1,2 , 3 + +, + +4 , 5 , 6 ,7 ],"a":[1,2,3,4,5,6,7], + "a": "\"a:[\"array with 1 element\"]}", + "a": "" \u0022 %22 0x22 034 "", + "a": "A key can be any string" + }, + 0.5 ,98.6 +, +99.44 +, + +1066, +1e1, +0.1e1, +1e-1, +1e00, +2e+00, +2e-00, +"rosebud", +{"a": "bar"}, +{"a":{"a":1000,"a":{"a":"nix"}},"a":{"a":{"a":{"a":"$0.01","a":1},"a":{"a":"$4,833.99","a":483399}},"a":[{"a":"PRODUCT","a":"Silicone c","a":"Elite Hori","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":310711221747712.000000,"a":{"a":{"a":"$1.56","a":156},"a":{"a":"$29.99","a":2999},"a":14},"a":1968262863,"a":8515},{"a":"PRODUCT","a":"Nonslip Ch","a":"Specificat","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":175580930637824.000000,"a":{"a":{"a":"$0.45","a":45},"a":{"a":"$194.95","a":19495},"a":34},"a":2534935499,"a":8515},{"a":"PRODUCT","a":"Plastic Ca","a":"Descriptio","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":132488642953216.000000,"a":{"a":{"a":"$0.99","a":99},"a":{"a":"$303.68","a":30368},"a":33},"a":2305624670,"a":8515},{"a":"PRODUCT","a":"Protective","a":"Made of hi","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":108614681362432.000000,"a":{"a":{"a":"$1.70","a":170},"a":{"a":"$99.99","a":9999},"a":11},"a":2120981405,"a":8515},{"a":"PRODUCT","a":"P® 4","a":"Do more th","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":96203484168192.000000,"a":{"a":{"a":"$2.49","a":249},"a":{"a":"$79.95","a":7995},"a":16},"a":2203798762,"a":8515},{"a":"PRODUCT","a":"Case Refle","a":"NCAA iPhon","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":84727583211520.000000,"a":{"a":{"a":"$0.69","a":69},"a":{"a":"$75.52","a":7552},"a":59},"a":1114627445,"a":8515},{"a":"PRODUCT","a":"Infuse Pro","a":"Protect an","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":80831066406912.000000,"a":{"a":{"a":"$0.59","a":59},"a":{"a":"$79.00","a":7900},"a":24},"a":2557462717,"a":8515},{"a":"PRODUCT","a":"Dragonfly ","a":"d","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":70900229603328.000000,"a":{"a":{"a":"$1.05","a":105},"a":{"a":"$94.49","a":9449},"a":30},"a":2442061740,"a":8515},{"a":"PRODUCT","a":"Pho","a":"Snap on Ap","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":65194915004416.000000,"a":{"a":{"a":"$0.01","a":1},"a":{"a":"$414.99","a":41499},"a":39},"a":2004746863,"a":8515},{"a":"PRODUCT","a":"Otterbox i","a":"Your iPhon","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":61515478597632.000000,"a":{"a":{"a":"$3.28","a":328},"a":{"a":"$110.65","a":11065},"a":25},"a":2584611575,"a":8515}],"a":10,"a":2000}}, +{"a":{"a":1000,"a":{"a":"nix"}},"a":{"a":{"a":{"a":"$0.01","a":1},"a":{"a":"$4,833.99","a":483399}},"a":[{"a":"PRODUCT","a":"Silicone c","a":"Elite Hori","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":310711221747712.000000,"a":{"a":{"a":"$1.56","a":156},"a":{"a":"$29.99","a":2999},"a":14},"a":1968262863,"a":8515},{"a":"PRODUCT","a":"Nonslip Ch","a":"Specificat","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":175580930637824.000000,"a":{"a":{"a":"$0.45","a":45},"a":{"a":"$194.95","a":19495},"a":34},"a":2534935499,"a":8515},{"a":"PRODUCT","a":"Plastic Ca","a":"Descriptio","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":132488642953216.000000,"a":{"a":{"a":"$0.99","a":99},"a":{"a":"$303.68","a":30368},"a":33},"a":2305624670,"a":8515},{"a":"PRODUCT","a":"Protective","a":"Made of hi","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":108614681362432.000000,"a":{"a":{"a":"$1.70","a":170},"a":{"a":"$99.99","a":9999},"a":11},"a":2120981405,"a":8515},{"a":"PRODUCT","a":"P® 4","a":"Do more th","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":96203484168192.000000,"a":{"a":{"a":"$2.49","a":249},"a":{"a":"$79.95","a":7995},"a":16},"a":2203798762,"a":8515},{"a":"PRODUCT","a":"Case Refle","a":"NCAA iPhon","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":84727583211520.000000,"a":{"a":{"a":"$0.69","a":69},"a":{"a":"$75.52","a":7552},"a":59},"a":1114627445,"a":8515},{"a":"PRODUCT","a":"Infuse Pro","a":"Protect an","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":80831066406912.000000,"a":{"a":{"a":"$0.59","a":59},"a":{"a":"$79.00","a":7900},"a":24},"a":2557462717,"a":8515},{"a":"PRODUCT","a":"Dragonfly ","a":"d","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":70900229603328.000000,"a":{"a":{"a":"$1.05","a":105},"a":{"a":"$94.49","a":9449},"a":30},"a":2442061740,"a":8515},{"a":"PRODUCT","a":"Pho","a":"Snap on Ap","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":65194915004416.000000,"a":{"a":{"a":"$0.01","a":1},"a":{"a":"$414.99","a":41499},"a":39},"a":2004746863,"a":8515},{"a":"PRODUCT","a":"Otterbox i","a":"Your iPhon","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":61515478597632.000000,"a":{"a":{"a":"$3.28","a":328},"a":{"a":"$110.65","a":11065},"a":25},"a":2584611575,"a":8515}],"a":10,"a":2000}}, +{"a":{"a":1000,"a":{"a":"nix"}},"a":{"a":{"a":{"a":"$0.01","a":1},"a":{"a":"$4,833.99","a":483399}},"a":[{"a":"PRODUCT","a":"Silicone c","a":"Elite Hori","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":310711221747712.000000,"a":{"a":{"a":"$1.56","a":156},"a":{"a":"$29.99","a":2999},"a":14},"a":1968262863,"a":8515},{"a":"PRODUCT","a":"Nonslip Ch","a":"Specificat","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":175580930637824.000000,"a":{"a":{"a":"$0.45","a":45},"a":{"a":"$194.95","a":19495},"a":34},"a":2534935499,"a":8515},{"a":"PRODUCT","a":"Plastic Ca","a":"Descriptio","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":132488642953216.000000,"a":{"a":{"a":"$0.99","a":99},"a":{"a":"$303.68","a":30368},"a":33},"a":2305624670,"a":8515},{"a":"PRODUCT","a":"Protective","a":"Made of hi","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":108614681362432.000000,"a":{"a":{"a":"$1.70","a":170},"a":{"a":"$99.99","a":9999},"a":11},"a":2120981405,"a":8515},{"a":"PRODUCT","a":"P® 4","a":"Do more th","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":96203484168192.000000,"a":{"a":{"a":"$2.49","a":249},"a":{"a":"$79.95","a":7995},"a":16},"a":2203798762,"a":8515},{"a":"PRODUCT","a":"Case Refle","a":"NCAA iPhon","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":84727583211520.000000,"a":{"a":{"a":"$0.69","a":69},"a":{"a":"$75.52","a":7552},"a":59},"a":1114627445,"a":8515},{"a":"PRODUCT","a":"Infuse Pro","a":"Protect an","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":80831066406912.000000,"a":{"a":{"a":"$0.59","a":59},"a":{"a":"$79.00","a":7900},"a":24},"a":2557462717,"a":8515},{"a":"PRODUCT","a":"Dragonfly ","a":"d","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":70900229603328.000000,"a":{"a":{"a":"$1.05","a":105},"a":{"a":"$94.49","a":9449},"a":30},"a":2442061740,"a":8515},{"a":"PRODUCT","a":"Pho","a":"Snap on Ap","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":65194915004416.000000,"a":{"a":{"a":"$0.01","a":1},"a":{"a":"$414.99","a":41499},"a":39},"a":2004746863,"a":8515},{"a":"PRODUCT","a":"Otterbox i","a":"Your iPhon","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":61515478597632.000000,"a":{"a":{"a":"$3.28","a":328},"a":{"a":"$110.65","a":11065},"a":25},"a":2584611575,"a":8515}],"a":10,"a":2000}}, +{"a":{"a":1000,"a":{"a":"nix"}},"a":{"a":{"a":{"a":"$0.01","a":1},"a":{"a":"$4,833.99","a":483399}},"a":[{"a":"PRODUCT","a":"Silicone c","a":"Elite Hori","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":310711221747712.000000,"a":{"a":{"a":"$1.56","a":156},"a":{"a":"$29.99","a":2999},"a":14},"a":1968262863,"a":8515},{"a":"PRODUCT","a":"Nonslip Ch","a":"Specificat","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":175580930637824.000000,"a":{"a":{"a":"$0.45","a":45},"a":{"a":"$194.95","a":19495},"a":34},"a":2534935499,"a":8515},{"a":"PRODUCT","a":"Plastic Ca","a":"Descriptio","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":132488642953216.000000,"a":{"a":{"a":"$0.99","a":99},"a":{"a":"$303.68","a":30368},"a":33},"a":2305624670,"a":8515},{"a":"PRODUCT","a":"Protective","a":"Made of hi","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":108614681362432.000000,"a":{"a":{"a":"$1.70","a":170},"a":{"a":"$99.99","a":9999},"a":11},"a":2120981405,"a":8515},{"a":"PRODUCT","a":"P® 4","a":"Do more th","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":96203484168192.000000,"a":{"a":{"a":"$2.49","a":249},"a":{"a":"$79.95","a":7995},"a":16},"a":2203798762,"a":8515},{"a":"PRODUCT","a":"Case Refle","a":"NCAA iPhon","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":84727583211520.000000,"a":{"a":{"a":"$0.69","a":69},"a":{"a":"$75.52","a":7552},"a":59},"a":1114627445,"a":8515},{"a":"PRODUCT","a":"Infuse Pro","a":"Protect an","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":80831066406912.000000,"a":{"a":{"a":"$0.59","a":59},"a":{"a":"$79.00","a":7900},"a":24},"a":2557462717,"a":8515},{"a":"PRODUCT","a":"Dragonfly ","a":"d","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":70900229603328.000000,"a":{"a":{"a":"$1.05","a":105},"a":{"a":"$94.49","a":9449},"a":30},"a":2442061740,"a":8515},{"a":"PRODUCT","a":"Pho","a":"Snap on Ap","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":65194915004416.000000,"a":{"a":{"a":"$0.01","a":1},"a":{"a":"$414.99","a":41499},"a":39},"a":2004746863,"a":8515},{"a":"PRODUCT","a":"Otterbox i","a":"Your iPhon","a":"someone","a":{"a":"nix"},"a":{"a":[{"a":"nix","a":60,"a":60},{"a":"nix","a":100,"a":100},{"a":"nix","a":160,"a":160},{"a":"nix","a":400,"a":400}]},"a":61515478597632.000000,"a":{"a":{"a":"$3.28","a":328},"a":{"a":"$110.65","a":11065},"a":25},"a":2584611575,"a":8515}],"a":10,"a":2000}} +] + diff --git a/tests/auto/corelib/serialization/json/test3.duplicates.json b/tests/auto/corelib/serialization/json/test3.duplicates.json new file mode 100644 index 0000000000..c635a2523f --- /dev/null +++ b/tests/auto/corelib/serialization/json/test3.duplicates.json @@ -0,0 +1,15 @@ +{ + "a": "John", + "a": "Smith", + "a": 25, + "a": { + "a": "21 2nd Street", + "a": "New York", + "a": "NY", + "a": "10021" + }, + "a": [ + { "a": "home", "a": "212 555-1234" }, + { "a": "fax", "a": "646 555-4567" } + ] +} diff --git a/tests/auto/corelib/serialization/json/tst_qtjson.cpp b/tests/auto/corelib/serialization/json/tst_qtjson.cpp index ec3e0a97f1..54ef9be4f2 100644 --- a/tests/auto/corelib/serialization/json/tst_qtjson.cpp +++ b/tests/auto/corelib/serialization/json/tst_qtjson.cpp @@ -1,33 +1,11 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Copyright (C) 2021 Intel Corporation. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2022 The Qt Company Ltd. +// Copyright (C) 2022 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QTest> +#include <QtTest/private/qcomparisontesthelper_p.h> +#include <QMap> +#include <QVariantList> QT_WARNING_DISABLE_DEPRECATED @@ -50,6 +28,7 @@ class tst_QtJson: public QObject private Q_SLOTS: void initTestCase(); + void compareCompiles(); void testValueSimple(); void testNumbers(); void testNumbers_2(); @@ -70,9 +49,12 @@ private Q_SLOTS: void testArrayNested(); void testArrayNestedEmpty(); void testArrayComfortOperators(); + void testArrayEquality_data(); + void testArrayEquality(); void testObjectNestedEmpty(); void testValueRef(); + void testValueRefComparison(); void testObjectIteration(); void testArrayIteration(); @@ -105,6 +87,7 @@ private Q_SLOTS: void toJson(); void toJsonSillyNumericValues(); void toJsonLargeNumericValues(); + void toJsonDenormalValues(); void fromJson(); void fromJsonErrors(); void parseNumbers(); @@ -176,6 +159,9 @@ private Q_SLOTS: void testIteratorComparison(); + void noLeakOnNameClash_data(); + void noLeakOnNameClash(); + private: QString testDataDir; }; @@ -187,6 +173,31 @@ void tst_QtJson::initTestCase() testDataDir = QCoreApplication::applicationDirPath(); } +void tst_QtJson::compareCompiles() +{ + QTestPrivate::testEqualityOperatorsCompile<QJsonArray>(); + QTestPrivate::testAllComparisonOperatorsCompile<QJsonArray::iterator>(); + QTestPrivate::testAllComparisonOperatorsCompile<QJsonArray::const_iterator>(); + QTestPrivate::testAllComparisonOperatorsCompile<QJsonArray::iterator, + QJsonArray::const_iterator>(); + QTestPrivate::testEqualityOperatorsCompile<QJsonDocument>(); + QTestPrivate::testEqualityOperatorsCompile<QJsonObject>(); + QTestPrivate::testEqualityOperatorsCompile<QJsonObject::iterator>(); + QTestPrivate::testEqualityOperatorsCompile<QJsonObject::const_iterator>(); + QTestPrivate::testEqualityOperatorsCompile<QJsonValue>(); + QTestPrivate::testEqualityOperatorsCompile<QJsonValueConstRef>(); + QTestPrivate::testEqualityOperatorsCompile<QJsonValueRef>(); + QTestPrivate::testEqualityOperatorsCompile<QJsonArray, QJsonValue>(); + QTestPrivate::testEqualityOperatorsCompile<QJsonObject, QJsonValue>(); + QTestPrivate::testEqualityOperatorsCompile<QJsonObject, QJsonValueConstRef>(); + QTestPrivate::testEqualityOperatorsCompile<QJsonObject, QJsonValueRef>(); + QTestPrivate::testEqualityOperatorsCompile<QJsonValueConstRef, QJsonValue>(); + QTestPrivate::testEqualityOperatorsCompile<QJsonValueRef, QJsonValue>(); + QTestPrivate::testEqualityOperatorsCompile<QJsonValueRef, QJsonValueConstRef>(); + QTestPrivate::testEqualityOperatorsCompile<QJsonObject::iterator, + QJsonObject::const_iterator>(); +} + void tst_QtJson::testValueSimple() { QJsonObject object; @@ -386,24 +397,24 @@ void tst_QtJson::testNumbers_2() QJsonDocument jDocument2(QJsonDocument::fromJson(ba)); for (int power = 0; power <= 1075; power++) { floatValues_1[power] = jDocument2.object().value(QString::number(power)).toDouble(); -#ifdef Q_OS_QNX - if (power >= 970) - QEXPECT_FAIL("", "See QTBUG-37066", Abort); -#endif QVERIFY2(floatValues[power] == floatValues_1[power], QString("floatValues[%1] != floatValues_1[%1]").arg(power).toLatin1()); } + QT_TEST_EQUALITY_OPS(jDocument1, jDocument2, true); // The last value is below min denorm and should round to 0, everything else should contain a value QVERIFY2(floatValues_1[1075] == 0, "Value after min denorm should round to 0"); // Validate the last actual value is min denorm QVERIFY2(floatValues_1[1074] == 4.9406564584124654417656879286822e-324, QString("Min denorm value is incorrect: %1").arg(floatValues_1[1074]).toLatin1()); - // Validate that every value is half the value before it up to 1 - for (int index = 1074; index > 0; index--) { - QVERIFY2(floatValues_1[index] != 0, QString("2**- %1 should not be 0").arg(index).toLatin1()); - - QVERIFY2(floatValues_1[index - 1] == (floatValues_1[index] * 2), QString("Value should be double adjacent value at index %1").arg(index).toLatin1()); + if constexpr (std::numeric_limits<double>::has_denorm == std::denorm_present) { + // Validate that every value is half the value before it up to 1 + for (int index = 1074; index > 0; index--) { + QVERIFY2(floatValues_1[index] != 0, QString("2**- %1 should not be 0").arg(index).toLatin1()); + QVERIFY2(floatValues_1[index - 1] == (floatValues_1[index] * 2), QString("Value should be double adjacent value at index %1").arg(index).toLatin1()); + } + } else { + qInfo("Skipping denormal test as this system's double type lacks support"); } } @@ -421,6 +432,10 @@ void tst_QtJson::testNumbers_3() QJsonDocument jDocument2(QJsonDocument::fromJson(ba)); + QT_TEST_EQUALITY_OPS(jDocument1, jDocument2, true); + QT_TEST_EQUALITY_OPS(jDocument1, QJsonDocument(), false); + QT_TEST_EQUALITY_OPS(QJsonDocument(), QJsonDocument(), true); + double d1_1(jDocument2.object().value("d1").toDouble()); double d2_1(jDocument2.object().value("d2").toDouble()); QVERIFY(d1_1 != d2_1); @@ -438,7 +453,8 @@ void tst_QtJson::testNumbers_4() array << QJsonValue(-9223372036854775808.0); array << QJsonValue(+18446744073709551616.0); array << QJsonValue(-18446744073709551616.0); - const QByteArray json(QJsonDocument(array).toJson()); + QJsonDocument doc1 = QJsonDocument(array); + const QByteArray json(doc1.toJson()); const QByteArray expected = "[\n" " 1000000000000000,\n" @@ -459,7 +475,8 @@ void tst_QtJson::testNumbers_4() array2 << QJsonValue(Q_INT64_C(-9007199254740992)); array2 << QJsonValue(Q_INT64_C(+9223372036854775807)); array2 << QJsonValue(Q_INT64_C(-9223372036854775807)); - const QByteArray json2(QJsonDocument(array2).toJson()); + QJsonDocument doc2 = QJsonDocument(array2); + const QByteArray json2(doc2.toJson()); const QByteArray expected2 = "[\n" " 1000000000000000,\n" @@ -470,6 +487,8 @@ void tst_QtJson::testNumbers_4() " -9223372036854775807\n" "]\n"; QCOMPARE(json2, expected2); + + QT_TEST_EQUALITY_OPS(doc1, doc2, false); } void tst_QtJson::testNumberComparisons() @@ -518,6 +537,7 @@ void tst_QtJson::testObjectSimple() QJsonValue value(QLatin1String("foo")); object.insert("value", value); QCOMPARE(object.value("value"), value); + QT_TEST_EQUALITY_OPS(object.value("value"), value, true); int size = object.size(); object.remove("boolean"); @@ -526,6 +546,7 @@ void tst_QtJson::testObjectSimple() QJsonValue taken = object.take("value"); QCOMPARE(taken, value); + QT_TEST_EQUALITY_OPS(taken, value, true); QVERIFY2(!object.contains("value"), "key value should have been removed"); QString before = object.value("string").toString(); @@ -655,6 +676,7 @@ void tst_QtJson::testObjectInsertCopies() QCOMPARE(obj.size(), 2); QCOMPARE(obj.value("value"), "TEST"); QCOMPARE(obj.value("prop2"), "TEST"); + QT_TEST_EQUALITY_OPS(rv, obj["value"].toObject(), true); } { QJsonObject obj; @@ -787,15 +809,20 @@ void tst_QtJson::testValueObject() void tst_QtJson::testValueArray() { QJsonArray array; + QJsonArray otherArray = {"wrong value"}; + QJsonValue value(array); + QCOMPARE(value.toArray(), array); + QCOMPARE(value.toArray(otherArray), array); + array.append(999.); array.append(QLatin1String("test")); array.append(true); - - QJsonValue value(array); + value = array; // if we don't modify the original JsonArray, toArray() // on the JsonValue should return the same object (non-detached). QCOMPARE(value.toArray(), array); + QCOMPARE(value.toArray(otherArray), array); // if we modify the original array, it should detach array.append(QLatin1String("test")); @@ -805,14 +832,28 @@ void tst_QtJson::testValueArray() void tst_QtJson::testObjectNested() { QJsonObject inner, outer; + QJsonObject otherObject = {{"wrong key", "wrong value"}}; + QJsonValue v = inner; + QCOMPARE(v.toObject(), inner); + QCOMPARE(v.toObject(otherObject), inner); + QT_TEST_EQUALITY_OPS(v.toObject(), inner, true); + QT_TEST_EQUALITY_OPS(v.toObject(otherObject), inner, true); + inner.insert("number", 999.); outer.insert("nested", inner); + QT_TEST_EQUALITY_OPS(outer, inner, false); // if we don't modify the original JsonObject, value() // should return the same object (non-detached). QJsonObject value = outer.value("nested").toObject(); + v = value; QCOMPARE(value, inner); QCOMPARE(value.value("number").toDouble(), 999.); + QCOMPARE(v.toObject(), inner); + QCOMPARE(v.toObject(otherObject), inner); + QT_TEST_EQUALITY_OPS(v.toObject(), inner, true); + QT_TEST_EQUALITY_OPS(v.toObject(otherObject), inner, true); + QCOMPARE(v["number"].toDouble(), 999.); // if we modify the original object, it should detach and not // affect the nested object @@ -837,6 +878,7 @@ void tst_QtJson::testObjectNested() QCOMPARE(outer.value("nested").toObject().value("nested").toObject(), twoDeep); QCOMPARE(outer.value("nested").toObject().value("nested").toObject().value("boolean").toBool(), true); + QT_TEST_EQUALITY_OPS(outer.value("nested").toObject().value("nested").toObject(), twoDeep, true); } void tst_QtJson::testArrayNested() @@ -862,6 +904,7 @@ void tst_QtJson::testArrayNested() object.insert("boolean", true); outer.append(object); QCOMPARE(outer.last().toObject(), object); + QT_TEST_EQUALITY_OPS(outer.last().toObject(), object, true); QCOMPARE(outer.last().toObject().value("boolean").toBool(), true); // two deep arrays @@ -881,6 +924,7 @@ void tst_QtJson::testArrayNestedEmpty() QJsonValue val = object.value("inner"); QJsonArray value = object.value("inner").toArray(); QVERIFY(QJsonDocument(value).isArray()); + QT_TEST_EQUALITY_OPS(QJsonDocument(), QJsonDocument(value), false); QCOMPARE(value.size(), 0); QCOMPARE(value, inner); QCOMPARE(value.size(), 0); @@ -898,14 +942,46 @@ void tst_QtJson::testObjectNestedEmpty() object.insert("inner2", inner2); QJsonObject value = object.value("inner").toObject(); QVERIFY(QJsonDocument(value).isObject()); + QT_TEST_EQUALITY_OPS(QJsonDocument(), QJsonDocument(value), false); QCOMPARE(value.size(), 0); QCOMPARE(value, inner); + QT_TEST_EQUALITY_OPS(value, inner, true); QCOMPARE(value.size(), 0); object.insert("count", 0.); QCOMPARE(object.value("inner").toObject().size(), 0); QCOMPARE(object.value("inner").type(), QJsonValue::Object); } +void tst_QtJson::testArrayEquality_data() +{ + QTest::addColumn<QJsonArray>("array1"); + QTest::addColumn<QJsonArray>("array2"); + QTest::addColumn<bool>("expectedResult"); + QTest::addRow("QJsonArray(), QJsonArray{665, 666, 667}") + << QJsonArray() << QJsonArray{665, 666, 667} << false; + QTest::addRow("QJsonArray(), QJsonArray{}") + << QJsonArray() << QJsonArray{} <<true; + QTest::addRow("QJsonArray(), QJsonArray{123, QLatin1String(\"foo\")}") + << QJsonArray() << QJsonArray{123, QLatin1String("foo")} << false; + QTest::addRow( + "QJsonArray{123,QLatin1String(\"foo\")}, QJsonArray{123,QLatin1String(\"foo\")}") + << QJsonArray{123, QLatin1String("foo")} + << QJsonArray{123, QLatin1String("foo")} + << true; +} + +void tst_QtJson::testArrayEquality() +{ + QFETCH(QJsonArray, array1); + QFETCH(QJsonArray, array2); + QFETCH(bool, expectedResult); + + QJsonValue value = QJsonValue(array1); + + QT_TEST_EQUALITY_OPS(array1, array2, expectedResult); + QT_TEST_EQUALITY_OPS(value, array2, expectedResult); +} + void tst_QtJson::testArrayComfortOperators() { QJsonArray first; @@ -945,7 +1021,7 @@ void tst_QtJson::testValueRef() QCOMPARE(object.value(QLatin1String("null")), QJsonValue()); object[QLatin1String("null")] = 100.; QCOMPARE(object.value(QLatin1String("null")).type(), QJsonValue::Double); - QJsonValue val = qAsConst(object)[QLatin1String("null")]; + QJsonValue val = std::as_const(object)[QLatin1String("null")]; QCOMPARE(val.toDouble(), 100.); QCOMPARE(object.size(), 2); @@ -955,6 +1031,63 @@ void tst_QtJson::testValueRef() QCOMPARE(object.value(QLatin1String("key")), QJsonValue(42)); } +void tst_QtJson::testValueRefComparison() +{ + QJsonValue a0 = 42.; + QJsonValue a1 = QStringLiteral("142"); + +#define CHECK_IMPL(lhs, rhs, ineq) \ + QCOMPARE(lhs, rhs); \ + QVERIFY(!(lhs != rhs)); \ + QVERIFY(lhs != ineq); \ + QVERIFY(!(lhs == ineq)); \ + QVERIFY(ineq != rhs); \ + QVERIFY(!(ineq == rhs)); \ + /* end */ + +#define CHECK(lhs, rhs, ineq) \ + do { \ + CHECK_IMPL(lhs, rhs, ineq) \ + CHECK_IMPL(std::as_const(lhs), rhs, ineq) \ + CHECK_IMPL(lhs, std::as_const(rhs), ineq) \ + CHECK_IMPL(std::as_const(lhs), std::as_const(rhs), ineq) \ + } while (0) + + // check that the (in)equality operators aren't ambiguous in C++20: + QJsonArray a = {a0, a1}; + + static_assert(std::is_same_v<decltype(a[0]), QJsonValueRef>); + + auto r0 = a.begin()[0]; + auto r1 = a.begin()[1]; + auto c0 = std::as_const(a).begin()[0]; + // ref <> ref + CHECK(r0, r0, r1); + // cref <> ref + CHECK(c0, r0, r1); + // ref <> cref + CHECK(r0, c0, r1); + // ref <> val + CHECK(r0, a0, r1); + // cref <> val + CHECK(c0, a0, r1); + // val <> ref + CHECK(a0, r0, a1); + // val <> cref + CHECK(a0, c0, a1); + // val <> val + CHECK(a0, a0, a1); + + QT_TEST_EQUALITY_OPS(r0, r1, false); + QT_TEST_EQUALITY_OPS(r0, c0, true); + QT_TEST_EQUALITY_OPS(c0, r1, false); + QT_TEST_EQUALITY_OPS(a0, c0, true); + QT_TEST_EQUALITY_OPS(a0, r1, false); + +#undef CHECK +#undef CHECK_IMPL +} + void tst_QtJson::testObjectIteration() { QJsonObject object; @@ -968,8 +1101,9 @@ void tst_QtJson::testObjectIteration() for (QJsonObject::iterator it = object.begin(); it != object.end(); ++it) QFAIL("Iterator after property add-and-remove should be empty"); - for (int i = 0; i < 10; ++i) - object[QString::number(i)] = (double)i; + // insert in weird order to confirm keys are sorted + for (int i : {0, 9, 5, 7, 8, 2, 1, 3, 6, 4}) + object[QString::number(i)] = double(i); QCOMPARE(object.size(), 10); @@ -978,44 +1112,79 @@ void tst_QtJson::testObjectIteration() for (QJsonObject::iterator it = object.begin(); it != object.end(); ++it) { QJsonValue value = it.value(); QCOMPARE((double)it.key().toInt(), value.toDouble()); + QT_TEST_EQUALITY_OPS(it, QJsonObject::iterator(), false); } { QJsonObject object2 = object; QCOMPARE(object, object2); + QT_TEST_EQUALITY_OPS(object, object2, true); QJsonValue val = *object2.begin(); - object2.erase(object2.begin()); + auto next = object2.erase(object2.begin()); QCOMPARE(object.size(), 10); QCOMPARE(object2.size(), 9); + QVERIFY(next == object2.begin()); + QT_TEST_EQUALITY_OPS(next, object2.begin(), true); + + double d = 1; // we erased the first item + for (auto it = object2.constBegin(); it != object2.constEnd(); ++it, d += 1) { + QJsonValue value = it.value(); + QVERIFY(it.value() != val); + QCOMPARE(it.value(), d); + QCOMPARE(it.value().toDouble(), d); + QCOMPARE(it.key().toInt(), value.toDouble()); + } + } + + { + QJsonObject object2 = object; + QCOMPARE(object, object2); + QT_TEST_EQUALITY_OPS(object, object2, true); - for (QJsonObject::const_iterator it = object2.constBegin(); it != object2.constEnd(); ++it) { + QJsonValue val = *(object2.end() - 1); + auto next = object2.erase(object2.end() - 1); + QCOMPARE(object.size(), 10); + QCOMPARE(object2.size(), 9); + QVERIFY(next == object2.end()); + double d = 0; + for (auto it = object2.constBegin(); it != object2.constEnd(); ++it, d += 1) { QJsonValue value = it.value(); QVERIFY(it.value() != val); - QCOMPARE((double)it.key().toInt(), value.toDouble()); + QCOMPARE(it.value(), d); + QCOMPARE(it.value().toDouble(), d); + QCOMPARE(it.key().toInt(), value.toDouble()); } } { QJsonObject object2 = object; QCOMPARE(object, object2); + QT_TEST_EQUALITY_OPS(object, object2, true); QJsonObject::iterator it = object2.find(QString::number(5)); QJsonValue val = *it; - object2.erase(it); + auto next = object2.erase(it); QCOMPARE(object.size(), 10); QCOMPARE(object2.size(), 9); + QCOMPARE(*next, 6); - for (QJsonObject::const_iterator it = object2.constBegin(); it != object2.constEnd(); ++it) { + int i = 0; + for (auto it = object2.constBegin(); it != object2.constEnd(); ++it, ++i) { + if (i == 5) + ++i; QJsonValue value = it.value(); QVERIFY(it.value() != val); - QCOMPARE((double)it.key().toInt(), value.toDouble()); + QCOMPARE(it.value(), i); + QCOMPARE(it.value().toInt(), i); + QCOMPARE(it.key().toInt(), value.toDouble()); } } { QJsonObject::Iterator it = object.begin(); it += 5; + QT_TEST_ALL_COMPARISON_OPS(it, object.begin(), Qt::strong_ordering::greater); QCOMPARE(QJsonValue(it.value()).toDouble(), 5.); it -= 3; QCOMPARE(QJsonValue(it.value()).toDouble(), 2.); @@ -1030,10 +1199,14 @@ void tst_QtJson::testObjectIteration() it += 5; QCOMPARE(QJsonValue(it.value()).toDouble(), 5.); it -= 3; + QT_TEST_ALL_COMPARISON_OPS(object.constBegin(), it, Qt::strong_ordering::less); QCOMPARE(QJsonValue(it.value()).toDouble(), 2.); QJsonObject::ConstIterator it2 = it + 5; + QT_TEST_EQUALITY_OPS(it, it2, false); QCOMPARE(QJsonValue(it2.value()).toDouble(), 7.); it2 = it - 1; + QT_TEST_ALL_COMPARISON_OPS(it2, it, Qt::strong_ordering::less); + QT_TEST_ALL_COMPARISON_OPS(it2, it - 2, Qt::strong_ordering::greater); QCOMPARE(QJsonValue(it2.value()).toDouble(), 1.); } @@ -1042,6 +1215,17 @@ void tst_QtJson::testObjectIteration() it = object.erase(it); QCOMPARE(object.size() , 0); QCOMPARE(it, object.end()); + QT_TEST_ALL_COMPARISON_OPS(it, object.end(), Qt::strong_ordering::equal); + QT_TEST_ALL_COMPARISON_OPS(it, object.constEnd(), Qt::strong_ordering::equal); + QT_TEST_ALL_COMPARISON_OPS(it, object.begin(), + Qt::strong_ordering::equal); // because object is empty + QT_TEST_ALL_COMPARISON_OPS(it, object.constBegin(), Qt::strong_ordering::equal); + QT_TEST_ALL_COMPARISON_OPS(QJsonObject::Iterator(), + QJsonObject::Iterator(), Qt::strong_ordering::equal); + QT_TEST_ALL_COMPARISON_OPS(QJsonObject::ConstIterator(), + QJsonObject::Iterator(), Qt::strong_ordering::equal); + QT_TEST_ALL_COMPARISON_OPS(QJsonObject::ConstIterator(), + QJsonObject::ConstIterator(), Qt::strong_ordering::equal); } void tst_QtJson::testArrayIteration() @@ -1055,7 +1239,11 @@ void tst_QtJson::testArrayIteration() int i = 0; for (QJsonArray::iterator it = array.begin(); it != array.end(); ++it, ++i) { QJsonValue value = (*it); + QJsonArray::iterator it1 = it; QCOMPARE((double)i, value.toDouble()); + QT_TEST_EQUALITY_OPS(QJsonArray::iterator(), QJsonArray::iterator(), true); + QT_TEST_EQUALITY_OPS(QJsonArray::iterator(), it, false); + QT_TEST_EQUALITY_OPS(it1, it, true); } QCOMPARE(array.begin()->toDouble(), array.constBegin()->toDouble()); @@ -1065,14 +1253,38 @@ void tst_QtJson::testArrayIteration() QCOMPARE(array, array2); QJsonValue val = *array2.begin(); - array2.erase(array2.begin()); + auto next = array2.erase(array2.begin()); QCOMPARE(array.size(), 10); QCOMPARE(array2.size(), 9); + QVERIFY(next == array2.begin()); i = 1; - for (QJsonArray::const_iterator it = array2.constBegin(); it != array2.constEnd(); ++it, ++i) { + for (auto it = array2.constBegin(); it != array2.constEnd(); ++it, ++i) { + QJsonValue value = (*it); + QCOMPARE(value.toInt(), i); + QCOMPARE(value.toDouble(), i); + QCOMPARE(it->toInt(), i); + QCOMPARE(it->toDouble(), i); + } + } + + { + QJsonArray array2 = array; + QCOMPARE(array, array2); + + QJsonValue val = array2.last(); + auto next = array2.erase(array2.end() - 1); + QCOMPARE(array.size(), 10); + QCOMPARE(array2.size(), 9); + QVERIFY(next == array2.end()); + + i = 0; + for (auto it = array2.constBegin(); it != array2.constEnd(); ++it, ++i) { QJsonValue value = (*it); - QCOMPARE((double)i, value.toDouble()); + QCOMPARE(value.toInt(), i); + QCOMPARE(value.toDouble(), i); + QCOMPARE(it->toInt(), i); + QCOMPARE(it->toDouble(), i); } } @@ -1086,6 +1298,13 @@ void tst_QtJson::testArrayIteration() QCOMPARE(QJsonValue(*it2).toDouble(), 7.); it2 = it - 1; QCOMPARE(QJsonValue(*it2).toDouble(), 1.); + QT_TEST_EQUALITY_OPS(it, it2, false); + it = array.begin(); + QT_TEST_EQUALITY_OPS(it, array.begin(), true); + it2 = it + 5; + QT_TEST_ALL_COMPARISON_OPS(it2, it, Qt::strong_ordering::greater); + it += 5; + QT_TEST_EQUALITY_OPS(it, it2, true); } { @@ -1105,6 +1324,26 @@ void tst_QtJson::testArrayIteration() it = array.erase(it); QCOMPARE(array.size() , 0); QCOMPARE(it, array.end()); + QT_TEST_EQUALITY_OPS(it, array.end(), true); + + { + int i = 0; + for (QJsonArray::const_iterator it = array.constBegin(); + it != array.constEnd(); ++it, ++i) { + QJsonArray::const_iterator it1 = it; + QT_TEST_EQUALITY_OPS(QJsonArray::const_iterator(), QJsonArray::const_iterator(), true); + QT_TEST_EQUALITY_OPS(QJsonArray::const_iterator(), it, false); + QT_TEST_EQUALITY_OPS(it1, it, true); + } + } + + { + QJsonArray::iterator nonConstIt = array.begin(); + QJsonArray::const_iterator it = array.constBegin(); + QT_TEST_EQUALITY_OPS(nonConstIt, it, true); + it+=1; + QT_TEST_ALL_COMPARISON_OPS(nonConstIt, it, Qt::strong_ordering::less); + } } void tst_QtJson::testObjectFind() @@ -1118,14 +1357,12 @@ void tst_QtJson::testObjectFind() QJsonObject::iterator it = object.find(QLatin1String("1")); QCOMPARE((*it).toDouble(), 1.); it = object.find(QString("11")); - QCOMPARE((*it).type(), QJsonValue::Undefined); QCOMPARE(it, object.end()); QJsonObject::const_iterator cit = object.constFind(QLatin1String("1")); QCOMPARE((*cit).toDouble(), 1.); cit = object.constFind(QString("11")); - QCOMPARE((*it).type(), QJsonValue::Undefined); - QCOMPARE(it, object.end()); + QCOMPARE(cit, object.constEnd()); } void tst_QtJson::testDocument() @@ -1200,6 +1437,8 @@ void tst_QtJson::testDocument() QCOMPARE(doc5.isObject(), false); QCOMPARE(doc5.array().size(), 1); QCOMPARE(doc5.array().at(0), QJsonValue(23)); + + QT_TEST_EQUALITY_OPS(doc2, doc3, true); } void tst_QtJson::nullValues() @@ -1571,7 +1810,8 @@ void tst_QtJson::fromVariantHash() void tst_QtJson::toVariantMap() { - QCOMPARE(QMetaType::Type(QJsonValue(QJsonObject()).toVariant().type()), QMetaType::QVariantMap); // QTBUG-32524 + QCOMPARE(QMetaType::Type(QJsonValue(QJsonObject()).toVariant().typeId()), + QMetaType::QVariantMap); // QTBUG-32524 QJsonObject object; QVariantMap map = object.toVariantMap(); @@ -1591,7 +1831,7 @@ void tst_QtJson::toVariantMap() QCOMPARE(map.size(), 3); QCOMPARE(map.value("Key"), QVariant(QString("Value"))); QCOMPARE(map.value("null"), QVariant::fromValue(nullptr)); - QCOMPARE(map.value("Array").type(), QVariant::List); + QCOMPARE(map.value("Array").typeId(), QMetaType::QVariantList); QVariantList list = map.value("Array").toList(); QCOMPARE(list.size(), 4); QCOMPARE(list.at(0), QVariant(true)); @@ -1620,7 +1860,7 @@ void tst_QtJson::toVariantHash() QCOMPARE(hash.size(), 3); QCOMPARE(hash.value("Key"), QVariant(QString("Value"))); QCOMPARE(hash.value("null"), QVariant::fromValue(nullptr)); - QCOMPARE(hash.value("Array").type(), QVariant::List); + QCOMPARE(hash.value("Array").typeId(), QMetaType::QVariantList); QVariantList list = hash.value("Array").toList(); QCOMPARE(list.size(), 4); QCOMPARE(list.at(0), QVariant(true)); @@ -1631,7 +1871,8 @@ void tst_QtJson::toVariantHash() void tst_QtJson::toVariantList() { - QCOMPARE(QMetaType::Type(QJsonValue(QJsonArray()).toVariant().type()), QMetaType::QVariantList); // QTBUG-32524 + QCOMPARE(QMetaType::Type(QJsonValue(QJsonArray()).toVariant().typeId()), + QMetaType::QVariantList); // QTBUG-32524 QJsonArray array; QVariantList list = array.toVariantList(); @@ -1651,7 +1892,7 @@ void tst_QtJson::toVariantList() QCOMPARE(list.size(), 3); QCOMPARE(list[0], QVariant(QString("Value"))); QCOMPARE(list[1], QVariant::fromValue(nullptr)); - QCOMPARE(list[2].type(), QVariant::List); + QCOMPARE(list[2].typeId(), QMetaType::QVariantList); QVariantList vlist = list[2].toList(); QCOMPARE(vlist.size(), 4); QCOMPARE(vlist.at(0), QVariant(true)); @@ -1773,16 +2014,13 @@ void tst_QtJson::toJsonLargeNumericValues() QJsonArray array; array.append(QJsonValue(1.234567)); // actual precision bug in Qt 5.0.0 array.append(QJsonValue(1.7976931348623157e+308)); // JS Number.MAX_VALUE - array.append(QJsonValue(5e-324)); // JS Number.MIN_VALUE array.append(QJsonValue(std::numeric_limits<double>::min())); array.append(QJsonValue(std::numeric_limits<double>::max())); array.append(QJsonValue(std::numeric_limits<double>::epsilon())); - array.append(QJsonValue(std::numeric_limits<double>::denorm_min())); array.append(QJsonValue(0.0)); array.append(QJsonValue(-std::numeric_limits<double>::min())); array.append(QJsonValue(-std::numeric_limits<double>::max())); array.append(QJsonValue(-std::numeric_limits<double>::epsilon())); - array.append(QJsonValue(-std::numeric_limits<double>::denorm_min())); array.append(QJsonValue(-0.0)); array.append(QJsonValue(9007199254740992LL)); // JS Number max integer array.append(QJsonValue(-9007199254740992LL)); // JS Number min integer @@ -1796,27 +2034,21 @@ void tst_QtJson::toJsonLargeNumericValues() " 1.234567,\n" " 1.7976931348623157e+308,\n" #ifdef QT_NO_DOUBLECONVERSION // "shortest" double conversion is not very short then - " 4.9406564584124654e-324,\n" " 2.2250738585072014e-308,\n" " 1.7976931348623157e+308,\n" " 2.2204460492503131e-16,\n" - " 4.9406564584124654e-324,\n" " 0,\n" " -2.2250738585072014e-308,\n" " -1.7976931348623157e+308,\n" " -2.2204460492503131e-16,\n" - " -4.9406564584124654e-324,\n" #else - " 5e-324,\n" " 2.2250738585072014e-308,\n" " 1.7976931348623157e+308,\n" " 2.220446049250313e-16,\n" - " 5e-324,\n" " 0,\n" " -2.2250738585072014e-308,\n" " -1.7976931348623157e+308,\n" " -2.220446049250313e-16,\n" - " -5e-324,\n" #endif " 0,\n" " 9007199254740992,\n" @@ -1824,20 +2056,50 @@ void tst_QtJson::toJsonLargeNumericValues() " ]\n" "}\n"; -#ifdef Q_OS_QNX - QEXPECT_FAIL("", "See QTBUG-37066", Continue); -#endif QCOMPARE(json, expected); QJsonDocument doc; doc.setObject(object); json = doc.toJson(); -#ifdef Q_OS_QNX - QEXPECT_FAIL("", "See QTBUG-37066", Continue); -#endif QCOMPARE(json, expected); } +void tst_QtJson::toJsonDenormalValues() +{ + if constexpr (std::numeric_limits<double>::has_denorm == std::denorm_present) { + QJsonObject object; + QJsonArray array; + array.append(QJsonValue(5e-324)); // JS Number.MIN_VALUE + array.append(QJsonValue(std::numeric_limits<double>::denorm_min())); + array.append(QJsonValue(-std::numeric_limits<double>::denorm_min())); + object.insert("Array", array); + + QByteArray json = QJsonDocument(object).toJson(); + QByteArray expected = + "{\n" + " \"Array\": [\n" +#ifdef QT_NO_DOUBLECONVERSION // "shortest" double conversion is not very short then + " 4.9406564584124654e-324,\n" + " 4.9406564584124654e-324,\n" + " -4.9406564584124654e-324\n" +#else + " 5e-324,\n" + " 5e-324,\n" + " -5e-324\n" +#endif + " ]\n" + "}\n"; + + QCOMPARE(json, expected); + QJsonDocument doc; + doc.setObject(object); + json = doc.toJson(); + QCOMPARE(json, expected); + } else { + QSKIP("Skipping 'denorm' as this type lacks denormals on this system"); + } +} + void tst_QtJson::fromJson() { { @@ -2160,12 +2422,12 @@ void tst_QtJson::parseNumbers() QCOMPARE(val.toDouble(), (double)numbers[i].n); } } + // test number parsing + struct Numbers { + const char *str; + double n; + }; { - // test number parsing - struct Numbers { - const char *str; - double n; - }; Numbers numbers [] = { { "0", 0 }, { "1", 1 }, @@ -2181,8 +2443,6 @@ void tst_QtJson::parseNumbers() { "1.1e10", 1.1e10 }, { "1.1e308", 1.1e308 }, { "-1.1e308", -1.1e308 }, - { "1.1e-308", 1.1e-308 }, - { "-1.1e-308", -1.1e-308 }, { "1.1e+308", 1.1e+308 }, { "-1.1e+308", -1.1e+308 }, { "1.e+308", 1.e+308 }, @@ -2194,10 +2454,6 @@ void tst_QtJson::parseNumbers() json += numbers[i].str; json += " ]"; QJsonDocument doc = QJsonDocument::fromJson(json); -#ifdef Q_OS_QNX - if (0 == QString::compare(numbers[i].str, "1.1e-308")) - QEXPECT_FAIL("", "See QTBUG-37066", Abort); -#endif QVERIFY(!doc.isEmpty()); QCOMPARE(doc.isArray(), true); QCOMPARE(doc.isObject(), false); @@ -2208,6 +2464,29 @@ void tst_QtJson::parseNumbers() QCOMPARE(val.toDouble(), numbers[i].n); } } + if constexpr (std::numeric_limits<double>::has_denorm == std::denorm_present) { + Numbers numbers [] = { + { "1.1e-308", 1.1e-308 }, + { "-1.1e-308", -1.1e-308 } + }; + int size = sizeof(numbers)/sizeof(Numbers); + for (int i = 0; i < size; ++i) { + QByteArray json = "[ "; + json += numbers[i].str; + json += " ]"; + QJsonDocument doc = QJsonDocument::fromJson(json); + QVERIFY(!doc.isEmpty()); + QCOMPARE(doc.isArray(), true); + QCOMPARE(doc.isObject(), false); + QJsonArray array = doc.array(); + QCOMPARE(array.size(), 1); + QJsonValue val = array.at(0); + QCOMPARE(val.type(), QJsonValue::Double); + QCOMPARE(val.toDouble(), numbers[i].n); + } + } else { + qInfo("Skipping denormal test as this system's double type lacks support"); + } } void tst_QtJson::parseStrings() @@ -2297,7 +2576,7 @@ void tst_QtJson::parseDuplicateKeys() void tst_QtJson::testParser() { QFile file(testDataDir + "/test.json"); - file.open(QFile::ReadOnly); + QVERIFY(file.open(QFile::ReadOnly)); QByteArray testJson = file.readAll(); QJsonDocument doc = QJsonDocument::fromJson(testJson); @@ -2353,6 +2632,13 @@ void tst_QtJson::testCompaction() } QCOMPARE(obj.size(), 1); QCOMPARE(obj.value(QLatin1String("foo")).toString(), QLatin1String("bar")); + + QJsonObject obj2; + + QT_TEST_EQUALITY_OPS(obj, obj2, false); + QT_TEST_EQUALITY_OPS(QJsonObject(), obj2, true); + obj2 = obj; + QT_TEST_EQUALITY_OPS(obj, obj2, true); } void tst_QtJson::testDebugStream() @@ -2632,57 +2918,57 @@ void tst_QtJson::testDetachBug() void tst_QtJson::valueEquals() { QCOMPARE(QJsonValue(), QJsonValue()); - QVERIFY(QJsonValue() != QJsonValue(QJsonValue::Undefined)); - QVERIFY(QJsonValue() != QJsonValue(true)); - QVERIFY(QJsonValue() != QJsonValue(1.)); - QVERIFY(QJsonValue() != QJsonValue(QJsonArray())); - QVERIFY(QJsonValue() != QJsonValue(QJsonObject())); + QT_TEST_EQUALITY_OPS(QJsonValue(), QJsonValue(QJsonValue::Undefined), false); + QT_TEST_EQUALITY_OPS(QJsonValue(), QJsonValue(true), false); + QT_TEST_EQUALITY_OPS(QJsonValue(), QJsonValue(1.), false); + QT_TEST_EQUALITY_OPS(QJsonValue(), QJsonValue(QJsonArray()), false); + QT_TEST_EQUALITY_OPS(QJsonValue(), QJsonValue(QJsonObject()), false); QCOMPARE(QJsonValue(true), QJsonValue(true)); - QVERIFY(QJsonValue(true) != QJsonValue(false)); - QVERIFY(QJsonValue(true) != QJsonValue(QJsonValue::Undefined)); - QVERIFY(QJsonValue(true) != QJsonValue()); - QVERIFY(QJsonValue(true) != QJsonValue(1.)); - QVERIFY(QJsonValue(true) != QJsonValue(QJsonArray())); - QVERIFY(QJsonValue(true) != QJsonValue(QJsonObject())); + QT_TEST_EQUALITY_OPS(QJsonValue(true), QJsonValue(false), false); + QT_TEST_EQUALITY_OPS(QJsonValue(true), QJsonValue(QJsonValue::Undefined), false); + QT_TEST_EQUALITY_OPS(QJsonValue(true), QJsonValue(), false); + QT_TEST_EQUALITY_OPS(QJsonValue(true), QJsonValue(1.), false); + QT_TEST_EQUALITY_OPS(QJsonValue(true), QJsonValue(QJsonArray()), false); + QT_TEST_EQUALITY_OPS(QJsonValue(true), QJsonValue(QJsonObject()), false); QCOMPARE(QJsonValue(1), QJsonValue(1)); - QVERIFY(QJsonValue(1) != QJsonValue(2)); + QT_TEST_EQUALITY_OPS(QJsonValue(1), QJsonValue(2), false); QCOMPARE(QJsonValue(1), QJsonValue(1.)); - QVERIFY(QJsonValue(1) != QJsonValue(1.1)); - QVERIFY(QJsonValue(1) != QJsonValue(QJsonValue::Undefined)); - QVERIFY(QJsonValue(1) != QJsonValue()); - QVERIFY(QJsonValue(1) != QJsonValue(true)); - QVERIFY(QJsonValue(1) != QJsonValue(QJsonArray())); - QVERIFY(QJsonValue(1) != QJsonValue(QJsonObject())); + QT_TEST_EQUALITY_OPS(QJsonValue(1), QJsonValue(1.1), false); + QT_TEST_EQUALITY_OPS(QJsonValue(1), QJsonValue(QJsonValue::Undefined), false); + QT_TEST_EQUALITY_OPS(QJsonValue(1), QJsonValue(), false); + QT_TEST_EQUALITY_OPS(QJsonValue(1), QJsonValue(true), false); + QT_TEST_EQUALITY_OPS(QJsonValue(1), QJsonValue(QJsonArray()), false); + QT_TEST_EQUALITY_OPS(QJsonValue(1), QJsonValue(QJsonObject()), false); QCOMPARE(QJsonValue(1.), QJsonValue(1.)); - QVERIFY(QJsonValue(1.) != QJsonValue(2.)); - QVERIFY(QJsonValue(1.) != QJsonValue(QJsonValue::Undefined)); - QVERIFY(QJsonValue(1.) != QJsonValue()); - QVERIFY(QJsonValue(1.) != QJsonValue(true)); - QVERIFY(QJsonValue(1.) != QJsonValue(QJsonArray())); - QVERIFY(QJsonValue(1.) != QJsonValue(QJsonObject())); + QT_TEST_EQUALITY_OPS(QJsonValue(1.), QJsonValue(2.), false); + QT_TEST_EQUALITY_OPS(QJsonValue(1.), QJsonValue(QJsonValue::Undefined), false); + QT_TEST_EQUALITY_OPS(QJsonValue(1.), QJsonValue(), false); + QT_TEST_EQUALITY_OPS(QJsonValue(1.), QJsonValue(true), false); + QT_TEST_EQUALITY_OPS(QJsonValue(1.), QJsonValue(QJsonArray()), false); + QT_TEST_EQUALITY_OPS(QJsonValue(1.), QJsonValue(QJsonObject()), false); QCOMPARE(QJsonValue(QJsonArray()), QJsonValue(QJsonArray())); QJsonArray nonEmptyArray; nonEmptyArray.append(true); - QVERIFY(QJsonValue(QJsonArray()) != nonEmptyArray); - QVERIFY(QJsonValue(QJsonArray()) != QJsonValue(QJsonValue::Undefined)); - QVERIFY(QJsonValue(QJsonArray()) != QJsonValue()); - QVERIFY(QJsonValue(QJsonArray()) != QJsonValue(true)); - QVERIFY(QJsonValue(QJsonArray()) != QJsonValue(1.)); - QVERIFY(QJsonValue(QJsonArray()) != QJsonValue(QJsonObject())); + QT_TEST_EQUALITY_OPS(QJsonValue(QJsonArray()), nonEmptyArray, false); + QT_TEST_EQUALITY_OPS(QJsonValue(QJsonArray()), QJsonValue(QJsonValue::Undefined), false); + QT_TEST_EQUALITY_OPS(QJsonValue(QJsonArray()), QJsonValue(), false); + QT_TEST_EQUALITY_OPS(QJsonValue(QJsonArray()), QJsonValue(true), false); + QT_TEST_EQUALITY_OPS(QJsonValue(QJsonArray()), QJsonValue(1.), false); + QT_TEST_EQUALITY_OPS(QJsonValue(QJsonArray()), QJsonValue(QJsonObject()), false); QCOMPARE(QJsonValue(QJsonObject()), QJsonValue(QJsonObject())); QJsonObject nonEmptyObject; nonEmptyObject.insert("Key", true); - QVERIFY(QJsonValue(QJsonObject()) != nonEmptyObject); - QVERIFY(QJsonValue(QJsonObject()) != QJsonValue(QJsonValue::Undefined)); - QVERIFY(QJsonValue(QJsonObject()) != QJsonValue()); - QVERIFY(QJsonValue(QJsonObject()) != QJsonValue(true)); - QVERIFY(QJsonValue(QJsonObject()) != QJsonValue(1.)); - QVERIFY(QJsonValue(QJsonObject()) != QJsonValue(QJsonArray())); + QT_TEST_EQUALITY_OPS(QJsonValue(QJsonObject()), nonEmptyObject, false); + QT_TEST_EQUALITY_OPS(QJsonValue(QJsonObject()), QJsonValue(QJsonValue::Undefined), false); + QT_TEST_EQUALITY_OPS(QJsonValue(QJsonObject()), QJsonValue(), false); + QT_TEST_EQUALITY_OPS(QJsonValue(QJsonObject()), QJsonValue(true), false); + QT_TEST_EQUALITY_OPS(QJsonValue(QJsonObject()), QJsonValue(1.), false); + QT_TEST_EQUALITY_OPS(QJsonValue(QJsonObject()), QJsonValue(QJsonArray()), false); QCOMPARE(QJsonValue("foo"), QJsonValue(QLatin1String("foo"))); QCOMPARE(QJsonValue("foo"), QJsonValue(QString("foo"))); @@ -2875,7 +3161,7 @@ void tst_QtJson::documentEquals() void tst_QtJson::bom() { QFile file(testDataDir + "/bom.json"); - file.open(QFile::ReadOnly); + QVERIFY(file.open(QFile::ReadOnly)); QByteArray json = file.readAll(); // Import json document into a QJsonDocument @@ -3196,7 +3482,7 @@ void tst_QtJson::documentFromVariant() // As JSON arrays they should be equal. QCOMPARE(da1.array(), da2.array()); - + QT_TEST_EQUALITY_OPS(da1, da2, true); QMap <QString, QVariant> map; map["key"] = string; @@ -3212,6 +3498,7 @@ void tst_QtJson::documentFromVariant() // As JSON objects they should be equal. QCOMPARE(do1.object(), do2.object()); + QT_TEST_EQUALITY_OPS(do1, do2, true); } void tst_QtJson::parseErrorOffset_data() @@ -3310,6 +3597,7 @@ void tst_QtJson::streamSerializationQJsonDocument() QDataStream load(buffer); load >> output; QCOMPARE(output, document); + QT_TEST_EQUALITY_OPS(output, document, true); } void tst_QtJson::streamSerializationQJsonArray_data() @@ -3554,16 +3842,13 @@ void tst_QtJson::fromToVariantConversions_data() QTest::newRow("NaN") << QVariant(qQNaN()) << QJsonValue(QJsonValue::Null) << QVariant::fromValue(nullptr); - const qulonglong ulongValue = (1ul << 63) + 1; - const double uLongToDouble = ulongValue; - qint64 n; - if (convertDoubleTo(uLongToDouble, &n)) { - QTest::newRow("ulonglong") << QVariant(ulongValue) << QJsonValue(uLongToDouble) - << QVariant(n); - } else { - QTest::newRow("ulonglong") << QVariant(ulongValue) << QJsonValue(uLongToDouble) - << QVariant(uLongToDouble); - } + static_assert(std::numeric_limits<double>::digits <= 63, + "double is too big on this platform, this test would fail"); + constexpr quint64 Threshold = Q_UINT64_C(1) << 63; + const qulonglong ulongValue = qulonglong(Threshold) + 1; + const double uLongToDouble = Threshold; + QTest::newRow("ulonglong") << QVariant(ulongValue) << QJsonValue(uLongToDouble) + << QVariant(uLongToDouble); } void tst_QtJson::fromToVariantConversions() @@ -3663,5 +3948,50 @@ void tst_QtJson::testIteratorComparison() QVERIFY(t.end() > t.begin()); } +void tst_QtJson::noLeakOnNameClash_data() +{ + QTest::addColumn<QString>("fileName"); + QTest::addColumn<QByteArray>("result"); + QTest::addRow("simple") + << QStringLiteral("simple.duplicates.json") + << QByteArray(R"({"": 0})"); + QTest::addRow("test") + << QStringLiteral("test.duplicates.json") + << QByteArray(R"([ + "JSON Test Pattern pass1", {"a": ["array with 1 element"]}, {}, [], -42, true, + false, null, {"a": "A key can be any string"}, 0.5, 98.6, 99.44, 1066, 10, 1, + 0.1, 1, 2, 2, "rosebud", {"a": "bar"}, {"a": {"a": 2000}}, {"a": {"a": 2000}}, + {"a": {"a": 2000}}, {"a": {"a": 2000}} + ])"); + QTest::addRow("test3") + << QStringLiteral("test3.duplicates.json") + << QByteArray(R"({"a": [{"a": "212 555-1234"}, {"a": "646 555-4567"}]})"); +} + +void tst_QtJson::noLeakOnNameClash() +{ + QFETCH(QString, fileName); + QFETCH(QByteArray, result); + + QFile file(testDataDir + u'/' + fileName); + QVERIFY(file.open(QFile::ReadOnly)); + QByteArray testJson = file.readAll(); + QVERIFY(!testJson.isEmpty()); + + QJsonParseError error; + + // Retains the last one of each set of duplicate keys. + QJsonDocument doc = QJsonDocument::fromJson(testJson, &error); + QVERIFY2(!doc.isNull(), qPrintable(error.errorString())); + QJsonDocument expected = QJsonDocument::fromJson(result, &error); + QVERIFY2(!expected.isNull(), qPrintable(error.errorString())); + + QCOMPARE(doc, expected); + QT_TEST_EQUALITY_OPS(doc, expected, true); + + // It should not leak. + // In particular it should not forget to deref the container for the inner objects. +} + QTEST_MAIN(tst_QtJson) #include "tst_qtjson.moc" diff --git a/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt b/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt index 276474ba37..29a935977b 100644 --- a/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qcborstreamreader/CMakeLists.txt @@ -1,15 +1,22 @@ -# Generated from qcborstreamreader.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qcborstreamreader Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qcborstreamreader LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qcborstreamreader SOURCES tst_qcborstreamreader.cpp INCLUDE_DIRECTORIES ../../../../../src/3rdparty/tinycbor/src - ../../../../../src/3rdparty/tinycbor/tests/parser - PUBLIC_LIBRARIES + ../../../../../src/3rdparty/tinycbor/tests + LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/serialization/qcborstreamreader/tst_qcborstreamreader.cpp b/tests/auto/corelib/serialization/qcborstreamreader/tst_qcborstreamreader.cpp index 8d0b5a054e..63cfbce75f 100644 --- a/tests/auto/corelib/serialization/qcborstreamreader/tst_qcborstreamreader.cpp +++ b/tests/auto/corelib/serialization/qcborstreamreader/tst_qcborstreamreader.cpp @@ -1,48 +1,10 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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) 2020 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/qcborstream.h> #include <QTest> #include <QBuffer> -#include <QtCore/private/qbytearray_p.h> - class tst_QCborStreamReader : public QObject { Q_OBJECT @@ -124,7 +86,7 @@ template<> char *toString<QCborStreamReader::Type>(const QCborStreamReader::Type QT_END_NAMESPACE // Get the data from TinyCBOR (see src/3rdparty/tinycbor/tests/parser/data.cpp) -#include "data.cpp" +#include "parser/data.cpp" void tst_QCborStreamReader::initTestCase_data() { @@ -693,6 +655,7 @@ void tst_QCborStreamReader::strings() QCOMPARE(reader.currentStringChunkSize(), qsizetype(reader.length())); int chunks = 0; + QByteArray fullString; forever { QCborStreamReader::StringResult<QByteArray> controlData; if (reader.isString()) { @@ -703,6 +666,7 @@ void tst_QCborStreamReader::strings() controlData = controlReader.readByteArray(); } QVERIFY(controlData.status != QCborStreamReader::Error); + fullString += controlData.data; for (int i = 0; i < 10; ++i) { // this call must work several times with the same result @@ -725,6 +689,43 @@ void tst_QCborStreamReader::strings() if (!isChunked) QCOMPARE(chunks, 1); + + // Now re-do and compare with toString() and toByteArray(), against + // the control data we calculated above + reader.reset(); + QVERIFY(reader.isString() || reader.isByteArray()); + if (reader.isByteArray()) { + QByteArray prefix("some prefix"); + QByteArray ba = prefix; + QVERIFY(reader.readAndAppendToByteArray(ba)); + QCOMPARE(ba, prefix + fullString); + } else { + QString prefix("some prefix"); + QString str = prefix; + QVERIFY(reader.readAndAppendToString(str)); + QCOMPARE(str, prefix + QString::fromUtf8(fullString)); + } + + // Re-do again using the UTF-8 interface. + reader.reset(); + QVERIFY(reader.isString() || reader.isByteArray()); + if (reader.isString()) { + QByteArray prefix("some prefix"); + QByteArray utf8 = prefix; + QVERIFY(reader.readAndAppendToUtf8String(utf8)); + QCOMPARE(utf8, prefix + fullString); + + reader.reset(); + fullString = prefix; + forever { + auto r = reader.readUtf8String(); + QCOMPARE_NE(r.status, QCborStreamReader::Error); + fullString += r.data; + if (r.status == QCborStreamReader::EndOfString) + break; + } + QCOMPARE(fullString, utf8); + } } void tst_QCborStreamReader::tags_data() @@ -917,7 +918,7 @@ void tst_QCborStreamReader::validation_data() // Add QCborStreamReader-specific limitations due to use of QByteArray and // QString, which are allocated by QArrayData::allocate(). const qsizetype MaxInvalid = std::numeric_limits<QByteArray::size_type>::max(); - const qsizetype MinInvalid = MaxByteArraySize + 1; + const qsizetype MinInvalid = QByteArray::max_size() + 1; addValidationColumns(); addValidationData(MinInvalid); @@ -944,11 +945,57 @@ void tst_QCborStreamReader::validation() reader.reset(); QVERIFY(!reader.next()); QCOMPARE(reader.lastError(), error); + + // check toString() and toByteArray() too + if (reader.isString() || reader.isByteArray()) { + reader.reset(); + if (reader.isString()) { + QString prefix = "some prefix"; + QString str = prefix; + QVERIFY(!reader.readAndAppendToString(str)); + QVERIFY(str.startsWith(prefix)); // but may have decoded some + } else if (reader.isByteArray()) { + QByteArray prefix = "some prefix"; + QByteArray ba = prefix; + QVERIFY(!reader.readAndAppendToByteArray(ba)); + QVERIFY(ba.startsWith(prefix)); // but may have decoded some + } + QCOMPARE(reader.lastError(), error); + + reader.reset(); + if (reader.isString()) + QVERIFY(reader.readAllString().isNull()); + else + QVERIFY(reader.readAllByteArray().isNull()); + } + + reader.reset(); + + // and the UTF-8 API + if (reader.isString()) { + QByteArray prefix = "some prefix"; + QByteArray ba = prefix; + QVERIFY(!reader.readAndAppendToUtf8String(ba)); + QVERIFY(ba.startsWith(prefix)); // but may have decoded some + QCOMPARE(reader.lastError(), error); + + reader.reset(); + QVERIFY(reader.readAllUtf8String().isNull()); + + reader.reset(); + auto r = reader.readUtf8String(); + for ( ; r.status == QCborStreamReader::Ok; r = reader.readUtf8String()) { + // while the data is valid... + QVERIFY(!r.data.isNull()); + } + QCOMPARE_NE(r.status, QCborStreamReader::EndOfString); + QCOMPARE(reader.lastError(), error); + } } void tst_QCborStreamReader::hugeDeviceValidation_data() { - addValidationHugeDevice(MaxByteArraySize + 1, MaxStringSize + 1); + addValidationHugeDevice(QByteArray::max_size() + 1, QString::max_size() + 1); } void tst_QCborStreamReader::hugeDeviceValidation() @@ -957,6 +1004,17 @@ void tst_QCborStreamReader::hugeDeviceValidation() if (!useDevice) return; +#if (defined(__SANITIZE_ADDRESS__) || __has_feature(address_sanitizer)) + if ( qstrcmp(QTest::currentDataTag(), "bytearray-just-too-big") == 0 + || qstrcmp(QTest::currentDataTag(), "string-just-too-big") == 0) + QSKIP("This test tries to allocate a huge memory buffer," + " which Address Sanitizer flags as a problem"); +#endif +#if defined(Q_OS_WASM) + QSKIP("This test tries to allocate a huge memory buffer," + " causes problem on WebAssembly platform which has limited resources."); +#endif // Q_OS_WASM + QFETCH(QSharedPointer<QIODevice>, device); QFETCH(CborError, expectedError); QFETCH(CborError, expectedValidationError); diff --git a/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt b/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt index 2796dc214c..c1a9a87677 100644 --- a/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt @@ -1,12 +1,19 @@ -# Generated from qcborstreamwriter.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qcborstreamwriter Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qcborstreamwriter LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qcborstreamwriter SOURCES tst_qcborstreamwriter.cpp INCLUDE_DIRECTORIES - ../../../../../src/3rdparty/tinycbor/tests/encoder + ../../../../../src/3rdparty/tinycbor/tests ) diff --git a/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp b/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp index b32a2b4d73..45e241ef5c 100644 --- a/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp +++ b/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** 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 <QTest> #include <QCborStreamWriter> @@ -65,7 +29,7 @@ private Q_SLOTS: // Get the data from TinyCBOR (see src/3rdparty/tinycbor/tests/encoder/data.cpp) typedef quint64 CborTag; -#include "data.cpp" +#include "encoder/data.cpp" void encodeVariant(QCborStreamWriter &writer, const QVariant &v) { @@ -117,9 +81,9 @@ void encodeVariant(QCborStreamWriter &writer, const QVariant &v) list = v.value<IndeterminateLengthArray>(); writer.startArray(); } else { - writer.startArray(list.length()); + writer.startArray(list.size()); } - for (const QVariant &v2 : qAsConst(list)) + for (const QVariant &v2 : std::as_const(list)) encodeVariant(writer, v2); QVERIFY(writer.endArray()); return; @@ -130,9 +94,9 @@ void encodeVariant(QCborStreamWriter &writer, const QVariant &v) map = v.value<IndeterminateLengthMap>(); writer.startMap(); } else { - writer.startMap(map.length()); + writer.startMap(map.size()); } - for (auto pair : qAsConst(map)) { + for (auto pair : std::as_const(map)) { encodeVariant(writer, pair.first); encodeVariant(writer, pair.second); } diff --git a/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt b/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt index 9233888671..4b72396489 100644 --- a/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt @@ -1,15 +1,23 @@ -# Generated from qcborvalue.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qcborvalue Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qcborvalue LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qcborvalue SOURCES tst_qcborvalue.cpp INCLUDE_DIRECTORIES ../../../../../src/3rdparty/tinycbor/src ../../../../../src/3rdparty/tinycbor/tests/parser - PUBLIC_LIBRARIES + LIBRARIES Qt::CorePrivate + Qt::TestPrivate ) diff --git a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp index f5a3e4817c..23b25834b9 100644 --- a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp +++ b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp @@ -1,55 +1,23 @@ -/**************************************************************************** -** -** Copyright (C) 2020 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) 2022 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/qcborvalue.h> #include <QTest> +#include <QtTest/private/qcomparisontesthelper_p.h> + #include <QBuffer> #include <QCborStreamReader> #include <QCborStreamWriter> +#include <QDateTime> #include <QtEndian> - -#include <QtCore/private/qbytearray_p.h> +#include <QTimeZone> Q_DECLARE_METATYPE(QCborKnownTags) Q_DECLARE_METATYPE(QCborValue) Q_DECLARE_METATYPE(QCborValue::EncodingOptions) +using namespace Qt::StringLiterals; + class tst_QCborValue : public QObject { Q_OBJECT @@ -61,6 +29,7 @@ private slots: void tagged(); void extendedTypes_data(); void extendedTypes(); + void compareCompiles(); void copyCompare_data() { basics_data(); } void copyCompare(); @@ -72,6 +41,9 @@ private slots: void arrayMutation(); void arrayMutateWithCopies(); void arrayPrepend(); + void arrayValueRef_data() { basics_data(); } + void arrayValueRef(); + void arrayValueRefLargeKey(); void arrayInsertRemove_data() { basics_data(); } void arrayInsertRemove(); void arrayInsertTagged_data() { basics_data(); } @@ -79,16 +51,25 @@ private slots: void arrayStringElements(); void arraySelfAssign_data() { basics_data(); } void arraySelfAssign(); + void arrayNested(); void mapDefaultInitialization(); void mapEmptyInitializerList(); void mapEmptyDetach(); void mapNonEmptyDetach(); void mapSimpleInitializerList(); + void mapFromArrayLargeIntKey_data() { basics_data(); } + void mapFromArrayLargeIntKey(); + void mapFromArrayNegativeIntKey_data() { basics_data(); } + void mapFromArrayNegativeIntKey(); + void mapFromArrayStringKey_data() { basics_data(); } + void mapFromArrayStringKey(); void mapMutation(); void mapMutateWithCopies(); void mapStringValues(); void mapStringKeys(); + void mapValueRef_data() { basics_data(); } + void mapValueRef(); void mapInsertRemove_data() { basics_data(); } void mapInsertRemove(); void mapInsertTagged_data() { basics_data(); } @@ -97,8 +78,12 @@ private slots: void mapSelfAssign(); void mapComplexKeys_data() { basics_data(); } void mapComplexKeys(); + void mapNested(); + void sorting_data(); void sorting(); + void comparisonMap_data(); + void comparisonMap(); void toCbor_data(); void toCbor(); @@ -121,6 +106,19 @@ private slots: void toDiagnosticNotation_data(); void toDiagnosticNotation(); + void cborValueRef_data(); + void cborValueRef(); + void cborValueConstRef_data() { cborValueRef_data(); } + void cborValueConstRef(); + void cborValueRefMutatingArray_data() { cborValueRef_data(); } + void cborValueRefMutatingArray(); + void cborValueRefMutatingMapIntKey_data() { cborValueRef_data(); } + void cborValueRefMutatingMapIntKey(); + void cborValueRefMutatingMapLatin1StringKey_data() { cborValueRef_data(); } + void cborValueRefMutatingMapLatin1StringKey(); + void cborValueRefMutatingMapStringKey_data() { cborValueRef_data(); } + void cborValueRefMutatingMapStringKey(); + void datastreamSerialization_data(); void datastreamSerialization(); void streamVariantSerialization(); @@ -301,6 +299,7 @@ static void basicTypeCheck(QCborValue::Type type, const QCborValue &v, const QVa QCOMPARE(v.isDouble(), type == QCborValue::Double); QCOMPARE(v.isDateTime(), type == QCborValue::DateTime); QCOMPARE(v.isUrl(), type == QCborValue::Url); + QCOMPARE(v.isRegularExpression(), type == QCborValue::RegularExpression); QCOMPARE(v.isUuid(), type == QCborValue::Uuid); QCOMPARE(v.isInvalid(), type == QCborValue::Invalid); QCOMPARE(v.isContainer(), type == QCborValue::Array || type == QCborValue::Map); @@ -398,7 +397,7 @@ void tst_QCborValue::extendedTypes_data() QTest::addColumn<QCborValue>("correctedTaggedValue"); QCborValue v(QCborValue::Invalid); QDateTime dt = QDateTime::currentDateTimeUtc(); - QDateTime dtTzOffset(dt.date(), dt.time(), Qt::OffsetFromUTC, dt.offsetFromUtc()); + QDateTime dtTzOffset(dt.date(), dt.time(), QTimeZone::fromSecondsAheadOfUtc(dt.offsetFromUtc())); QUuid uuid = QUuid::createUuid(); // non-correcting extended types (tagged value remains unchanged) @@ -422,7 +421,7 @@ void tst_QCborValue::extendedTypes_data() << QCborKnownTags::Uuid << QCborValue(uuid.toRfc4122()) << v; // correcting extended types - QDateTime dtNoMsecs = dt.fromSecsSinceEpoch(dt.toSecsSinceEpoch(), Qt::UTC); + QDateTime dtNoMsecs = dt.fromSecsSinceEpoch(dt.toSecsSinceEpoch(), QTimeZone::UTC); QUrl url("https://example.com/\xc2\xa9 "); QTest::newRow("UnixTime_t:Integer") << QCborValue(dtNoMsecs) << QCborKnownTags::UnixTime_t << QCborValue(dtNoMsecs.toSecsSinceEpoch()) @@ -433,10 +432,11 @@ void tst_QCborValue::extendedTypes_data() QTest::newRow("DateTime::JustDate") << QCborValue(QDateTime({2018, 1, 1}, {})) << QCborKnownTags::DateTimeString << QCborValue("2018-01-01") << QCborValue("2018-01-01T00:00:00.000"); - QTest::newRow("DateTime::TzOffset") << QCborValue(QDateTime({2018, 1, 1}, {9, 0, 0}, Qt::UTC)) - << QCborKnownTags::DateTimeString - << QCborValue("2018-01-01T09:00:00.000+00:00") - << QCborValue("2018-01-01T09:00:00.000Z"); + QTest::newRow("DateTime::TzOffset") + << QCborValue(QDateTime({2018, 1, 1}, {9, 0}, QTimeZone::UTC)) + << QCborKnownTags::DateTimeString + << QCborValue("2018-01-01T09:00:00.000+00:00") + << QCborValue("2018-01-01T09:00:00.000Z"); QTest::newRow("Url:NotNormalized") << QCborValue(url) << QCborKnownTags::Url << QCborValue("HTTPS://EXAMPLE.COM/%c2%a9%20") << QCborValue(url.toString()); @@ -451,6 +451,35 @@ void tst_QCborValue::extendedTypes_data() << QCborValue(uuid.toRfc4122() + "\1\2\3\4") << QCborValue(uuid.toRfc4122()); } +void tst_QCborValue::compareCompiles() +{ + // homogeneous types + QTestPrivate::testAllComparisonOperatorsCompile<QCborValue>(); + QTestPrivate::testAllComparisonOperatorsCompile<QCborValueRef>(); + QTestPrivate::testAllComparisonOperatorsCompile<QCborValueConstRef>(); + QTestPrivate::testAllComparisonOperatorsCompile<QCborArray>(); + QTestPrivate::testAllComparisonOperatorsCompile<QCborArray::Iterator>(); + QTestPrivate::testAllComparisonOperatorsCompile<QCborArray::ConstIterator>(); + QTestPrivate::testAllComparisonOperatorsCompile<QCborMap>(); + QTestPrivate::testAllComparisonOperatorsCompile<QCborMap::Iterator>(); + QTestPrivate::testAllComparisonOperatorsCompile<QCborMap::ConstIterator>(); + + // QCborValue, Ref and ConstRef + QTestPrivate::testAllComparisonOperatorsCompile<QCborValueRef, QCborValueConstRef>(); + QTestPrivate::testAllComparisonOperatorsCompile<QCborValueConstRef, QCborValue>(); + QTestPrivate::testAllComparisonOperatorsCompile<QCborValueRef, QCborValue>(); + + // QCbor{Array,Map} <=> QCborValue{,Ref,ConstRef} + QTestPrivate::testAllComparisonOperatorsCompile<QCborArray, QCborValue>(); + QTestPrivate::testAllComparisonOperatorsCompile<QCborArray, QCborValueRef>(); + QTestPrivate::testAllComparisonOperatorsCompile<QCborArray, QCborValueConstRef>(); + QTestPrivate::testAllComparisonOperatorsCompile<QCborMap, QCborValue>(); + QTestPrivate::testAllComparisonOperatorsCompile<QCborMap, QCborValueRef>(); + QTestPrivate::testAllComparisonOperatorsCompile<QCborMap, QCborValueConstRef>(); + QTestPrivate::testAllComparisonOperatorsCompile<QCborArray::Iterator, + QCborArray::ConstIterator>(); +} + void tst_QCborValue::extendedTypes() { QFETCH(QCborValue, extended); @@ -478,9 +507,13 @@ void tst_QCborValue::copyCompare() QT_WARNING_PUSH QT_WARNING_DISABLE_CLANG("-Wself-move") +#if defined(Q_CC_GNU_ONLY) && Q_CC_GNU >= 1301 +QT_WARNING_DISABLE_GCC("-Wself-move") +#endif // self-moving v = std::move(v); QCOMPARE(v, other); // make sure it's still valid + QT_TEST_ALL_COMPARISON_OPS(v, other, Qt::strong_ordering::equal); QT_WARNING_POP // moving @@ -492,24 +525,15 @@ QT_WARNING_POP other = v; v = other; - QCOMPARE(v.compare(other), 0); - QCOMPARE(v, other); - QVERIFY(!(v != other)); - QVERIFY(!(v < other)); -#if 0 && __has_include(<compare>) - QVERIFY(v <= other); - QVERIFY(v >= other); - QVERIFY(!(v > other)); -#endif + QT_TEST_ALL_COMPARISON_OPS(v, other, Qt::strong_ordering::equal); if (v.isUndefined()) other = nullptr; else other = {}; QVERIFY(v.type() != other.type()); - QVERIFY(!(v == other)); - QVERIFY(v != other); + QT_TEST_EQUALITY_OPS(v, other, false); // they're different types, so they can't compare equal QVERIFY(v.compare(other) != 0); @@ -539,9 +563,8 @@ void tst_QCborValue::arrayDefaultInitialization() QVERIFY(a.at(0).isUndefined()); QCOMPARE(a.constBegin(), a.constEnd()); - QVERIFY(a == a); - QVERIFY(a == QCborArray()); - QVERIFY(QCborArray() == a); + QT_TEST_EQUALITY_OPS(a, a, true); + QT_TEST_EQUALITY_OPS(a, QCborArray(), true); QCborValue v(a); QVERIFY(v.isArray()); @@ -550,7 +573,7 @@ void tst_QCborValue::arrayDefaultInitialization() QCborArray a2 = v.toArray(); QVERIFY(a2.isEmpty()); - QCOMPARE(a2, a); + QT_TEST_EQUALITY_OPS(a2, a, true); auto front = v[0]; QVERIFY(front.isUndefined()); front = 1; @@ -590,9 +613,8 @@ void tst_QCborValue::mapDefaultInitialization() QVERIFY(m.value("Hello").isUndefined()); #endif - QVERIFY(m == m); - QVERIFY(m == QCborMap{}); - QVERIFY(QCborMap{} == m); + QT_TEST_EQUALITY_OPS(m, m, true); + QT_TEST_EQUALITY_OPS(m, QCborMap{}, true); const QCborValue v(m); QVERIFY(v.isMap()); @@ -605,7 +627,7 @@ void tst_QCborValue::mapDefaultInitialization() QCborMap m2 = v.toMap(); QVERIFY(m2.isEmpty()); QCOMPARE(m2.size(), 0); - QCOMPARE(m2, m); + QT_TEST_EQUALITY_OPS(m2, m, true); } void tst_QCborValue::arrayEmptyInitializerList() @@ -613,9 +635,8 @@ void tst_QCborValue::arrayEmptyInitializerList() QCborArray a{}; QVERIFY(a.isEmpty()); QCOMPARE(a.size(), 0); - QVERIFY(a == a); - QVERIFY(a == QCborArray()); - QVERIFY(QCborArray() == a); + QT_TEST_EQUALITY_OPS(a, a, true); + QT_TEST_EQUALITY_OPS(a, QCborArray(), true); } void tst_QCborValue::mapEmptyInitializerList() @@ -623,9 +644,8 @@ void tst_QCborValue::mapEmptyInitializerList() QCborMap m{}; QVERIFY(m.isEmpty()); QCOMPARE(m.size(), 0); - QVERIFY(m == m); - QVERIFY(m == QCborMap{}); - QVERIFY(QCborMap{} == m); + QT_TEST_EQUALITY_OPS(m, m, true); + QT_TEST_EQUALITY_OPS(QCborMap{}, m, true); } void tst_QCborValue::arrayEmptyDetach() @@ -635,9 +655,8 @@ void tst_QCborValue::arrayEmptyDetach() QVERIFY(a.isEmpty()); QCOMPARE(a.size(), 0); - QVERIFY(a == a); - QVERIFY(a == QCborArray()); - QVERIFY(QCborArray() == a); + QT_TEST_EQUALITY_OPS(a, a, true); + QT_TEST_EQUALITY_OPS(a, QCborArray(), true); QCborValue v(a); QVERIFY(v.isArray()); @@ -656,9 +675,8 @@ void tst_QCborValue::mapEmptyDetach() QVERIFY(m.isEmpty()); QCOMPARE(m.size(), 0); - QVERIFY(m == m); - QVERIFY(m == QCborMap{}); - QVERIFY(QCborMap{} == m); + QT_TEST_EQUALITY_OPS(m, m, true); + QT_TEST_EQUALITY_OPS(QCborMap{}, m, true); QCborValue v(m); QVERIFY(v.isMap()); @@ -667,7 +685,7 @@ void tst_QCborValue::mapEmptyDetach() QCborMap m2 = v.toMap(); QVERIFY(m2.isEmpty()); - QCOMPARE(m2, m); + QT_TEST_EQUALITY_OPS(m2, m, true); } void tst_QCborValue::arrayNonEmptyDetach() @@ -728,6 +746,13 @@ void tst_QCborValue::mapNonEmptyDetach() { QCborMap copy(m); auto it = m.find(QLatin1String("3")); QVERIFY(it == m.end()); } { QCborMap copy(m); auto it = m.find(QString("3")); QVERIFY(it == m.end()); } { QCborMap copy(m); auto it = m.find(QCborValue(3)); QVERIFY(it == m.end()); } + + QT_TEST_EQUALITY_OPS(m.constBegin(), m.constEnd(), false); + QT_TEST_EQUALITY_OPS(m.begin(), m.end(), false); + QT_TEST_EQUALITY_OPS(m.constFind(3), m.constEnd(), true); + QT_TEST_EQUALITY_OPS(m.find(3), m.end(), true); + QT_TEST_EQUALITY_OPS(m.find(3), m.constEnd(), true); + QT_TEST_EQUALITY_OPS(m.constFind(3), m.end(), true); } void tst_QCborValue::arrayInitializerList() @@ -743,10 +768,9 @@ void tst_QCborValue::arrayInitializerList() QCOMPARE(a.at(5), QCborValue(QCborValue::Undefined)); QCOMPARE(a.at(6), QCborValue(1.0)); - QVERIFY(a == a); - QVERIFY(a != QCborArray{}); - QVERIFY(QCborArray{} != a); - QVERIFY(a == QCborArray({0, -1, false, true, nullptr, {}, 1.0})); + QT_TEST_EQUALITY_OPS(a, a, true); + QT_TEST_EQUALITY_OPS(a, QCborArray{}, false); + QT_TEST_EQUALITY_OPS(a, QCborArray({0, -1, false, true, nullptr, {}, 1.0}), true); QCborValue v = a; QCOMPARE(v[0], QCborValue(0)); @@ -775,12 +799,17 @@ void tst_QCborValue::arrayInitializerList() // iterators auto it = a.constBegin(); auto end = a.constEnd(); + QT_TEST_ALL_COMPARISON_OPS(it, end, Qt::strong_ordering::less); QCOMPARE(end - it, 7); QCOMPARE(it + 7, end); + QT_TEST_EQUALITY_OPS(it + 7, end, true); QVERIFY(it->isInteger()); QCOMPARE(*it, QCborValue(0)); QCOMPARE(it[1], QCborValue(-1)); QCOMPARE(*(it + 2), QCborValue(false)); + QT_TEST_EQUALITY_OPS(*it, QCborValue(0), true); + QT_TEST_EQUALITY_OPS(it[1], QCborValue(-1), true); + QT_TEST_EQUALITY_OPS(*(it + 2), QCborValue(false), true); it += 3; QCOMPARE(*it, QCborValue(true)); ++it; @@ -791,10 +820,28 @@ void tst_QCborValue::arrayInitializerList() QCOMPARE(*end, QCborValue(1.0)); end--; QCOMPARE(it, end); + QT_TEST_EQUALITY_OPS(it, end, true); + QT_TEST_EQUALITY_OPS(it, QCborArray::ConstIterator(), false); + QT_TEST_EQUALITY_OPS(QCborArray::ConstIterator(), end, false); + QT_TEST_EQUALITY_OPS(QCborArray::ConstIterator(), QCborArray::ConstIterator(), true); + QT_TEST_EQUALITY_OPS(QCborArray::ConstIterator(), QCborArray::Iterator(), true); + + { + auto it = a.begin(); + auto it1 = a.constBegin(); + auto end = a.end(); + QT_TEST_ALL_COMPARISON_OPS(it, end, Qt::strong_ordering::less); + QT_TEST_ALL_COMPARISON_OPS(it1, end, Qt::strong_ordering::less); + QT_TEST_EQUALITY_OPS(it + 7, end, true); + QT_TEST_EQUALITY_OPS(it1 + 7, end, true); + QT_TEST_EQUALITY_OPS(it, QCborArray::Iterator(), false); + QT_TEST_EQUALITY_OPS(QCborArray::Iterator(), end, false); + QT_TEST_EQUALITY_OPS(QCborArray::Iterator(), QCborArray::ConstIterator(), true); + } // range for int i = 0; - for (const QCborValue v : qAsConst(a)) { + for (const QCborValue v : std::as_const(a)) { QVERIFY(!v.isInvalid()); QCOMPARE(v.isUndefined(), i == 5); // 6th element is Undefined ++i; @@ -806,10 +853,9 @@ void tst_QCborValue::mapSimpleInitializerList() { QCborMap m{{0, 0}, {1, 0}, {2, "Hello"}, {"Hello", 2}, {3, QLatin1String("World")}, {QLatin1String("World"), 3}}; QCOMPARE(m.size(), 6); - QVERIFY(m == m); - QVERIFY(m != QCborMap{}); - QVERIFY(QCborMap{} != m); - QVERIFY(m == QCborMap({{0, 0}, {1, 0}, {2, "Hello"}, {"Hello", 2}, {3, QLatin1String("World")}, {QLatin1String("World"), 3}})); + QT_TEST_EQUALITY_OPS(m, m, true); + QT_TEST_EQUALITY_OPS(m, QCborMap{}, false); + QT_TEST_EQUALITY_OPS(m, QCborMap({{0, 0}, {1, 0}, {2, "Hello"}, {"Hello", 2}, {3, QLatin1String("World")}, {QLatin1String("World"), 3}}), true); QCborValue vmap = m; { @@ -894,7 +940,7 @@ void tst_QCborValue::mapSimpleInitializerList() // range for int i = 0; - for (auto pair : qAsConst(m)) { + for (auto pair : std::as_const(m)) { QVERIFY(!pair.first.isUndefined()); QVERIFY(!pair.second.isUndefined()); ++i; @@ -902,6 +948,55 @@ void tst_QCborValue::mapSimpleInitializerList() QCOMPARE(i, m.size()); } +template <typename T> static void mapFromArray_template(T key) +{ + QFETCH(QCborValue::Type, type); + QFETCH(QCborValue, v); + if (v.isMap()) + return; // already a map, nothing will happen + + // verify forced conversions work + // (our only Array row is an empty array, so it doesn't produce the warning) + QCborValue v2 = v; + QVERIFY(v2[key].isUndefined()); + QCOMPARE(v2.type(), QCborValue::Map); + QCOMPARE(v.type(), type); + QCborMap m = v2.toMap(); + QCOMPARE(m.size(), 1); + QCOMPARE(m.begin().key(), QCborValue(key)); + + // non-empty array conversions + QCborValue va = QCborArray{v}; + v2 = va; + QTest::ignoreMessage(QtWarningMsg, "Using CBOR array as map forced conversion"); + QVERIFY(v2[key].isUndefined()); + QCOMPARE(v2.type(), QCborValue::Map); + QCOMPARE(va.type(), QCborValue::Array); + m = v2.toMap(); + QCOMPARE(m.size(), 2); + auto it = m.constBegin(); + QCOMPARE(it.key(), QCborValue(0)); + QCOMPARE(it.value(), v); + ++it; + QCOMPARE(it.key(), QCborValue(key)); + QCOMPARE(it.value(), QCborValue()); +} + +void tst_QCborValue::mapFromArrayLargeIntKey() +{ + mapFromArray_template(Q_INT64_C(1) << 20); +} + +void tst_QCborValue::mapFromArrayNegativeIntKey() +{ + mapFromArray_template(-1); +} + +void tst_QCborValue::mapFromArrayStringKey() +{ + mapFromArray_template(QLatin1String("Hello")); +} + void tst_QCborValue::arrayMutation() { QCborArray a{42}; @@ -920,8 +1015,8 @@ void tst_QCborValue::arrayMutation() QVERIFY(v == a.at(0)); } - QVERIFY(a == a); - QVERIFY(a == QCborArray{true}); + QT_TEST_EQUALITY_OPS(a, a, true); + QT_TEST_EQUALITY_OPS(a, QCborArray{true}, true); QCborArray a2 = a; a.append(nullptr); @@ -973,14 +1068,6 @@ void tst_QCborValue::arrayMutation() QVERIFY(val.isArray()); QCOMPARE(val.toArray().size(), 4); QCOMPARE(val[3], 42); - - // Coerce to map on string key: - const QLatin1String any("any"); - val[any] = any; - QVERIFY(val.isMap()); - QCOMPARE(val.toMap().size(), 5); - QVERIFY(val[2].isArray()); - QCOMPARE(val[2].toArray().size(), 5); } void tst_QCborValue::arrayMutateWithCopies() @@ -1051,27 +1138,27 @@ void tst_QCborValue::mapMutation() const QString strValue = QStringLiteral("value"); v = strValue; QVERIFY(v.isString()); - QCOMPARE(v, QCborValue(strValue)); - QCOMPARE(m, QCborMap({{42, strValue}})); + QT_TEST_EQUALITY_OPS(v, QCborValue(strValue), true); + QT_TEST_EQUALITY_OPS(m, QCborMap({{42, strValue}}), true); // HasByteData -> HasByteData const QLatin1String otherStrValue("othervalue"); v = otherStrValue; QVERIFY(v.isString()); - QCOMPARE(v, QCborValue(otherStrValue)); - QCOMPARE(m, QCborMap({{42, otherStrValue}})); + QT_TEST_EQUALITY_OPS(v, QCborValue(otherStrValue), true); + QT_TEST_EQUALITY_OPS(m, QCborMap({{42, otherStrValue}}), true); // HasByteData -> simple v = 42; QVERIFY(v.isInteger()); - QCOMPARE(v, QCborValue(42)); - QCOMPARE(m, QCborMap({{42, 42}})); + QT_TEST_EQUALITY_OPS(v, QCborValue(42), true); + QT_TEST_EQUALITY_OPS(m, QCborMap({{42, 42}}), true); // simple -> container v = QCborArray{1, 2, 3}; QVERIFY(v.isArray()); - QCOMPARE(v, QCborArray({1, 2, 3})); - QCOMPARE(m, QCborMap({{42, QCborArray{1, 2, 3}}})); + QT_TEST_EQUALITY_OPS(v, QCborArray({1, 2, 3}), true); + QT_TEST_EQUALITY_OPS(m, QCborMap({{42, QCborArray{1, 2, 3}}}), true); // container -> simple v = true; @@ -1079,8 +1166,7 @@ void tst_QCborValue::mapMutation() QVERIFY(v.isTrue()); QCOMPARE(m, QCborMap({{42, true}})); QVERIFY(m.begin()->isTrue()); - QVERIFY(m.begin().value() == v); - QVERIFY(v == m.begin().value()); + QT_TEST_EQUALITY_OPS(m.begin().value(), v, true); } QVERIFY(m == QCborMap({{42, true}})); @@ -1102,18 +1188,27 @@ void tst_QCborValue::mapMutation() m2 = m; auto it = m.begin(); // detaches again auto end = m.end(); + auto it1 = m.constBegin(); // detaches again + auto end2 = m.constEnd(); QCOMPARE(end - it, 2); + QT_TEST_ALL_COMPARISON_OPS(it, it + 1, Qt::strong_ordering::less); + QT_TEST_ALL_COMPARISON_OPS(it, it1 + 1, Qt::strong_ordering::less); + QT_TEST_ALL_COMPARISON_OPS(it, it - 1, Qt::strong_ordering::greater); + QT_TEST_ALL_COMPARISON_OPS(it, it1 - 1, Qt::strong_ordering::greater); + QT_TEST_EQUALITY_OPS(it, it1, true); QCOMPARE(it + 2, end); - QCOMPARE(it.key(), QCborValue(42)); - QCOMPARE(it.value(), QCborValue(2.5)); - QCOMPARE((++it).value(), QCborValue(nullptr)); - QCOMPARE(it.key(), QCborValue(nullptr)); - QVERIFY(m2 == m); - QVERIFY(m == m2); + QT_TEST_EQUALITY_OPS(it + 2, end, true); + QT_TEST_EQUALITY_OPS(it + 2, end2, true); + QT_TEST_EQUALITY_OPS(it1 + 2, end2, true); + QT_TEST_EQUALITY_OPS(it.key(), QCborValue(42), true); + QT_TEST_EQUALITY_OPS(it.value(), QCborValue(2.5), true); + QT_TEST_EQUALITY_OPS((++it).value(), QCborValue(nullptr), true); + QT_TEST_EQUALITY_OPS(it.key(), QCborValue(nullptr), true); + QT_TEST_EQUALITY_OPS(m2, m, true); it.value() = -1; - QCOMPARE(it.key(), QCborValue(nullptr)); - QCOMPARE(it.value(), QCborValue(-1)); + QT_TEST_EQUALITY_OPS(it.key(), QCborValue(nullptr), true); + QT_TEST_EQUALITY_OPS(it.value(), QCborValue(-1), true); QCOMPARE((m.end() - 1)->toInteger(), -1); QVERIFY((m2.end() - 1)->isNull()); QCOMPARE(++it, end); @@ -1160,11 +1255,13 @@ void tst_QCborValue::mapMutateWithCopies() // see QTBUG-83366 QCborMap map; map[QLatin1String("value")] = "TEST"; + QT_TEST_EQUALITY_OPS(map[QLatin1String("value")], "TEST", true); QCOMPARE(map.size(), 1); QCOMPARE(map.value("value"), "TEST"); QCborValue v = map.value("value"); map[QLatin1String("prop2")] = v; + QT_TEST_EQUALITY_OPS(map[QLatin1String("prop2")], v, true); QCOMPARE(map.size(), 2); QCOMPARE(map.value("value"), "TEST"); QCOMPARE(map.value("prop2"), "TEST"); @@ -1178,6 +1275,7 @@ void tst_QCborValue::mapMutateWithCopies() // same as previous, but this is a QJsonValueRef QCborValueRef rv = map[QLatin1String("prop2")]; rv = map[QLatin1String("value")]; + QT_TEST_EQUALITY_OPS(map[QLatin1String("value")], rv, true); QCOMPARE(map.size(), 2); QCOMPARE(map.value("value"), "TEST"); QCOMPARE(map.value("prop2"), "TEST"); @@ -1192,6 +1290,7 @@ void tst_QCborValue::mapMutateWithCopies() // after we create the source QCborValueRef QCborValueRef rv = map[QLatin1String("value")]; map[QLatin1String("prop2")] = rv; + QT_TEST_EQUALITY_OPS(map[QLatin1String("prop2")], rv, true); QCOMPARE(map.size(), 2); QCOMPARE(map.value("value"), "TEST"); QCOMPARE(map.value("prop2"), "TEST"); @@ -1218,11 +1317,102 @@ void tst_QCborValue::arrayPrepend() QCborArray a; a.prepend(0); a.prepend(nullptr); - QCOMPARE(a.at(1), QCborValue(0)); - QCOMPARE(a.at(0), QCborValue(nullptr)); + QT_TEST_EQUALITY_OPS(a.at(1), QCborValue(0), true); + QT_TEST_EQUALITY_OPS(a.at(0), QCborValue(nullptr), true); QCOMPARE(a.size(), 2); } +void tst_QCborValue::arrayValueRef() +{ + QFETCH(QCborValue, v); + QCborArray a = { v }; + + // methods that return QCborValueRef + QT_TEST_EQUALITY_OPS(a.first(), v, true); + QT_TEST_EQUALITY_OPS(a.last(), v, true); + QT_TEST_EQUALITY_OPS(a[0], v, true); + QVERIFY(v == a.first()); + QVERIFY(v == a.last()); + QVERIFY(v == a[0]); + QT_TEST_EQUALITY_OPS(a.first(), v, true); + QT_TEST_EQUALITY_OPS(a.last(), v, true); + + auto iteratorCheck = [&v](auto it) { + QT_TEST_EQUALITY_OPS(*it, v, true); + QCOMPARE(it->type(), v.type()); // just to test operator-> + QT_TEST_EQUALITY_OPS(it[0], v, true); + }; + + iteratorCheck(a.begin()); + if (QTest::currentTestFailed()) + return; + iteratorCheck(a.constBegin()); +} + +void tst_QCborValue::arrayValueRefLargeKey() +{ + // make sure the access via QCborValue & QCborValueRef don't convert this + // array to a map + constexpr qsizetype LargeKey = 0x10000; + QCborArray a; + a[LargeKey + 1] = 123; + + QCborValue v(a); + QT_TEST_EQUALITY_OPS(std::as_const(v)[LargeKey], QCborValue(), true); + QCOMPARE(std::as_const(v)[LargeKey + 1], 123); + QT_TEST_EQUALITY_OPS(v[LargeKey], QCborValue(), true); + QCOMPARE(v[LargeKey + 1], 123); + QCOMPARE(v.type(), QCborValue::Array); + + QCborArray outer = { QCborValue(a) }; + QCborValueRef ref = outer[0]; + QT_TEST_EQUALITY_OPS(std::as_const(ref)[LargeKey], QCborValue(), true); + QCOMPARE(std::as_const(ref)[LargeKey + 1], 123); + QT_TEST_EQUALITY_OPS(ref[LargeKey], QCborValue(), true); + QCOMPARE(ref[LargeKey + 1], 123); + QCOMPARE(ref.type(), QCborValue::Array); +} + +void tst_QCborValue::mapValueRef() +{ + QFETCH(QCborValue, v); + QLatin1String stringKey("other string"); + qint64 intKey = 47; + Q_ASSERT(v != stringKey); + Q_ASSERT(v != intKey); + + QCborMap m = { { v, v }, { stringKey, v }, { intKey, v } }; + QCOMPARE(m.size(), 3); + + // methods that return QCborValueRef + QT_TEST_EQUALITY_OPS(m[intKey], v, true); + QT_TEST_EQUALITY_OPS(m[stringKey], v, true); + QT_TEST_EQUALITY_OPS(m[v], v, true); + QVERIFY(v == m[intKey]); + QVERIFY(v == m[stringKey]); + QVERIFY(v == m[v]); + + auto iteratorCheck = [=](auto it) { + QCOMPARE((*it).second, v); + QCOMPARE(it[0].second, v); + QCOMPARE(it[1].second, v); + QCOMPARE(it[2].second, v); + QCOMPARE(it.value(), v); + QCOMPARE(it->type(), v.type()); // just to test operator-> + + // compare keys too + QCOMPARE((*it).first, v); + QCOMPARE(it.key(), v); + QCOMPARE((it + 1).key(), stringKey); + QCOMPARE((it + 2).key(), intKey); + }; + + iteratorCheck(m.begin()); + if (QTest::currentTestFailed()) + return; + iteratorCheck(m.constBegin()); +} + void tst_QCborValue::arrayInsertRemove() { QFETCH(QCborValue, v); @@ -1230,28 +1420,28 @@ void tst_QCborValue::arrayInsertRemove() a.append(42); a.append(v); a.insert(1, QCborValue(nullptr)); - QCOMPARE(a.at(0), QCborValue(42)); - QCOMPARE(a.at(1), QCborValue(nullptr)); - QCOMPARE(a.at(2), v); + QT_TEST_EQUALITY_OPS(a.at(0), QCborValue(42), true); + QT_TEST_EQUALITY_OPS(a.at(1), QCborValue(nullptr), true); + QT_TEST_EQUALITY_OPS(a.at(2), v, true); // remove 42 a.removeAt(0); QCOMPARE(a.size(), 2); - QCOMPARE(a.at(0), QCborValue(nullptr)); - QCOMPARE(a.at(1), v); + QT_TEST_EQUALITY_OPS(a.at(0), QCborValue(nullptr), true); + QT_TEST_EQUALITY_OPS(a.at(1), v, true); auto it = a.begin(); it = a.erase(it); // removes nullptr QCOMPARE(a.size(), 1); - QCOMPARE(a.at(0), v); + QT_TEST_EQUALITY_OPS(a.at(0), v, true); it = a.erase(it); QVERIFY(a.isEmpty()); - QCOMPARE(it, a.end()); + QT_TEST_EQUALITY_OPS(it, a.end(), true); // reinsert the element so we can take it a.append(v); - QCOMPARE(a.takeAt(0), v); + QT_TEST_EQUALITY_OPS(a.takeAt(0), v, true); QVERIFY(a.isEmpty()); } @@ -1260,14 +1450,15 @@ void tst_QCborValue::arrayStringElements() QCborArray a{"Hello"}; a.append(QByteArray("Hello")); a.append(QLatin1String("World")); - QVERIFY(a == a); - QVERIFY(a == QCborArray({QLatin1String("Hello"), - QByteArray("Hello"), QStringLiteral("World")})); + + QT_TEST_EQUALITY_OPS(a, a, true); + QT_TEST_EQUALITY_OPS(a, QCborArray({QLatin1String("Hello"), + QByteArray("Hello"), QStringLiteral("World")}), true); QCborValueRef r1 = a[0]; QCOMPARE(r1.toString(), "Hello"); QCOMPARE(r1.operator QCborValue(), QCborValue("Hello")); - QVERIFY(r1 == QCborValue("Hello")); + QT_TEST_EQUALITY_OPS(r1, QCborValue("Hello"), true); QCborValue v2 = a.at(1); QCOMPARE(v2.toByteArray(), QByteArray("Hello")); @@ -1276,11 +1467,11 @@ void tst_QCborValue::arrayStringElements() // v2 must continue to be valid after the entry getting removed a.removeAt(1); QCOMPARE(v2.toByteArray(), QByteArray("Hello")); - QCOMPARE(v2, QCborValue(QByteArray("Hello"))); + QT_TEST_EQUALITY_OPS(v2, QCborValue(QByteArray("Hello")), true); v2 = a.at(1); QCOMPARE(v2.toString(), "World"); - QCOMPARE(v2, QCborValue("World")); + QT_TEST_EQUALITY_OPS(v2, QCborValue("World"), true); QCOMPARE(a.takeAt(1).toString(), "World"); QCOMPARE(a.takeAt(0).toString(), "Hello"); @@ -1292,12 +1483,12 @@ void tst_QCborValue::mapStringValues() QCborMap m{{0, "Hello"}}; m.insert({1, QByteArray("Hello")}); m.insert({2, QLatin1String("World")}); - QVERIFY(m == m); + QT_TEST_EQUALITY_OPS(m, m, true); QCborValueRef r1 = m[0]; QCOMPARE(r1.toString(), "Hello"); QCOMPARE(r1.operator QCborValue(), QCborValue("Hello")); - QVERIFY(r1 == QCborValue("Hello")); + QT_TEST_EQUALITY_OPS(r1, QCborValue("Hello"), true); QCborValue v2 = m.value(1); QCOMPARE(v2.toByteArray(), QByteArray("Hello")); @@ -1306,7 +1497,7 @@ void tst_QCborValue::mapStringValues() // v2 must continue to be valid after the entry getting removed m.erase(m.constFind(1)); QCOMPARE(v2.toByteArray(), QByteArray("Hello")); - QCOMPARE(v2, QCborValue(QByteArray("Hello"))); + QT_TEST_EQUALITY_OPS(v2, QCborValue(QByteArray("Hello")), true); v2 = (m.begin() + 1).value(); QCOMPARE(v2.toString(), "World"); @@ -1324,14 +1515,12 @@ void tst_QCborValue::mapStringKeys() QCOMPARE(m.value(QLatin1String("World")), QCborValue(2)); QCborMap m2 = m; - QVERIFY(m2 == m); - QVERIFY(m == m2); + QT_TEST_EQUALITY_OPS(m2, m, true); m.insert({QByteArray("foo"), "bar"}); QCOMPARE(m.size(), 3); QCOMPARE(m2.size(), 2); - QVERIFY(m2 != m); - QVERIFY(m != m2); + QT_TEST_EQUALITY_OPS(m2, m, false); QVERIFY(m2.value(QCborValue(QByteArray("foo"))).isUndefined()); QVERIFY(m.value(QCborValue(QLatin1String("foo"))).isUndefined()); @@ -1349,8 +1538,7 @@ void tst_QCborValue::mapInsertRemove() m.insert(2, v); QVERIFY(m.contains(2)); - QVERIFY(m[2] == v); - QVERIFY(v == m[2]); + QT_TEST_EQUALITY_OPS(m[2], v, true); auto it = m.find(2); it = m.erase(it); @@ -1363,10 +1551,8 @@ void tst_QCborValue::mapInsertRemove() r = v; it = m.find(42); - QVERIFY(it.value() == v); - QVERIFY(v == it.value()); - QVERIFY(it.value() == r); - QVERIFY(r == it.value()); + QT_TEST_EQUALITY_OPS(it.value(), v, true); + QT_TEST_EQUALITY_OPS(it.value(), r, true); QCOMPARE(m.extract(it), v); QVERIFY(!m.contains(42)); @@ -1387,12 +1573,12 @@ void tst_QCborValue::arrayInsertTagged() QCborArray a{tagged}; a.insert(1, tagged); QCOMPARE(a.size(), 2); - QCOMPARE(a.at(0), tagged); - QCOMPARE(a.at(1), tagged); - QCOMPARE(a.at(0).taggedValue(), v); - QCOMPARE(a.at(1).taggedValue(), v); - QCOMPARE(a.takeAt(0).taggedValue(), v); - QCOMPARE(a.takeAt(0).taggedValue(), v); + QT_TEST_EQUALITY_OPS(a.at(0), tagged, true); + QT_TEST_EQUALITY_OPS(a.at(1), tagged, true); + QT_TEST_EQUALITY_OPS(a.at(0).taggedValue(), v, true); + QT_TEST_EQUALITY_OPS(a.at(1).taggedValue(), v, true); + QT_TEST_EQUALITY_OPS(a.takeAt(0).taggedValue(), v, true); + QT_TEST_EQUALITY_OPS(a.takeAt(0).taggedValue(), v, true); QVERIFY(a.isEmpty()); } @@ -1406,13 +1592,13 @@ void tst_QCborValue::mapInsertTagged() QCborMap m{{11, tagged}}; m.insert({-21, tagged}); QCOMPARE(m.size(), 2); - QCOMPARE(m.constBegin().value(), tagged); - QCOMPARE(m.value(-21), tagged); - QCOMPARE(m.value(11).taggedValue(), v); - QCOMPARE((m.end() - 1).value().taggedValue(), v); - QCOMPARE(m.extract(m.end() - 1).taggedValue(), v); + QT_TEST_EQUALITY_OPS(m.constBegin().value(), tagged, true); + QT_TEST_EQUALITY_OPS(m.value(-21), tagged, true); + QT_TEST_EQUALITY_OPS(m.value(11).taggedValue(), v, true); + QT_TEST_EQUALITY_OPS((m.end() - 1).value().taggedValue(), v, true); + QT_TEST_EQUALITY_OPS(m.extract(m.end() - 1).taggedValue(), v, true); QVERIFY(!m.contains(-21)); - QCOMPARE(m.take(11).taggedValue(), v); + QT_TEST_EQUALITY_OPS(m.take(11).taggedValue(), v, true); QVERIFY(m.isEmpty()); } @@ -1441,7 +1627,7 @@ void tst_QCborValue::arraySelfAssign() QCOMPARE(a.size(), 2); QCOMPARE(it->toArray().size(), 2); - QCOMPARE(it->toArray().last(), QCborValue(36)); + QT_TEST_EQUALITY_OPS(it->toArray().last(), QCborValue(36), true); } } @@ -1459,12 +1645,12 @@ void tst_QCborValue::mapSelfAssign() QCborValue vm = m; m[1] = vm; // self-assign QCOMPARE(m.size(), 2); - QCOMPARE(m.value(0), v); + QT_TEST_EQUALITY_OPS(m.value(0), v, true); QCborMap m2 = m.value(1).toMap(); // there mustn't be an element with key 1 QCOMPARE(m2.size(), 1); - QCOMPARE(m2.value(0), v); + QT_TEST_EQUALITY_OPS(m2.value(0), v, true); QVERIFY(!m2.contains(1)); } @@ -1476,14 +1662,14 @@ void tst_QCborValue::mapSelfAssign() QCborValueRef rv = m[1]; rv = m; // self-assign (implicit QCborValue creation) QCOMPARE(m.size(), 2); - QCOMPARE(m.value(0), v); + QT_TEST_EQUALITY_OPS(m.value(0), v, true); QCborMap m2 = m.value(1).toMap(); // there must be an element with key 1 QCOMPARE(m2.size(), 2); - QCOMPARE(m2.value(0), v); + QT_TEST_EQUALITY_OPS(m2.value(0), v, true); QVERIFY(m2.contains(1)); - QCOMPARE(m2.value(1), QCborValue()); + QT_TEST_EQUALITY_OPS(m2.value(1), QCborValue(), true); } m = {{0, v}}; @@ -1507,8 +1693,8 @@ void tst_QCborValue::mapSelfAssign() QCOMPARE(m.size(), 2); auto it = m.constEnd() - 1; - QCOMPARE(it.value(), v); - QCOMPARE(it.key(), QCborMap({{0, v}})); + QT_TEST_EQUALITY_OPS(it.value(), v, true); + QT_TEST_EQUALITY_OPS(it.key(), QCborMap({{0, v}}), true); } } @@ -1581,8 +1767,125 @@ void tst_QCborValue::mapComplexKeys() QVERIFY(!m.contains(tagged)); } -void tst_QCborValue::sorting() +void tst_QCborValue::arrayNested() +{ + const QCborArray wrongArray = { false, nullptr, QCborValue() }; + { + QCborArray a1 = { 42, 47 }; + QCborArray a2 = { QCborValue(a1) }; + QCborArray a3 = { 41, 47 }; + QCborArray a4 = { 41, 47, 87 }; + QCOMPARE(a2.size(), 1); + const QCborValue &first = std::as_const(a2).first(); + QVERIFY(first.isArray()); + QCOMPARE(first.toArray(wrongArray).size(), 2); + QCOMPARE(first.toArray(wrongArray).first(), 42); + QCOMPARE(first.toArray(wrongArray).last(), 47); + QT_TEST_ALL_COMPARISON_OPS(a1, a3, Qt::strong_ordering::greater); + QT_TEST_ALL_COMPARISON_OPS(a3, a1, Qt::strong_ordering::less); + QT_TEST_ALL_COMPARISON_OPS(a3, a4, Qt::strong_ordering::less); + QT_TEST_ALL_COMPARISON_OPS(a3, a2, Qt::strong_ordering::greater); + } + { + QCborArray a1 = { 42, 47 }; + QCborArray a2 = { QCborValue(a1) }; + QCborArray a3 = { 41, 47 }; + QCborArray a4 = { 41, 47, 87 }; + QCOMPARE(a2.size(), 1); + QCborValueRef first = a2.first(); + QVERIFY(first.isArray()); + QCOMPARE(first.toArray(wrongArray).size(), 2); + QCOMPARE(first.toArray(wrongArray).first(), 42); + QCOMPARE(first.toArray(wrongArray).last(), 47); + QT_TEST_ALL_COMPARISON_OPS(a1, a3, Qt::strong_ordering::greater); + QT_TEST_ALL_COMPARISON_OPS(a3, a1, Qt::strong_ordering::less); + QT_TEST_ALL_COMPARISON_OPS(a3, a4, Qt::strong_ordering::less); + QT_TEST_ALL_COMPARISON_OPS(a3, a2, Qt::strong_ordering::greater); + } + + { + QCborArray a1; + a1 = { QCborValue(a1) }; // insert it into itself + QCOMPARE(a1.size(), 1); + const QCborValue &first = std::as_const(a1).first(); + QVERIFY(first.isArray()); + QT_TEST_ALL_COMPARISON_OPS(first, QCborArray(), Qt::strong_ordering::equal); + QT_TEST_ALL_COMPARISON_OPS(first.toArray(wrongArray), QCborArray(), + Qt::strong_ordering::equal); + } + { + QCborArray a1; + a1 = { QCborValue(a1) }; // insert it into itself + QCborValueRef first = a1.first(); + QVERIFY(first.isArray()); + QT_TEST_ALL_COMPARISON_OPS(first, QCborArray(), Qt::strong_ordering::equal); + QT_TEST_ALL_COMPARISON_OPS(first.toArray(wrongArray), QCborArray(), + Qt::strong_ordering::equal); + } + { + QCborArray a1; + a1.append(a1); // insert into itself + QCOMPARE(a1.size(), 1); + const QCborValue &first = std::as_const(a1).first(); + QVERIFY(first.isArray()); + QT_TEST_ALL_COMPARISON_OPS(first, QCborArray(), Qt::strong_ordering::equal); + QT_TEST_ALL_COMPARISON_OPS(first.toArray(wrongArray), QCborArray(), + Qt::strong_ordering::equal); + } + { + QCborArray a1; + a1.append(a1); // insert into itself + QCborValueRef first = a1.first(); + QVERIFY(first.isArray()); + QT_TEST_ALL_COMPARISON_OPS(first, QCborArray(), Qt::strong_ordering::equal); + QT_TEST_ALL_COMPARISON_OPS(first.toArray(wrongArray), QCborArray(), + Qt::strong_ordering::equal); + } +} + +void tst_QCborValue::mapNested() { + const QCborMap wrongMap = { { -1, false }, {-2, nullptr }, { -3, QCborValue() } }; + { + QCborMap m1 = { {1, 42}, {2, 47} }; + QCborMap m2 = { { QString(), m1 } }; + QCOMPARE(m2.size(), 1); + const QCborValue &first = m2.constBegin().value(); + QVERIFY(first.isMap()); + QCOMPARE(first.toMap(wrongMap).size(), 2); + QCOMPARE(first.toMap(wrongMap).begin().key(), 1); + QCOMPARE(first.toMap(wrongMap).begin().value(), 42); + } + + { + QCborMap m1; + m1 = { { QString(), QCborValue(m1) } }; // insert it into itself + QCOMPARE(m1.size(), 1); + const QCborValue &first = m1.constBegin().value(); + QVERIFY(first.isMap()); + QCOMPARE(first, QCborMap()); + QCOMPARE(first.toMap(wrongMap), QCborMap()); + } +} + +void tst_QCborValue::sorting_data() +{ + // CBOR data comparisons are done as if we were comparing their canonically + // (deterministic) encoded forms in the byte stream, including the Major + // Type. That has a few surprises noted below: + // 1) because the length of a string precedes it, effectively strings are + // sorted by their UTF-8 length before their contents + // 2) because negative integers are stored in negated form, they sort in + // descending order (i.e. by absolute value) + // 3) negative integers (Major Type 1) sort after all positive integers + // (Major Type 0) + // Effectively, this means integers are sorted as sign+magnitude. + // 4) floating point types (Major Type 7) sort after all integers + + QTest::addColumn<QCborValue>("lhs"); + QTest::addColumn<QCborValue>("rhs"); + QTest::addColumn<Qt::strong_ordering>("expectedOrdering"); + QCborValue vundef, vnull(nullptr); QCborValue vtrue(true), vfalse(false); QCborValue vint1(1), vint2(2); @@ -1591,7 +1894,8 @@ void tst_QCborValue::sorting() QCborValue vs2("Hello"), vs3("World"), vs1("foo"); QCborValue va1(QCborValue::Array), va2(QCborArray{1}), va3(QCborArray{0, 0}); QCborValue vm1(QCborValue::Map), vm2(QCborMap{{1, 0}}), vm3(QCborMap{{0, 0}, {1, 0}}); - QCborValue vdt1(QDateTime::fromMSecsSinceEpoch(0, Qt::UTC)), vdt2(QDateTime::currentDateTimeUtc()); + QCborValue vdt1(QDateTime::fromMSecsSinceEpoch(0, QTimeZone::UTC)); + QCborValue vdt2(QDateTime::currentDateTimeUtc()); QCborValue vtagged1(QCborKnownTags::PositiveBignum, QByteArray()), vtagged2(QCborKnownTags::PositiveBignum, 0.0), // bignums are supposed to have byte arrays... vtagged3(QCborKnownTags::Signature, 0), @@ -1600,67 +1904,262 @@ void tst_QCborValue::sorting() QCborValue vurl1(QUrl("https://example.net")), vurl2(QUrl("https://example.com/")); QCborValue vuuid1{QUuid()}, vuuid2(QUuid::createUuid()); QCborValue vsimple1(QCborSimpleType(1)), vsimple32(QCborSimpleType(32)), vsimple255(QCborSimpleType(255)); - QCborValue vdouble1(1.5), vdouble2(qInf()); + QCborValue vdouble1(1.5), vdouble2(qInf()), vdouble3(qQNaN()); QCborValue vndouble1(-1.5), vndouble2(-qInf()); -#define CHECK_ORDER(v1, v2) \ - QVERIFY(v1 < v2); \ - QVERIFY(!(v2 < v2)) + auto addRow = [](QCborValue lhs, QCborValue rhs, Qt::strong_ordering order) { + QTest::addRow("%s-cmp-%s", qPrintable(lhs.toDiagnosticNotation()), + qPrintable(rhs.toDiagnosticNotation())) + << lhs << rhs << order; + }; + auto addSelfCmp = [](QCborValue v) { + QTest::addRow("self-%s", qPrintable(v.toDiagnosticNotation())) + << v << v << Qt::strong_ordering::equal; + }; + + // self compares + addSelfCmp(vundef); + addSelfCmp(vnull); + addSelfCmp(vfalse); + addSelfCmp(vtrue); + addSelfCmp(vint1); + addSelfCmp(vint2); + addSelfCmp(vneg1); + addSelfCmp(vneg2); + addSelfCmp(vba1); + addSelfCmp(vba2); + addSelfCmp(vba3); + addSelfCmp(vs1); + addSelfCmp(vs2); + addSelfCmp(vs3); + addSelfCmp(va1); + addSelfCmp(va2); + addSelfCmp(va3); + addSelfCmp(vm1); + addSelfCmp(vm2); + addSelfCmp(vm3); + addSelfCmp(vdt1); + addSelfCmp(vdt2); + addSelfCmp(vtagged1); + addSelfCmp(vtagged2); + addSelfCmp(vtagged3); + addSelfCmp(vtagged4); + addSelfCmp(vtagged5); + addSelfCmp(vurl1); + addSelfCmp(vurl2); + addSelfCmp(vuuid1); + addSelfCmp(vuuid2); + addSelfCmp(vsimple1); + addSelfCmp(vsimple32); + addSelfCmp(vsimple255); + addSelfCmp(vdouble1); + addSelfCmp(vdouble2); + addSelfCmp(vdouble3); // surprise: NaNs do compare + addSelfCmp(vndouble1); + addSelfCmp(vndouble2); // intra-type comparisons - CHECK_ORDER(vfalse, vtrue); - CHECK_ORDER(vsimple1, vsimple32); - CHECK_ORDER(vsimple32, vsimple255); - CHECK_ORDER(vint1, vint2); - CHECK_ORDER(vdouble1, vdouble2); - CHECK_ORDER(vndouble1, vndouble2); - // note: shorter length sorts first - CHECK_ORDER(vba1, vba2); - CHECK_ORDER(vba2, vba3); - CHECK_ORDER(vs1, vs2); - CHECK_ORDER(vs2, vs3); - CHECK_ORDER(va1, va2); - CHECK_ORDER(va2, va3); - CHECK_ORDER(vm1, vm2); - CHECK_ORDER(vm2, vm3); - CHECK_ORDER(vdt1, vdt2); - CHECK_ORDER(vtagged1, vtagged2); - CHECK_ORDER(vtagged2, vtagged3); - CHECK_ORDER(vtagged3, vtagged4); - CHECK_ORDER(vtagged4, vtagged5); - CHECK_ORDER(vurl1, vurl2); - CHECK_ORDER(vuuid1, vuuid2); - - // surprise 1: CBOR sorts integrals by absolute value - CHECK_ORDER(vneg1, vneg2); - - // surprise 2: CBOR sorts negatives after positives (sign+magnitude) - CHECK_ORDER(vint2, vneg1); - QVERIFY(vint2.toInteger() > vneg1.toInteger()); - CHECK_ORDER(vdouble2, vndouble1); - QVERIFY(vdouble2.toDouble() > vndouble1.toDouble()); + addRow(vfalse, vtrue, Qt::strong_ordering::less); + addRow(vsimple1, vsimple32, Qt::strong_ordering::less); + addRow(vsimple32, vsimple255, Qt::strong_ordering::less); + addRow(vint1, vint2, Qt::strong_ordering::less); + addRow(vdouble1, vdouble2, Qt::strong_ordering::less); + addRow(vdouble2, vdouble3, Qt::strong_ordering::less); // surprise: NaNs do compare + addRow(vndouble1, vndouble2, Qt::strong_ordering::less); // surprise: -1.5 < -inf + addRow(va1, va2, Qt::strong_ordering::less); + addRow(va2, va3, Qt::strong_ordering::less); + addRow(vm1, vm2, Qt::strong_ordering::less); + addRow(vm2, vm3, Qt::strong_ordering::less); + addRow(vdt1, vdt2, Qt::strong_ordering::less); + addRow(vtagged1, vtagged2, Qt::strong_ordering::less); + addRow(vtagged2, vtagged3, Qt::strong_ordering::less); + addRow(vtagged3, vtagged4, Qt::strong_ordering::less); + addRow(vtagged4, vtagged5, Qt::strong_ordering::less); + addRow(vurl1, vurl2, Qt::strong_ordering::less); + addRow(vuuid1, vuuid2, Qt::strong_ordering::less); + + // surprise 1: CBOR sorts strings by length first + addRow(vba1, vba2, Qt::strong_ordering::less); + addRow(vba2, vba3, Qt::strong_ordering::less); + addRow(vs1, vs2, Qt::strong_ordering::less); + addRow(vs2, vs3, Qt::strong_ordering::less); + + // surprise 2: CBOR sorts integrals by absolute value + addRow(vneg1, vneg2, Qt::strong_ordering::less); + + // surprise 3: CBOR sorts negatives after positives (sign+magnitude) + addRow(vint2, vneg1, Qt::strong_ordering::less); + addRow(vdouble2, vndouble1, Qt::strong_ordering::less); // inter-type comparisons - CHECK_ORDER(vneg2, vba1); - CHECK_ORDER(vba3, vs1); - CHECK_ORDER(vs3, va1); - CHECK_ORDER(va2, vm1); - CHECK_ORDER(vm2, vdt1); - CHECK_ORDER(vdt2, vtagged1); - CHECK_ORDER(vtagged2, vurl1); - CHECK_ORDER(vurl1, vuuid1); - CHECK_ORDER(vuuid2, vtagged3); - CHECK_ORDER(vtagged4, vsimple1); - CHECK_ORDER(vsimple1, vfalse); - CHECK_ORDER(vtrue, vnull); - CHECK_ORDER(vnull, vundef); - CHECK_ORDER(vundef, vsimple32); - CHECK_ORDER(vsimple255, vdouble1); + addRow(vneg2, vba1, Qt::strong_ordering::less); + addRow(vba3, vs1, Qt::strong_ordering::less); + addRow(vs3, va1, Qt::strong_ordering::less); + addRow(va2, vm1, Qt::strong_ordering::less); + addRow(vm2, vdt1, Qt::strong_ordering::less); + addRow(vdt2, vtagged1, Qt::strong_ordering::less); + addRow(vtagged2, vurl1, Qt::strong_ordering::less); + addRow(vurl1, vuuid1, Qt::strong_ordering::less); + addRow(vuuid2, vtagged3, Qt::strong_ordering::less); + addRow(vtagged4, vsimple1, Qt::strong_ordering::less); + addRow(vsimple1, vfalse, Qt::strong_ordering::less); + addRow(vtrue, vnull, Qt::strong_ordering::less); + addRow(vnull, vundef, Qt::strong_ordering::less); + addRow(vundef, vsimple32, Qt::strong_ordering::less); + addRow(vsimple255, vdouble1, Qt::strong_ordering::less); // which shows all doubles sorted after integrals - CHECK_ORDER(vint2, vdouble1); - QVERIFY(vint2.toInteger() > vdouble1.toDouble()); -#undef CHECK_ORDER + addRow(vint2, vdouble1, Qt::strong_ordering::less); + + // Add some non-US-ASCII strings. In the current implementation, QCborValue + // can store a string as either US-ASCII, UTF-8, or UTF-16, so let's exercise + // those comparisons. + + // we don't have a QUtf8StringView constructor, so work around it + auto utf8string = [](QByteArray str) { + Q_ASSERT(str.size() < 24); + str.prepend(char(QCborValue::String) + str.size()); + return QCborValue::fromCbor(str); + }; + + auto addStringCmp = [&](const char *prefix, const char *tag, QUtf8StringView lhs, + QUtf8StringView rhs) { + // CBOR orders strings by UTF-8 length + auto order = Qt::compareThreeWay(lhs.size(), rhs.size()); + if (is_eq(order)) + order = compareThreeWay(lhs, rhs); + Q_ASSERT(is_eq(order) || is_lt(order)); // please keep lhs <= rhs! + + QCborValue lhs_utf8 = utf8string(QByteArrayView(lhs).toByteArray()); + QCborValue rhs_utf8 = utf8string(QByteArrayView(rhs).toByteArray()); + QCborValue lhs_utf16 = QString::fromUtf8(lhs); + QCborValue rhs_utf16 = QString::fromUtf8(rhs); + + QTest::addRow("string-%s%s:utf8-utf8", prefix, tag) << lhs_utf8 << rhs_utf8 << order; + QTest::addRow("string-%s%s:utf8-utf16", prefix, tag) << lhs_utf8 << rhs_utf16 << order; + QTest::addRow("string-%s%s:utf16-utf8", prefix, tag) << lhs_utf16 << rhs_utf8 << order; + QTest::addRow("string-%s%s:utf16-utf16", prefix, tag) << lhs_utf16 << rhs_utf16 << order; + }; + auto addStringCmpSameLength = [&](const char *tag, QUtf8StringView lhs, QUtf8StringView rhs) { + Q_ASSERT(lhs.size() == rhs.size()); + addStringCmp("samelength-", tag, lhs, rhs); + }; + auto addStringCmpShorter = [&](const char *tag, QUtf8StringView lhs, QUtf8StringView rhs) { + Q_ASSERT(lhs.size() < rhs.size()); + addStringCmp("shorter-", tag, lhs, rhs); + }; + + // ascii-only is already tested + addStringCmp("equal-", "1continuation", "ab\u00A0c", "ab\u00A0c"); + addStringCmp("equal-", "2continuation", "ab\u0800", "ab\u0800"); + addStringCmp("equal-", "3continuation", "a\U00010000", "a\U00010000"); + + // these strings all have the same UTF-8 length (5 bytes) + addStringCmpSameLength("less-ascii", "abcde", "ab\u00A0c"); + addStringCmpSameLength("less-1continuation", "ab\u00A0c", "ab\u07FFc"); + addStringCmpSameLength("less-2continuation", "ab\u0800", "ab\uFFFC"); + addStringCmpSameLength("less-3continuation", "a\U00010000", "a\U0010FFFC"); + addStringCmpSameLength("less-0-vs-1continuation", "abcde", "ab\u00A0c"); + addStringCmpSameLength("less-0-vs-2continuation", "abcde", "ab\u0800"); + addStringCmpSameLength("less-0-vs-3continuation", "abcde", "a\U00010000"); + addStringCmpSameLength("less-1-vs-2continuation", "ab\u00A0c", "ab\uFFFC"); + addStringCmpSameLength("less-1-vs-3continuation", "ab\u00A0c", "a\U00010000"); + addStringCmpSameLength("less-2-vs-3continuation", "ab\u0800", "a\U00010000"); + addStringCmpSameLength("less-2-vs-3continuation_surrogate", "a\uFFFCz", "a\U00010000"); // even though U+D800 < U+FFFC + + // these strings have different lengths in UTF-8 + // (0continuation already tested) + addStringCmpShorter("1continuation", "ab\u00A0", "ab\u00A0c"); + addStringCmpShorter("2continuation", "ab\u0800", "ab\u0800c"); + addStringCmpShorter("3continuation", "ab\U00010000", "ab\U00010000c"); + // most of these have the same length in UTF-16! + addStringCmpShorter("0-vs-1continuation", "abc", "ab\u00A0"); + addStringCmpShorter("0-vs-2continuation", "abcd", "ab\u0800"); + addStringCmpShorter("0-vs-3continuation", "abcde", "ab\U00010000"); + addStringCmpShorter("1-vs-2continuation", "ab\u00A0", "ab\u0800"); + addStringCmpShorter("1-vs-3continuation", "abc\u00A0", "ab\U00010000"); + addStringCmpShorter("2-vs-3continuation", "ab\u0800", "ab\U00010000"); + + // lhs is 4xUTF-16 and 8xUTF-8; rhs is 3xUTF-16 but 9xUTF-8 + addStringCmpShorter("3x2-vs-2x3continuation", "\U00010000\U00010000", "\u0800\u0800\u0800"); + + // slight surprising because normally rhs would sort first ("aa" vs "ab" prefix) + // (0continuation_surprise already tested) + addStringCmpShorter("1continuation_surprise", "ab\u00A0", "aa\u00A0c"); + addStringCmpShorter("2continuation_surprise", "ab\u0800", "aa\u0800c"); + addStringCmpShorter("3continuation_surprise", "ab\U00010000", "aa\U00010000c"); + addStringCmpShorter("0-vs-1continuation_surprise", "abc", "aa\u00A0"); + addStringCmpShorter("0-vs-2continuation_surprise", "abcd", "aa\u0800"); + addStringCmpShorter("0-vs-3continuation_surprise", "abcde", "aa\U00010000"); + addStringCmpShorter("1-vs-2continuation_surprise", "ab\u00A0", "aa\u0800"); + addStringCmpShorter("1-vs-3continuation_surprise", "abc\u00A0", "aa\U00010000"); + addStringCmpShorter("2-vs-3continuation_surprise", "ab\u0800", "aa\U00010000"); +} + +void tst_QCborValue::sorting() +{ + QFETCH(QCborValue, lhs); + QFETCH(QCborValue, rhs); + QFETCH(Qt::strong_ordering, expectedOrdering); + + // do a QCOMPARE first so we get a proper QTest error in case QCborValue is + // broken + if (expectedOrdering == Qt::strong_ordering::equal) + QCOMPARE_EQ(lhs, rhs); + else if (expectedOrdering == Qt::strong_ordering::less) + QCOMPARE_LT(lhs, rhs); + else if (expectedOrdering == Qt::strong_ordering::greater) + QCOMPARE_GT(lhs, rhs); + + QCborArray array{lhs, rhs}; + + QCborValueConstRef lhsCRef = array.constBegin()[0]; + QCborValueConstRef rhsCRef = array.constBegin()[1]; + QCborValueRef lhsRef = array[0]; + QCborValueRef rhsRef = array[1]; + + // QCborValue vs QCborValue + QT_TEST_ALL_COMPARISON_OPS(lhs, rhs, expectedOrdering); + // QCborValueConstRef vs QCborValueConstRef + QT_TEST_ALL_COMPARISON_OPS(lhsCRef, rhsCRef, expectedOrdering); + // QCborValueRef vs QCborValueRef + QT_TEST_ALL_COMPARISON_OPS(lhsRef, rhsRef, expectedOrdering); + // QCborValue vs QCborValueConstRef (and reverse) + QT_TEST_ALL_COMPARISON_OPS(lhs, rhsCRef, expectedOrdering); + // QCborValue vs QCborValueRef (and reverse) + QT_TEST_ALL_COMPARISON_OPS(lhs, rhsRef, expectedOrdering); + // QCborValueConstRef vs QCborValueRef (and reverse) + QT_TEST_ALL_COMPARISON_OPS(lhsCRef, rhsRef, expectedOrdering); +} + +void tst_QCborValue::comparisonMap_data() +{ + QTest::addColumn<QCborMap>("left"); + QTest::addColumn<QCborMap>("right"); + QTest::addColumn<Qt::strong_ordering>("expectedOrdering"); + + QTest::addRow("map{{0, 1}, {10, 0}}, map{{10, 1}, {10, 0}}") + << QCborMap{{0, 1}, {10, 0}} + << QCborMap{{10, 1}, {10, 0}} + << Qt::strong_ordering::greater; + + QTest::addRow("map{{0, 1}, {0, 0}}, map{{0, 1}, {0, 0}}") + << QCborMap{{0, 1}, {0, 0}} + << QCborMap{{0, 1}, {0, 0}} + << Qt::strong_ordering::equivalent; + + QTest::addRow("map{{0, 1}, {10, 0}}, map{{10, 1}, {10, 0}, {10, 0}}") + << QCborMap{{10, 1}, {10, 0}} + << QCborMap{{0, 1}, {10, 0}, {10, 0}} + << Qt::strong_ordering::less; +} + +void tst_QCborValue::comparisonMap() +{ + QFETCH(QCborMap, left); + QFETCH(QCborMap, right); + QFETCH(Qt::strong_ordering, expectedOrdering); + QT_TEST_ALL_COMPARISON_OPS(left, right, expectedOrdering); } static void addCommonCborData() @@ -1686,7 +2185,6 @@ static void addCommonCborData() QTest::newRow("simple0") << QCborValue(QCborValue::SimpleType) << raw("\xe0") << noxfrm; QTest::newRow("simple1") << QCborValue(QCborSimpleType(1)) << raw("\xe1") << noxfrm; - QTest::newRow("simple255") << QCborValue(QCborSimpleType(255)) << raw("\xf8\xff") << noxfrm; QTest::newRow("Undefined") << QCborValue() << raw("\xf7") << noxfrm; QTest::newRow("Null") << QCborValue(nullptr) << raw("\xf6") << noxfrm; QTest::newRow("True") << QCborValue(true) << raw("\xf5") << noxfrm; @@ -1749,15 +2247,16 @@ static void addCommonCborData() QTest::newRow("DateTime") << QCborValue(dt) // this is UTC << "\xc0\x78\x18" + dt.toString(Qt::ISODateWithMs).toLatin1() << noxfrm; - QTest::newRow("DateTime-UTC") << QCborValue(QDateTime({2018, 1, 1}, {9, 0, 0}, Qt::UTC)) + QTest::newRow("DateTime-UTC") << QCborValue(QDateTime({2018, 1, 1}, {9, 0}, QTimeZone::UTC)) << raw("\xc0\x78\x18" "2018-01-01T09:00:00.000Z") << noxfrm; - QTest::newRow("DateTime-Local") << QCborValue(QDateTime({2018, 1, 1}, {9, 0, 0}, Qt::LocalTime)) + QTest::newRow("DateTime-Local") << QCborValue(QDateTime({2018, 1, 1}, {9, 0})) << raw("\xc0\x77" "2018-01-01T09:00:00.000") << noxfrm; - QTest::newRow("DateTime+01:00") << QCborValue(QDateTime({2018, 1, 1}, {9, 0, 0}, Qt::OffsetFromUTC, 3600)) - << raw("\xc0\x78\x1d" "2018-01-01T09:00:00.000+01:00") - << noxfrm; + QTest::newRow("DateTime+01:00") + << QCborValue(QDateTime({2018, 1, 1}, {9, 0}, QTimeZone::fromSecondsAheadOfUtc(3600))) + << raw("\xc0\x78\x1d" "2018-01-01T09:00:00.000+01:00") + << noxfrm; QTest::newRow("Url:Empty") << QCborValue(QUrl()) << raw("\xd8\x20\x60") << noxfrm; QTest::newRow("Url") << QCborValue(QUrl("HTTPS://example.com/{%30%31}?q=%3Ca+b%20%C2%A9%3E&%26")) << raw("\xd8\x20\x78\x27" "https://example.com/{01}?q=<a+b \xC2\xA9>&%26") @@ -1865,21 +2364,29 @@ void tst_QCborValue::fromCbor_data() QTest::newRow("String:Chunked:Empty") << QCborValue(QString()) << raw("\x7f\xff"); - QTest::newRow("DateTime:NoMilli") << QCborValue(QDateTime::fromSecsSinceEpoch(1515565477, Qt::UTC)) - << raw("\xc0\x74" "2018-01-10T06:24:37Z"); + QTest::newRow("DateTime:NoMilli") + << QCborValue(QDateTime::fromSecsSinceEpoch(1515565477, QTimeZone::UTC)) + << raw("\xc0\x74" "2018-01-10T06:24:37Z"); // date-only is only permitted local time - QTest::newRow("DateTime:NoTime:Local") << QCborValue(QDateTime(QDate(2020, 4, 15), QTime(0, 0), Qt::LocalTime)) - << raw("\xc0\x6a" "2020-04-15"); - QTest::newRow("DateTime:24:00:00") << QCborValue(QDateTime(QDate(2020, 4, 16), QTime(0, 0), Qt::UTC)) - << raw("\xc0\x74" "2020-04-15T24:00:00Z"); - QTest::newRow("DateTime:+00:00") << QCborValue(QDateTime::fromMSecsSinceEpoch(1515565477125, Qt::UTC)) - << raw("\xc0\x78\x1d" "2018-01-10T06:24:37.125+00:00"); - QTest::newRow("DateTime:+01:00") << QCborValue(QDateTime::fromMSecsSinceEpoch(1515565477125, Qt::OffsetFromUTC, 60*60)) - << raw("\xc0\x78\x1d" "2018-01-10T07:24:37.125+01:00"); - QTest::newRow("UnixTime_t:Integer") << QCborValue(QDateTime::fromSecsSinceEpoch(1515565477, Qt::UTC)) - << raw("\xc1\x1a\x5a\x55\xb1\xa5"); - QTest::newRow("UnixTime_t:Double") << QCborValue(QDateTime::fromMSecsSinceEpoch(1515565477125, Qt::UTC)) - << raw("\xc1\xfb\x41\xd6\x95\x6c""\x69\x48\x00\x00"); + QTest::newRow("DateTime:NoTime:Local") + << QCborValue(QDateTime(QDate(2020, 4, 15), QTime(0, 0))) + << raw("\xc0\x6a" "2020-04-15"); + QTest::newRow("DateTime:24:00:00") + << QCborValue(QDateTime(QDate(2020, 4, 16), QTime(0, 0), QTimeZone::UTC)) + << raw("\xc0\x74" "2020-04-15T24:00:00Z"); + QTest::newRow("DateTime:+00:00") + << QCborValue(QDateTime::fromMSecsSinceEpoch(1515565477125, QTimeZone::UTC)) + << raw("\xc0\x78\x1d" "2018-01-10T06:24:37.125+00:00"); + QTest::newRow("DateTime:+01:00") + << QCborValue(QDateTime::fromMSecsSinceEpoch(1515565477125, + QTimeZone::fromSecondsAheadOfUtc(60 * 60))) + << raw("\xc0\x78\x1d" "2018-01-10T07:24:37.125+01:00"); + QTest::newRow("UnixTime_t:Integer") + << QCborValue(QDateTime::fromSecsSinceEpoch(1515565477, QTimeZone::UTC)) + << raw("\xc1\x1a\x5a\x55\xb1\xa5"); + QTest::newRow("UnixTime_t:Double") + << QCborValue(QDateTime::fromMSecsSinceEpoch(1515565477125, QTimeZone::UTC)) + << raw("\xc1\xfb\x41\xd6\x95\x6c""\x69\x48\x00\x00"); QTest::newRow("Url:NotNormalized") << QCborValue(QUrl("https://example.com/\xc2\xa9 ")) << raw("\xd8\x20\x78\x1dHTTPS://EXAMPLE.COM/%c2%a9%20"); @@ -1999,7 +2506,7 @@ void tst_QCborValue::validation_data() // Add QCborStreamReader-specific limitations due to use of QByteArray and // QString, which are allocated by QArrayData::allocate(). const qsizetype MaxInvalid = std::numeric_limits<QByteArray::size_type>::max(); - const qsizetype MinInvalid = MaxByteArraySize + 1 - sizeof(QByteArray::size_type); + const qsizetype MinInvalid = QByteArray::max_size() + 1 - sizeof(QByteArray::size_type); addValidationColumns(); addValidationData(MinInvalid); addValidationLargeData(MinInvalid, MaxInvalid); @@ -2086,7 +2593,7 @@ void tst_QCborValue::extendedTypeValidation_data() // representation, which means it can't represent dates before year 1 or // after year 9999. { - QDateTime dt(QDate(-1, 1, 1), QTime(0, 0), Qt::UTC); + QDateTime dt(QDate(-1, 1, 1), QTime(0, 0), QTimeZone::UTC); QTest::newRow("UnixTime_t:negative-year") << encode(0xc1, 0x3b, quint64(-dt.toSecsSinceEpoch()) - 1) << QCborValue(QCborKnownTags::UnixTime_t, dt.toSecsSinceEpoch()); @@ -2158,7 +2665,7 @@ void tst_QCborValue::extendedTypeValidation() QCborValue decoded = QCborValue::fromCbor(data, &error); QVERIFY2(error.error == QCborError(), qPrintable(error.errorString())); QCOMPARE(error.offset, data.size()); - QCOMPARE(decoded, expected); + QT_TEST_EQUALITY_OPS(decoded, expected, true); QByteArray encoded = decoded.toCbor(); #if QT_VERSION < QT_VERSION_CHECK(6,0,0) @@ -2172,11 +2679,16 @@ void tst_QCborValue::hugeDeviceValidation_data() { // because QCborValue will attempt to retain the original string in UTF-8, // the size which it can't store is actually the byte array size - addValidationHugeDevice(MaxByteArraySize + 1, MaxByteArraySize + 1); + addValidationHugeDevice(QByteArray::max_size() + 1, QByteArray::max_size() + 1); } void tst_QCborValue::hugeDeviceValidation() { +#if defined(Q_OS_WASM) + QSKIP("This test tries to allocate a huge memory buffer," + " causes problem on WebAssembly platform which has limited resources."); +#endif // Q_OS_WASM + QFETCH(QSharedPointer<QIODevice>, device); QFETCH(CborError, expectedError); QCborError error = { QCborError::Code(expectedError) }; @@ -2407,6 +2919,239 @@ void tst_QCborValue::toDiagnosticNotation() QCOMPARE(result, expected); } +void tst_QCborValue::cborValueRef_data() +{ + basics_data(); + + // Add tagged data and non-empty containers (non-basic) + QTest::newRow("Array:nonempty") << QCborValue::Array << QCborValue(QCborArray{0}); + QTest::newRow("Map:nonempty") << QCborValue::Map << QCborValue(QCborMap{ { 0, 1 } }); + QTest::newRow("Tagged") << QCborValue::Tag << QCborValue(QCborKnownTags::Base64, QByteArray()); +} + +template <typename ValueRef> static void cborValueRef_template() +{ + const QCborArray otherArray = {2}; + const QCborMap otherMap = { { 2, 21 } }; + const QDateTime otherDateTime = QDateTime::fromSecsSinceEpoch(1636654201); + const QUrl otherUrl("http://example.org"); + const QRegularExpression otherRE("[.]*"); + const QUuid otherUuid = QUuid::createUuid(); + + QFETCH(QCborValue, v); + QCborArray a = { v }; + const ValueRef ref = a[0]; + + QT_TEST_EQUALITY_OPS(ref, v, true); + QVERIFY(ref.compare(v) == 0); + QVERIFY(v.compare(ref) == 0); + + // compare properties of the QCborValueRef against the QCborValue it represents + QCOMPARE(ref.type(), v.type()); + QCOMPARE(ref.isInteger(), v.isInteger()); + QCOMPARE(ref.isByteArray(), v.isByteArray()); + QCOMPARE(ref.isString(), v.isString()); + QCOMPARE(ref.isArray(), v.isArray()); + QCOMPARE(ref.isMap(), v.isMap()); + QCOMPARE(ref.isFalse(), v.isFalse()); + QCOMPARE(ref.isTrue(), v.isTrue()); + QCOMPARE(ref.isBool(), v.isBool()); + QCOMPARE(ref.isNull(), v.isNull()); + QCOMPARE(ref.isUndefined(), v.isUndefined()); + QCOMPARE(ref.isDouble(), v.isDouble()); + QCOMPARE(ref.isDateTime(), v.isDateTime()); + QCOMPARE(ref.isUrl(), v.isUrl()); + QCOMPARE(ref.isRegularExpression(), v.isRegularExpression()); + QCOMPARE(ref.isUuid(), v.isUuid()); + QCOMPARE(ref.isInvalid(), v.isInvalid()); + QCOMPARE(ref.isContainer(), v.isContainer()); + QCOMPARE(ref.isSimpleType(), v.isSimpleType()); + QCOMPARE(ref.isSimpleType(QCborSimpleType::False), v.isSimpleType(QCborSimpleType::False)); + QCOMPARE(ref.isSimpleType(QCborSimpleType::True), v.isSimpleType(QCborSimpleType::True)); + QCOMPARE(ref.isSimpleType(QCborSimpleType::Null), v.isSimpleType(QCborSimpleType::Null)); + QCOMPARE(ref.isSimpleType(QCborSimpleType::Undefined), v.isSimpleType(QCborSimpleType::Undefined)); + QCOMPARE(ref.isSimpleType(QCborSimpleType(255)), v.isSimpleType(QCborSimpleType(255))); + + QCOMPARE(ref.tag(), v.tag()); + QCOMPARE(ref.taggedValue(), v.taggedValue()); + + QCOMPARE(ref.toBool(false), v.toBool(false)); + QCOMPARE(ref.toBool(true), v.toBool(true)); + QCOMPARE(ref.toInteger(47), v.toInteger(47)); + QCOMPARE(ref.toDouble(47), v.toDouble(47)); + QCOMPARE(ref.toByteArray("other"), v.toByteArray("other")); + QCOMPARE(ref.toString("other"), v.toString("other")); + QCOMPARE(ref.toArray(otherArray), v.toArray(otherArray)); + QCOMPARE(ref.toMap(otherMap), v.toMap(otherMap)); + QCOMPARE(ref.toDateTime(otherDateTime), v.toDateTime(otherDateTime)); + QCOMPARE(ref.toRegularExpression(otherRE), v.toRegularExpression(otherRE)); + QCOMPARE(ref.toUrl(otherUrl), v.toUrl(otherUrl)); + QCOMPARE(ref.toUuid(otherUuid), v.toUuid(otherUuid)); + QCOMPARE(ref.toSimpleType(QCborSimpleType(254)), v.toSimpleType(QCborSimpleType(254))); + + QCOMPARE(ref.toArray().isEmpty(), v.toArray().isEmpty()); + QCOMPARE(ref.toMap().isEmpty(), v.toMap().isEmpty()); + QCOMPARE(ref[0], std::as_const(v)[0]); + QCOMPARE(ref[QLatin1String("other")], std::as_const(v)[QLatin1String("other")]); + QCOMPARE(ref[QString("other")], std::as_const(v)[QString("other")]); + + if (qIsNaN(v.toDouble())) + QCOMPARE(qIsNaN(ref.toVariant().toDouble()), qIsNaN(v.toVariant().toDouble())); + else + QCOMPARE(ref.toVariant(), v.toVariant()); + QCOMPARE(ref.toJsonValue(), v.toJsonValue()); + QCOMPARE(ref.toCbor(), v.toCbor()); + QCOMPARE(ref.toDiagnosticNotation(), v.toDiagnosticNotation()); +} + +void tst_QCborValue::cborValueRef() +{ + cborValueRef_template<QCborValueRef>(); +} + +void tst_QCborValue::cborValueConstRef() +{ + cborValueRef_template<QCborValueConstRef>(); +} + +void tst_QCborValue::cborValueRefMutatingArray() +{ + // complements arrayMutation() + QFETCH(QCborValue, v); + + { + QCborArray origArray = { 123 }; + QCborArray a = { QCborValue(origArray) }; + QCborValueRef ref = a[0]; + QVERIFY(ref.isArray()); + QVERIFY(!ref.toArray().isEmpty()); + + // this will force the array to grow + ref[1] = v; + + QCborValue va = a.at(0); + QVERIFY(va.isArray()); + QCOMPARE(va.toArray().size(), 2); + QCOMPARE(va.toArray().first(), 123); + QT_TEST_EQUALITY_OPS(va.toArray().last(), v, true); + + // ensure the array didn't get modified + QT_TEST_EQUALITY_OPS(origArray, QCborArray{123}, true); + } + { + QCborArray emptyArray; + QCborArray a = { QCborValue(emptyArray) }; + QCborValueRef ref = a[0]; + QVERIFY(ref.isArray()); + QVERIFY(ref.toArray().isEmpty()); + + // this will force the array to become non-empty + ref[1] = v; + + QCborValue va = a.at(0); + QVERIFY(va.isArray()); + QCOMPARE(va.toArray().size(), 2); + QT_TEST_EQUALITY_OPS(va.toArray().first(), QCborValue(), true); + QT_TEST_EQUALITY_OPS(va.toArray().last(), v, true); + + // ensure the array didn't get modified + QT_TEST_EQUALITY_OPS(emptyArray, QCborArray(), true); + } + { + QCborArray emptyArray = { 123, 456 }; + emptyArray.takeFirst(); + emptyArray.takeFirst(); + QCborArray a = { QCborValue(emptyArray) }; + QCborValueRef ref = a[0]; + QVERIFY(ref.isArray()); + QVERIFY(ref.toArray().isEmpty()); + + // this will force the array to become non-empty + ref[1] = v; + + QCborValue va = a.at(0); + QVERIFY(va.isArray()); + QCOMPARE(va.toArray().size(), 2); + QT_TEST_EQUALITY_OPS(va.toArray().first(), QCborValue(), true); + QT_TEST_EQUALITY_OPS(va.toArray().last(), v, true); + + // ensure the array didn't get modified + QT_TEST_EQUALITY_OPS(emptyArray, QCborArray(), true); + } +} + +void tst_QCborValue::cborValueRefMutatingMapIntKey() +{ + // complements mapMutation() + QFETCH(QCborValue, v); + QCborValue::Type type = v.type(); + + auto executeTest = [=](qint64 index) { + QCborArray a = { v }; + QCborValueRef ref = a[0]; + + if (type == QCborValue::Array && !v.toArray().isEmpty()) + QTest::ignoreMessage(QtWarningMsg, "Using CBOR array as map forced conversion"); + ref[index] = v; + + QCborValue vm = a.at(0); + QVERIFY(vm.isMap()); + QCOMPARE(vm.toMap()[index].type(), type); + QCOMPARE(vm.toMap()[index], v); + + if (type == QCborValue::Array && !v.toArray().isEmpty()) + QCOMPARE(vm.toMap()[0], v.toArray()[0]); + else if (type == QCborValue::Map && !v.toMap().isEmpty()) + QCOMPARE(vm.toMap()[0], v.toMap()[0]); + }; + // accessing a negative index causes it to become a map + executeTest(-1); + if (QTest::currentTestFailed()) + return; + + // if the index is bigger than 0x10000, the array becomes a map + executeTest(0x10000); + if (QTest::currentTestFailed()) + return; + + if (type != QCborValue::Array) + executeTest(5); +} + +template <typename String> static void cborValueRefMutatingMapStringKey_template(const String &key) +{ + // complements mapMutation() too + QFETCH(QCborValue, v); + QCborValue::Type type = v.type(); + QCborArray a = { v }; + QCborValueRef ref = a[0]; + + if (type == QCborValue::Array && !v.toArray().isEmpty()) + QTest::ignoreMessage(QtWarningMsg, "Using CBOR array as map forced conversion"); + + // force conversion to map + ref[key] = v; + + QCborValue vm = a.at(0); + QVERIFY(vm.isMap()); + QCOMPARE(vm.toMap()[key].type(), type); + QCOMPARE(vm.toMap()[key], v); + + if (type == QCborValue::Array && !v.toArray().isEmpty()) + QCOMPARE(vm.toMap()[0], v.toArray()[0]); + else if (type == QCborValue::Map && !v.toMap().isEmpty()) + QCOMPARE(vm.toMap()[0], v.toMap()[0]); +} + +void tst_QCborValue::cborValueRefMutatingMapLatin1StringKey() +{ + cborValueRefMutatingMapStringKey_template(QLatin1String("other")); +} + +void tst_QCborValue::cborValueRefMutatingMapStringKey() +{ + cborValueRefMutatingMapStringKey_template(QString("other")); +} void tst_QCborValue::datastreamSerialization_data() { @@ -2459,6 +3204,7 @@ void tst_QCborValue::streamVariantSerialization() load >> output; QCOMPARE(output.userType(), QMetaType::QCborArray); QCOMPARE(qvariant_cast<QCborArray>(output), array); + QT_TEST_EQUALITY_OPS(qvariant_cast<QCborArray>(output), array, true); } { QCborMap obj{{"foo", 42}}; @@ -2489,7 +3235,7 @@ void tst_QCborValue::debugOutput_data() QTest::addColumn<QCborValue>("v"); QTest::addColumn<QString>("expected"); - QDateTime dt(QDate(2020, 4, 18), QTime(13, 41, 22, 123), Qt::UTC); + QDateTime dt(QDate(2020, 4, 18), QTime(13, 41, 22, 123), QTimeZone::UTC); QBitArray bits = QBitArray::fromBits("\x79\x03", 11); QTest::newRow("Undefined") << QCborValue() << "QCborValue()"; diff --git a/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt b/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt index 213732e04d..14ac0514f9 100644 --- a/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qcborvalue_json/CMakeLists.txt @@ -1,9 +1,16 @@ -# Generated from qcborvalue_json.pro. +# 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/tst_qcborvalue_json.cpp b/tests/auto/corelib/serialization/qcborvalue_json/tst_qcborvalue_json.cpp index 723dfef90b..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,47 +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 <QTest> #include <QJsonValue> #include <QJsonObject> #include <QJsonArray> +#include <QVariant> +#include <QVariantMap> +#include <QVariantList> Q_DECLARE_METATYPE(QCborValue) diff --git a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt index 5795ad3ed3..ebbb232362 100644 --- a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt @@ -1,33 +1,24 @@ -# Generated from qdatastream.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qdatastream Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qdatastream LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + # Collect test data list(APPEND test_data "datastream.q42") +list(APPEND test_data "typedef.q5") qt_internal_add_test(tst_qdatastream SOURCES tst_qdatastream.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui TESTDATA ${test_data} ) - -## Scopes: -##################################################################### - -if(ANDROID) - # Resources: - set(testdata_resource_files - "datastream.q42" - ) - - qt_internal_add_resource(tst_qdatastream "testdata" - PREFIX - "/" - FILES - ${testdata_resource_files} - ) -endif() diff --git a/tests/auto/corelib/serialization/qdatastream/gen_typedefq5.cpp b/tests/auto/corelib/serialization/qdatastream/gen_typedefq5.cpp new file mode 100644 index 0000000000..6cc2755d8a --- /dev/null +++ b/tests/auto/corelib/serialization/qdatastream/gen_typedefq5.cpp @@ -0,0 +1,28 @@ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only + + +#include <QDataStream> +#include <QPair> +#include <QFile> +#include <QVariant> +#include <QDebug> + +using CustomPair = QPair<int, int>; +QDataStream &operator<<(QDataStream &ds, CustomPair pd) +{ return ds << pd.first << pd.second; } +QDataStream &operator>>(QDataStream &ds, CustomPair &pd) +{ return ds >> pd.first >> pd.second; } +Q_DECLARE_METATYPE(CustomPair) + + +int main() { + qRegisterMetaTypeStreamOperators<CustomPair>(); + QFile out("typedef.q5"); + out.open(QIODevice::ReadWrite); + QDataStream stream(&out); + stream.setVersion(QDataStream::Qt_5_15); + CustomPair p {42, 100}; + qDebug() << p.first << p.second; + stream << QVariant::fromValue(p); +} diff --git a/tests/auto/corelib/serialization/qdatastream/testdata.qrc b/tests/auto/corelib/serialization/qdatastream/testdata.qrc deleted file mode 100644 index fb63cb3438..0000000000 --- a/tests/auto/corelib/serialization/qdatastream/testdata.qrc +++ /dev/null @@ -1,5 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>datastream.q42</file> - </qresource> -</RCC> diff --git a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp index 8fbe8d745e..77ca884897 100644 --- a/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp +++ b/tests/auto/corelib/serialization/qdatastream/tst_qdatastream.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QTest> #include <QBuffer> @@ -44,6 +19,8 @@ #include <QtGui/QPixmap> #include <QtGui/QTextLength> +using namespace Qt::StringLiterals; + static_assert(QTypeTraits::has_ostream_operator_v<QDataStream, int>); static_assert(QTypeTraits::has_ostream_operator_v<QDataStream, QList<int>>); static_assert(QTypeTraits::has_ostream_operator_v<QDataStream, QMap<int, QString>>); @@ -157,6 +134,7 @@ private slots: void stream_atEnd(); void stream_writeError(); + void stream_writeSizeLimitExceeded(); void stream_QByteArray2(); @@ -221,6 +199,8 @@ private slots: void nestedTransactionsResult_data(); void nestedTransactionsResult(); + void typedefQt5Compat(); + private: void writebool(QDataStream *s); void writeQBitArray(QDataStream *s); @@ -316,6 +296,8 @@ static int NColorRoles[] = { QPalette::PlaceholderText + 1, // Qt_5_12 QPalette::PlaceholderText + 1, // Qt_5_13, Qt_5_14, Qt_5_15 QPalette::PlaceholderText + 1, // Qt_6_0 + QPalette::Accent + 1, // Qt_6_6 + QPalette::Accent + 1, // Qt_6_7 0 // add the correct value for Qt_5_14 here later }; @@ -981,10 +963,10 @@ static void QBitArrayData(QBitArray *b, int index) case 18: filler = "1111111111111111111111111111111111111111111111111111111111111111"; break; } - b->resize(filler.length()); + b->resize(filler.size()); b->fill(0); // reset all bits to zero - for (int i = 0; i < filler.length(); ++i) { + for (int i = 0; i < filler.size(); ++i) { if (filler.at(i) == '1') b->setBit(i, true); } @@ -1226,15 +1208,15 @@ void tst_QDataStream::readQCursor(QDataStream *s) QCOMPARE(d5.hotSpot(), test.hotSpot()); // Comparing non-null QBitmaps will fail. Upcast them first to pass. - QCOMPARE(d5.bitmap(Qt::ReturnByValue).isNull(), test.bitmap(Qt::ReturnByValue).isNull()); + QCOMPARE(d5.bitmap().isNull(), test.bitmap().isNull()); QCOMPARE( - static_cast<QPixmap>(d5.bitmap(Qt::ReturnByValue)), - static_cast<QPixmap>(test.bitmap(Qt::ReturnByValue)) + static_cast<QPixmap>(d5.bitmap()), + static_cast<QPixmap>(test.bitmap()) ); - QCOMPARE(d5.mask(Qt::ReturnByValue).isNull(), test.mask(Qt::ReturnByValue).isNull()); + QCOMPARE(d5.mask().isNull(), test.mask().isNull()); QCOMPARE( - static_cast<QPixmap>(d5.mask(Qt::ReturnByValue)), - static_cast<QPixmap>(test.mask(Qt::ReturnByValue)) + static_cast<QPixmap>(d5.mask()), + static_cast<QPixmap>(test.mask()) ); } #endif @@ -2209,6 +2191,19 @@ void tst_QDataStream::stream_writeError() TEST_WRITE_ERROR(.writeRawData("test", 4)) } +void tst_QDataStream::stream_writeSizeLimitExceeded() +{ + QByteArray ba; + QDataStream ds(&ba, QDataStream::ReadWrite); + // Set the version that supports only 32-bit data size + ds.setVersion(QDataStream::Qt_6_6); + QCOMPARE(ds.status(), QDataStream::Ok); + const qint64 size = qint64(std::numeric_limits<quint32>::max()) + 1; + ds.writeBytes("", size); + QCOMPARE(ds.status(), QDataStream::SizeLimitExceeded); + QVERIFY(ba.isEmpty()); +} + void tst_QDataStream::stream_QByteArray2() { QByteArray ba; @@ -2413,8 +2408,8 @@ void tst_QDataStream::setVersion() */ // revise the test if new color roles or color groups are added - QVERIFY(QPalette::NColorRoles == QPalette::PlaceholderText + 1); - QCOMPARE(int(QPalette::NColorGroups), 3); + QCOMPARE(QPalette::NColorRoles, QPalette::Accent + 1); + QCOMPARE(static_cast<int>(QPalette::NColorGroups), 3); QByteArray ba2; QPalette pal1, pal2; @@ -2815,7 +2810,6 @@ void tst_QDataStream::status_charptr_QByteArray_data() QTest::newRow("badsize 1MB+1") << QByteArray("\x00\x10\x00\x01", 4) + oneMbMinus1 + QByteArray("j") << (int) QDataStream::ReadPastEnd << QByteArray(); QTest::newRow("badsize 3MB") << QByteArray("\x00\x30\x00\x00", 4) + threeMbMinus1 << (int) QDataStream::ReadPastEnd << QByteArray(); QTest::newRow("badsize 3MB+1") << QByteArray("\x00\x30\x00\x01", 4) + threeMbMinus1 + QByteArray("j") << (int) QDataStream::ReadPastEnd << QByteArray(); - QTest::newRow("size -1") << QByteArray("\xff\xff\xff\xff", 4) << (int) QDataStream::ReadPastEnd << QByteArray(); QTest::newRow("size -2") << QByteArray("\xff\xff\xff\xfe", 4) << (int) QDataStream::ReadPastEnd << QByteArray(); } @@ -2838,17 +2832,35 @@ void tst_QDataStream::status_charptr_QByteArray() { QDataStream stream(&data, QIODevice::ReadOnly); char *buf; - uint len; + qint64 len; stream.readBytes(buf, len); - QCOMPARE((int)len, expectedString.size()); + QCOMPARE(len, qint64(expectedString.size())); QCOMPARE(QByteArray(buf, len), expectedString); QCOMPARE(int(stream.status()), expectedStatus); delete [] buf; } +#if QT_DEPRECATED_SINCE(6, 11) +QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED + { + // check that old overload still works as expected + QDataStream stream(&data, QIODevice::ReadOnly); + char *buf; + auto cleanup = qScopeGuard([&buf] { + delete [] buf; + }); + uint len; + stream.readBytes(buf, len); + + QCOMPARE(len, expectedString.size()); + QCOMPARE(QByteArray(buf, len), expectedString); + QCOMPARE(int(stream.status()), expectedStatus); + } +QT_WARNING_POP +#endif // QT_DEPRECATED_SINCE(6, 11) { QDataStream stream(&data, QIODevice::ReadOnly); - QByteArray buf; + QByteArray buf = "Content to be overwritten"; stream >> buf; if (data.startsWith("\xff\xff\xff\xff")) { @@ -2917,12 +2929,20 @@ void tst_QDataStream::status_QString_data() QTest::newRow("badsize 1MB+1") << QByteArray("\x00\x20\x00\x02", 4) + oneMbMinus1Data + QByteArray("j") << (int) QDataStream::ReadPastEnd << QString(); QTest::newRow("badsize 3MB") << QByteArray("\x00\x60\x00\x00", 4) + threeMbMinus1Data << (int) QDataStream::ReadPastEnd << QString(); QTest::newRow("badsize 3MB+1") << QByteArray("\x00\x60\x00\x02", 4) + threeMbMinus1Data + QByteArray("j") << (int) QDataStream::ReadPastEnd << QString(); - QTest::newRow("size -2") << QByteArray("\xff\xff\xff\xfe", 4) << (int) QDataStream::ReadPastEnd << QString(); - QTest::newRow("size MAX") << QByteArray("\x7f\xff\xff\xfe", 4) << (int) QDataStream::ReadPastEnd << QString(); + QTest::newRow("32 bit size should be 64 bit") << QByteArray("\xff\xff\xff\xfe", 4) << (int) QDataStream::ReadPastEnd << QString(); - // corrupt data +#if QT_POINTER_SIZE != 4 + // past end on 64 bit platforms + QTest::newRow("32 bit size MAX string no content") << QByteArray("\xff\xff\xff\xfc", 4) << (int) QDataStream::ReadPastEnd << QString(); +#else + // too big for 32 bit platforms + QTest::newRow("32 bit size MAX string no content") << QByteArray("\xff\xff\xff\xfc", 4) << (int) QDataStream::SizeLimitExceeded << QString(); +#endif + // too big on both 32 and 64 bit platforms because qsizetype is signed + QTest::newRow("64 bit size MAX string no content") << QByteArray("\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\xfe", 12) << (int) QDataStream::SizeLimitExceeded << QString(); + + // corrupt data because QChar is 16 bit => even size required QTest::newRow("corrupt1") << QByteArray("yyyy") << (int) QDataStream::ReadCorruptData << QString(); - QTest::newRow("size -3") << QByteArray("\xff\xff\xff\xfd", 4) << (int) QDataStream::ReadCorruptData << QString(); } void tst_QDataStream::status_QString() @@ -2932,7 +2952,7 @@ void tst_QDataStream::status_QString() QFETCH(QString, expectedString); QDataStream stream(&data, QIODevice::ReadOnly); - QString str; + QString str = "Content to be overwritten"; stream >> str; QCOMPARE(str.size(), expectedString.size()); @@ -2996,6 +3016,8 @@ void tst_QDataStream::status_QBitArray_data() QTest::newRow("badsize 16") << QDataStream::Qt_5_15 << QByteArray("\x00\x00\x00\x10\xff", 5) << (int) QDataStream::ReadPastEnd << QBitArray(); QTest::newRow("badsize 17") << QDataStream::Qt_5_15 << QByteArray("\x00\x00\x00\x11\xff\xff", 6) << (int) QDataStream::ReadPastEnd << QBitArray(); QTest::newRow("badsize 32") << QDataStream::Qt_5_15 << QByteArray("\x00\x00\x00\x20\xff\xff\xff", 7) << (int) QDataStream::ReadPastEnd << QBitArray(); + QTest::newRow("badsize INT_MAX") << QDataStream::Qt_5_15 << QByteArray("\x7f\xff\xff\xff\xff\xff\xff", 7) << int(QDataStream::ReadPastEnd) << QBitArray(); // size accepted + QTest::addRow("badsize INT_MAX + 1") << QDataStream::Qt_5_15 << QByteArray("\x80\x00\x00\x01" "\xff\xff\xff", 7) << int(QDataStream::ReadCorruptData) << QBitArray(); // size rejected QTest::newRow("new badsize 0") << QDataStream::Qt_6_0 << QByteArray("\x00\x00\x00\x00", 4) << (int) QDataStream::ReadPastEnd << QBitArray(); QTest::newRow("new badsize 9") << QDataStream::Qt_6_0 << QByteArray("\x00\x00\x00\x00\x00\x00\x00\x09\xff", 9) << (int) QDataStream::ReadPastEnd << QBitArray(); QTest::newRow("new badsize 0x10000") << QDataStream::Qt_6_0 << QByteArray("\x00\x00\x00\x01\x00\x00\x00\x00\x00", 9) << (int) QDataStream::ReadPastEnd << QBitArray(); @@ -3025,7 +3047,7 @@ void tst_QDataStream::status_QBitArray() QDataStream stream(&data, QIODevice::ReadOnly); stream.setVersion(version); - QBitArray str; + QBitArray str(255, true); stream >> str; if (sizeof(qsizetype) == sizeof(int)) @@ -3092,7 +3114,9 @@ void tst_QDataStream::status_QHash_QMap() hash2.insert("L", "MN"); // ok + hash = hash2; MAP_TEST(QByteArray("\x00\x00\x00\x00", 4), QDataStream::Ok, QDataStream::Ok, StringHash()); + hash = hash2; MAP_TEST(QByteArray("\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00", 12), QDataStream::Ok, QDataStream::Ok, hash1); MAP_TEST(QByteArray("\x00\x00\x00\x02\x00\x00\x00\x02\x00J\x00\x00\x00\x02\x00K" "\x00\x00\x00\x02\x00L\x00\x00\x00\x04\x00M\x00N", 30), QDataStream::Ok, QDataStream::Ok, hash2); @@ -3173,7 +3197,9 @@ void tst_QDataStream::status_QList_QVector() someList.append("J"); someList.append("MN"); + list = someList; LIST_TEST(QByteArray("\x00\x00\x00\x00", 4), QDataStream::Ok, QDataStream::Ok, List()); + list = someList; LIST_TEST(QByteArray("\x00\x00\x00\x01\x00\x00\x00\x00", 8), QDataStream::Ok, QDataStream::Ok, listWithEmptyString); LIST_TEST(QByteArray("\x00\x00\x00\x02\x00\x00\x00\x02\x00J" "\x00\x00\x00\x04\x00M\x00N", 18), QDataStream::Ok, QDataStream::Ok, someList); @@ -3241,6 +3267,13 @@ void tst_QDataStream::streamRealDataTypes() path.arcTo(4, 5, 6, 7, 8, 9); path.quadTo(1, 2, 3, 4); + QPainterPath otherPath; + otherPath.arcTo(10, 4, 5, 6, 7, 8); + otherPath.lineTo(9, 0); + otherPath.cubicTo(0, 0, 10, 10, 20, 20); + otherPath.quadTo(2, 4, 5, 6); + QCOMPARE(otherPath.elementCount(), 12); + QColor color(64, 64, 64); color.setAlphaF(0.5); QRadialGradient radialGradient(5, 6, 7, 8, 9); @@ -3272,17 +3305,17 @@ void tst_QDataStream::streamRealDataTypes() file.close(); } - QPointF point; - QRectF rect; - QPolygonF polygon; + QPointF point(1, 2); + QRectF rect(1, 2, 5, 6); + QPolygonF polygon {{3, 4}, {5, 6}}; QTransform transform; - QPainterPath p; + QPainterPath p = otherPath; QPicture pict; - QTextLength textLength; - QColor col; - QBrush rGrad; - QBrush cGrad; - QPen pen; + QTextLength textLength(QTextLength::FixedLength, 2.5); + QColor col(128, 128, 127); + QBrush rGrad(Qt::CrossPattern); + QBrush cGrad(Qt::CrossPattern); + QPen pen(conicalBrush, 10); QVERIFY(file.open(QIODevice::ReadOnly)); QDataStream stream(&file); @@ -3872,6 +3905,49 @@ void tst_QDataStream::nestedTransactionsResult() QCOMPARE(int(stream.status()), expectedStatus); } +using CustomPair = QPair<int, int>; +QDataStream &operator<<(QDataStream &ds, CustomPair pd) +{ return ds << pd.first << pd.second; } +QDataStream &operator>>(QDataStream &ds, CustomPair &pd) +{ return ds >> pd.first >> pd.second; } + + +void tst_QDataStream::typedefQt5Compat() +{ + qRegisterMetaType<CustomPair>("CustomPair"); + QByteArray qt5Data; + { + // we can read the qt5 version + QFile in(QFINDTESTDATA("typedef.q5")); + QVERIFY(in.open(QIODevice::ReadOnly)); + qt5Data = in.readAll(); + QVERIFY(in.seek(0)); + QDataStream stream(&in); + stream.setVersion(QDataStream::Qt_5_15); + QVariant var; + stream >> var; + QCOMPARE(stream.status(), QDataStream::Ok); + CustomPair p = var.value<CustomPair>(); + QCOMPARE(p.first, 42); + QCOMPARE(p.second, 100); + } + { + // writing in Qt 6 results in the same file + QTemporaryDir dir; + QVERIFY(dir.isValid()); + QFile file(dir.filePath(u"typedef.q6"_s)); + QVERIFY(file.open(QIODevice::WriteOnly)); + QDataStream stream(&file); + stream.setVersion(QDataStream::Qt_5_15); + CustomPair p {42, 100}; + stream << QVariant::fromValue(p); + file.close(); + QVERIFY(file.open(QIODevice::ReadOnly)); + QCOMPARE(file.readAll(), qt5Data); + } +} + QTEST_MAIN(tst_QDataStream) + #include "tst_qdatastream.moc" diff --git a/tests/auto/corelib/serialization/qdatastream/typedef.q5 b/tests/auto/corelib/serialization/qdatastream/typedef.q5 Binary files differnew file mode 100644 index 0000000000..c6b5e8a4df --- /dev/null +++ b/tests/auto/corelib/serialization/qdatastream/typedef.q5 diff --git a/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt index b77b8212fb..d0622c642c 100644 --- a/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qdatastream_core_pixmap/CMakeLists.txt @@ -1,12 +1,19 @@ -# Generated from qdatastream_core_pixmap.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qdatastream_core_pixmap Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qdatastream_core_pixmap LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + qt_internal_add_test(tst_qdatastream_core_pixmap SOURCES tst_qdatastream_core_pixmap.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Gui ) diff --git a/tests/auto/corelib/serialization/qdatastream_core_pixmap/tst_qdatastream_core_pixmap.cpp b/tests/auto/corelib/serialization/qdatastream_core_pixmap/tst_qdatastream_core_pixmap.cpp index 10721cd253..f17da27f1c 100644 --- a/tests/auto/corelib/serialization/qdatastream_core_pixmap/tst_qdatastream_core_pixmap.cpp +++ b/tests/auto/corelib/serialization/qdatastream_core_pixmap/tst_qdatastream_core_pixmap.cpp @@ -1,36 +1,11 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QTest> #include <QtGui/QPixmap> #include <QtGui/QImage> -class tst_QDataStream : public QObject +class tst_QDataStreamPixmap : public QObject { Q_OBJECT @@ -38,7 +13,7 @@ private slots: void stream_with_pixmap(); }; -void tst_QDataStream::stream_with_pixmap() +void tst_QDataStreamPixmap::stream_with_pixmap() { // This is a QVariantMap with a 3x3 red QPixmap and two strings inside const QByteArray ba = QByteArray::fromBase64( @@ -62,6 +37,6 @@ void tst_QDataStream::stream_with_pixmap() QCOMPARE(map["z"].toString(), QString("there")); } -QTEST_GUILESS_MAIN(tst_QDataStream) +QTEST_GUILESS_MAIN(tst_QDataStreamPixmap) #include "tst_qdatastream_core_pixmap.moc" diff --git a/tests/auto/corelib/serialization/qtextstream/BLACKLIST b/tests/auto/corelib/serialization/qtextstream/BLACKLIST index aef7d7aa26..cb76e0454d 100644 --- a/tests/auto/corelib/serialization/qtextstream/BLACKLIST +++ b/tests/auto/corelib/serialization/qtextstream/BLACKLIST @@ -1,5 +1,3 @@ -[stillOpenWhenAtEnd] -windows-7sp1 # QTBUG-87410 [readStdin] android diff --git a/tests/auto/corelib/serialization/qtextstream/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/CMakeLists.txt index 15798c963f..ac3dc91555 100644 --- a/tests/auto/corelib/serialization/qtextstream/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/CMakeLists.txt @@ -1,4 +1,11 @@ -# Generated from qtextstream.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qtextstream LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() add_subdirectory(test) add_subdirectory(stdinProcess) diff --git a/tests/auto/corelib/serialization/qtextstream/qtextstream_integrity.qrc b/tests/auto/corelib/serialization/qtextstream/qtextstream_integrity.qrc new file mode 100644 index 0000000000..620fddcd45 --- /dev/null +++ b/tests/auto/corelib/serialization/qtextstream/qtextstream_integrity.qrc @@ -0,0 +1,7 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource prefix="/"> + <file>rfc3261.txt</file> + <file>task113817.txt</file> + <file>tst_qtextstream.cpp</file> +</qresource> +</RCC> diff --git a/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt index 785785d43a..bcfb0aaf4e 100644 --- a/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from readAllStdinProcess.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## readAllStdinProcess Binary: diff --git a/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/main.cpp b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/main.cpp index 08d2bf8183..01f47d758f 100644 --- a/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/main.cpp +++ b/tests/auto/corelib/serialization/qtextstream/readAllStdinProcess/main.cpp @@ -1,33 +1,9 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/QTextStream> +#include <QtCore/QString> #include <stdio.h> int main(int, char**) diff --git a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt index 897444c9af..39af3a3048 100644 --- a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from readLineStdinProcess.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## readLineStdinProcess Binary: diff --git a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/main.cpp b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/main.cpp index 2d4aa452ca..8f81f5a720 100644 --- a/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/main.cpp +++ b/tests/auto/corelib/serialization/qtextstream/readLineStdinProcess/main.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/QCoreApplication> diff --git a/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt index 73eccd1ed8..7e964bbfb2 100644 --- a/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/stdinProcess/CMakeLists.txt @@ -1,4 +1,5 @@ -# Generated from stdinProcess.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## stdinProcess Binary: diff --git a/tests/auto/corelib/serialization/qtextstream/stdinProcess/main.cpp b/tests/auto/corelib/serialization/qtextstream/stdinProcess/main.cpp index a3c1fc525b..b8a274ed0f 100644 --- a/tests/auto/corelib/serialization/qtextstream/stdinProcess/main.cpp +++ b/tests/auto/corelib/serialization/qtextstream/stdinProcess/main.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/QTextStream> diff --git a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt index b9094287f7..588a49fcf0 100644 --- a/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qtextstream/test/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + ##################################################################### ## tst_qtextstream Test: ##################################################################### @@ -6,6 +9,7 @@ list(APPEND test_data "../rfc3261.txt") list(APPEND test_data "../task113817.txt") list(APPEND test_data "../qtextstream.qrc") +list(APPEND test_data "../qtextstream_integrity.qrc") list(APPEND test_data "../tst_qtextstream.cpp") list(APPEND test_data "../resources") list(APPEND test_data "../BLACKLIST") @@ -14,12 +18,17 @@ qt_internal_add_test(tst_qtextstream OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" SOURCES ../tst_qtextstream.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Network Qt::TestPrivate TESTDATA ${test_data} + QT_TEST_SERVER_LIST "cyrus" ) +if(QT_FEATURE_sanitize_address) + set_property(TEST tst_qtextstream APPEND PROPERTY ENVIRONMENT "QTEST_FUNCTION_TIMEOUT=900000") +endif() + # Resources: set(qtextstream_resource_files "../resources/big_endian/" @@ -35,14 +44,6 @@ qt_internal_add_resource(tst_qtextstream "qtextstream" ${qtextstream_resource_files} ) - -## Scopes: - -qt_internal_extend_target(tst_qtextstream CONDITION builtin_testdata - DEFINES - BUILTIN_TESTDATA -) - if(QT_FEATURE_process) - add_dependencies(tst_qtextstream stdinProcess readAllStdinProcess readLineStdinProcess) + add_dependencies(tst_qtextstream stdinProcess readAllStdinProcess readLineStdinProcess) endif() diff --git a/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp index c02da8efe1..411084a36c 100644 --- a/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/corelib/serialization/qtextstream/tst_qtextstream.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QTest> @@ -37,6 +12,7 @@ #include <QDebug> #include <QElapsedTimer> #include <QFile> +#include <QTemporaryFile> #include <QStringConverter> #include <QTcpSocket> #include <QTemporaryDir> @@ -94,6 +70,8 @@ private slots: // char operators void QChar_operators_FromDevice_data(); void QChar_operators_FromDevice(); + void char16_t_operators_FromDevice_data(); + void char16_t_operators_FromDevice(); void char_operators_FromDevice_data(); void char_operators_FromDevice(); @@ -225,6 +203,9 @@ private slots: void textModeOnEmptyRead(); + void autodetectUnicode_data(); + void autodetectUnicode(); + private: void generateLineData(bool for_QString); void generateAllData(bool for_QString); @@ -569,7 +550,7 @@ void tst_QTextStream::readLineMaxlen() QFile::remove("testfile"); QFile file("testfile"); if (useDevice) { - file.open(QIODevice::ReadWrite); + QVERIFY(file.open(QIODevice::ReadWrite)); file.write(input.toUtf8()); file.seek(0); stream.setDevice(&file); @@ -954,7 +935,8 @@ void tst_QTextStream::lineCount_data() QTest::newRow("buffersize+1 line") << QByteArray(16384, '\n') << 16384; QTest::newRow("buffersize+2 line") << QByteArray(16385, '\n') << 16385; - QFile file(m_rfc3261FilePath); file.open(QFile::ReadOnly); + QFile file(m_rfc3261FilePath); + QVERIFY(file.open(QFile::ReadOnly)); QTest::newRow("rfc3261") << file.readAll() << 15067; } @@ -965,7 +947,7 @@ void tst_QTextStream::lineCount() QFETCH(int, lineCount); QFile out("out.txt"); - out.open(QFile::WriteOnly); + QVERIFY(out.open(QFile::WriteOnly)); QTextStream lineReader(data); int lines = 0; @@ -1211,11 +1193,16 @@ void tst_QTextStream::stillOpenWhenAtEnd() while (!stream.readLine().isNull()) {} QVERIFY(file.isOpen()); +#ifdef QT_TEST_SERVER + if (!QtNetworkSettings::verifyConnection(QtNetworkSettings::imapServerName(), 143)) + QSKIP("No network test server available"); +#else if (!QtNetworkSettings::verifyTestNetworkSettings()) QSKIP("No network test server available"); +#endif QTcpSocket socket; - socket.connectToHost(QtNetworkSettings::serverName(), 143); + socket.connectToHost(QtNetworkSettings::imapServerName(), 143); QVERIFY(socket.waitForReadyRead(5000)); QTextStream stream2(&socket); @@ -1422,18 +1409,18 @@ void tst_QTextStream::pos3LargeFile() { QFile file(testFileName); - file.open(QIODevice::WriteOnly | QIODevice::Text); + QVERIFY(file.open(QIODevice::WriteOnly | QIODevice::Text)); QTextStream out( &file ); // NOTE: The unusual spacing is to ensure non-1-character whitespace. QString lineString = " 0 1 2\t3 4\t \t5 6 7 8 9 \n"; // Approximate 50kb text file - const int NbLines = (50*1024) / lineString.length() + 1; + const int NbLines = (50*1024) / lineString.size() + 1; for (int line = 0; line < NbLines; ++line) out << lineString; // File is automatically flushed and closed on destruction. } QFile file(testFileName); - file.open(QIODevice::ReadOnly | QIODevice::Text); + QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); QTextStream in( &file ); const int testValues[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; int value; @@ -1530,7 +1517,7 @@ void tst_QTextStream::read() { QFile::remove("testfile"); QFile file("testfile"); - file.open(QFile::WriteOnly); + QVERIFY(file.open(QFile::WriteOnly)); file.write("4.15 abc ole"); file.close(); @@ -1552,7 +1539,7 @@ void tst_QTextStream::read() // File larger than QTEXTSTREAM_BUFFERSIZE QFile::remove("testfile"); QFile file("testfile"); - file.open(QFile::WriteOnly); + QVERIFY(file.open(QFile::WriteOnly)); for (int i = 0; i < 16384 / 8; ++i) file.write("01234567"); file.write("0"); @@ -1608,8 +1595,8 @@ void tst_QTextStream::forceSign() // ------------------------------------------------------------------------------ void tst_QTextStream::read0d0d0a() { - QFile file("task113817.txt"); - file.open(QIODevice::ReadOnly | QIODevice::Text); + QFile file(QFINDTESTDATA("task113817.txt")); + QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); QTextStream stream(&file); while (!stream.atEnd()) @@ -1773,7 +1760,7 @@ void tst_QTextStream::utf8IncompleteAtBufferBoundary() "\342\200\223" "\342\200\223"); - data.open(QFile::WriteOnly | QFile::Truncate); + QVERIFY(data.open(QFile::WriteOnly | QFile::Truncate)); { QTextStream out(&data); out.setEncoding(QStringConverter::Utf8); @@ -1785,7 +1772,7 @@ void tst_QTextStream::utf8IncompleteAtBufferBoundary() } data.close(); - data.open(QFile::ReadOnly); + QVERIFY(data.open(QFile::ReadOnly)); QTextStream in(&data); QFETCH(bool, useLocale); @@ -1914,6 +1901,40 @@ void tst_QTextStream::QChar_operators_FromDevice() } // ------------------------------------------------------------------------------ +void tst_QTextStream::char16_t_operators_FromDevice_data() +{ + generateOperatorCharData(false); +} + +// ------------------------------------------------------------------------------ +void tst_QTextStream::char16_t_operators_FromDevice() +{ + QFETCH(QByteArray, input); + QFETCH(const QChar, qchar_output); + QFETCH(const QByteArray, write_output); + const char16_t char16_t_output = qchar_output.unicode(); + + QBuffer buf(&input); + buf.open(QBuffer::ReadOnly); + QTextStream stream(&buf); + stream.setEncoding(QStringConverter::Latin1); + char16_t tmp; + stream >> tmp; + QCOMPARE(tmp, qchar_output); + + QBuffer writeBuf; + writeBuf.open(QBuffer::WriteOnly); + + QTextStream writeStream(&writeBuf); + writeStream.setEncoding(QStringConverter::Latin1); + writeStream << char16_t_output; + writeStream.flush(); + + QCOMPARE(writeBuf.buffer().size(), write_output.size()); + QCOMPARE(writeBuf.buffer().constData(), write_output.constData()); +} + +// ------------------------------------------------------------------------------ void tst_QTextStream::char_operators_FromDevice_data() { generateOperatorCharData(false); @@ -2633,13 +2654,27 @@ void tst_QTextStream::manipulators_data() QTest::addColumn<QString>("textData"); QTest::addColumn<QByteArray>("result"); - QTest::newRow("no flags") << 10 << 0 << 0 << 0 << 5.0 << 5 << QString("five") << QByteArray("55five"); - QTest::newRow("rightadjust") << 10 << int(QTextStream::AlignRight) << 0 << 10 << 5.0 << 5 << QString("five") << QByteArray(" 5 5 five"); - QTest::newRow("leftadjust") << 10 << int(QTextStream::AlignLeft) << 0 << 10 << 5.0 << 5 << QString("five") << QByteArray("5 5 five "); - QTest::newRow("showpos") << 10 << int(QTextStream::AlignRight) << int(QTextStream::ForceSign) << 10 << 5.0 << 5 << QString("five") << QByteArray(" +5 +5 five"); - QTest::newRow("showpos2") << 10 << int(QTextStream::AlignRight) << int(QTextStream::ForceSign) << 5 << 3.14 << -5 << QString("five") << QByteArray("+3.14 -5 five"); - QTest::newRow("hex") << 16 << int(QTextStream::AlignRight) << int(QTextStream::ShowBase) << 5 << 3.14 << -5 << QString("five") << QByteArray(" 3.14 -0x5 five"); - QTest::newRow("hex") << 16 << int(QTextStream::AlignRight) << int(QTextStream::ShowBase | QTextStream::UppercaseBase) << 5 << 3.14 << -5 << QString("five") << QByteArray(" 3.14 -0X5 five"); + QTest::newRow("no flags") + << 10 << 0 << 0 << 0 << 5.0 << 5 << QString("five") << QByteArray("55five"); + QTest::newRow("rightadjust") + << 10 << int(QTextStream::AlignRight) << 0 << 10 << 5.0 << 5 << QString("five") + << QByteArray(" 5 5 five"); + QTest::newRow("leftadjust") + << 10 << int(QTextStream::AlignLeft) << 0 << 10 << 5.0 << 5 << QString("five") + << QByteArray("5 5 five "); + QTest::newRow("showpos-wide") + << 10 << int(QTextStream::AlignRight) << int(QTextStream::ForceSign) << 10 << 5.0 << 5 << + QString("five") << QByteArray(" +5 +5 five"); + QTest::newRow("showpos-pi") + << 10 << int(QTextStream::AlignRight) << int(QTextStream::ForceSign) << 5 << 3.14 << -5 << + QString("five") << QByteArray("+3.14 -5 five"); + QTest::newRow("hex-lower") + << 16 << int(QTextStream::AlignRight) << int(QTextStream::ShowBase) << 5 << 3.14 << -5 << + QString("five") << QByteArray(" 3.14 -0x5 five"); + QTest::newRow("hex-upper") + << 16 << int(QTextStream::AlignRight) + << int(QTextStream::ShowBase | QTextStream::UppercaseBase) + << 5 << 3.14 << -5 << QString("five") << QByteArray(" 3.14 -0X5 five"); } // ------------------------------------------------------------------------------ @@ -3027,6 +3062,57 @@ void tst_QTextStream::textModeOnEmptyRead() QVERIFY(file.isTextModeEnabled()); } +void tst_QTextStream::autodetectUnicode_data() +{ + QTest::addColumn<QStringConverter::Encoding>("encoding"); + QTest::newRow("Utf8") << QStringConverter::Utf8; + QTest::newRow("Utf16BE") << QStringConverter::Utf16BE; + QTest::newRow("Utf16LE") << QStringConverter::Utf16LE; + QTest::newRow("Utf32BE") << QStringConverter::Utf32BE; + QTest::newRow("Utf32LE") << QStringConverter::Utf32LE; +} + +void tst_QTextStream::autodetectUnicode() +{ + QFETCH(QStringConverter::Encoding, encoding); + + QTemporaryFile file; + QVERIFY(file.open()); + + QString original("HelloWorld👋"); + + { + QTextStream out(&file); + out.setGenerateByteOrderMark(true); + out.setEncoding(encoding); + out << original; + } + file.seek(0); + { + QTextStream in(&file); + QString actual; + in >> actual; + QCOMPARE(actual, original); + QCOMPARE(in.encoding(), encoding); + } + file.seek(0); + // Again, but change order of calls to QTextStream... + { + QTextStream out(&file); + out.setEncoding(encoding); + out.setGenerateByteOrderMark(true); + out << original; + } + file.seek(0); + { + QTextStream in(&file); + QString actual; + in >> actual; + QCOMPARE(actual, original); + QCOMPARE(in.encoding(), encoding); + } +} + // ------------------------------------------------------------------------------ diff --git a/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt b/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt index aae8b9f1e9..30c86491ff 100644 --- a/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qxmlstream/CMakeLists.txt @@ -1,18 +1,33 @@ -# Generated from qxmlstream.pro. +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qxmlstream Test: ##################################################################### +if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) + cmake_minimum_required(VERSION 3.16) + project(tst_qxmlstream LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + # Collect test data -list(APPEND test_data "data") -list(APPEND test_data "XML-Test-Suite") +file(GLOB_RECURSE test_data + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + data/* XML-Test-Suite/*) + +file(GLOB_RECURSE tokenError + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + tokenError/*) qt_internal_add_test(tst_qxmlstream SOURCES tst_qxmlstream.cpp - PUBLIC_LIBRARIES + LIBRARIES Qt::Network - Qt::Xml - TESTDATA ${test_data} + Qt::CorePrivate + Qt::TestPrivate + TESTDATA + ${test_data} + ${tokenError} ) diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest.zip b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest.zip Binary files differnew file mode 100644 index 0000000000..14ec3c5988 --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest.zip diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/CVS/Entries deleted file mode 100644 index 56dc3e5713..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/CVS/Entries +++ /dev/null @@ -1,6 +0,0 @@ -/canonxml.html/1.1.1.1/Wed Oct 17 09:52:58 2001// -/readme.html/1.1.1.1/Wed Oct 17 09:52:58 2001// -/xmltest.xml/1.11/Wed Apr 13 19:30:48 2005// -D/invalid//// -D/not-wf//// -D/valid//// diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/CVS/Repository deleted file mode 100644 index e4b881877e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -2001/XML-Test-Suite/xmlconf/xmltest diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/CVS/Root deleted file mode 100644 index 3c7177e4bb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/canonxml.html b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/canonxml.html deleted file mode 100644 index 2ba0edf6c6..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/canonxml.html +++ /dev/null @@ -1,44 +0,0 @@ -<HTML>
-<TITLE>Canonical XML</TITLE>
-<BODY>
-<H1>Canonical XML</H1>
-<P>
-This document defines a subset of XML called canonical XML.
-The intended use of canonical XML is in testing XML processors,
-as a representation of the result of parsing an XML document.
-<P>
-Every well-formed XML document has a unique structurally equivalent
-canonical XML document. Two structurally equivalent XML
-documents have a byte-for-byte identical canonical XML document.
-Canonicalizing an XML document requires only information that an XML
-processor is required to make available to an application.
-<P>
-A canonical XML document conforms to the following grammar:
-<PRE>
-CanonXML ::= Pi* element Pi*
-element ::= Stag (Datachar | Pi | element)* Etag
-Stag ::= '<' Name Atts '>'
-Etag ::= '</' Name '>'
-Pi ::= '<?' Name ' ' (((Char - S) Char*)? - (Char* '?>' Char*)) '?>'
-Atts ::= (' ' Name '=' '"' Datachar* '"')*
-Datachar ::= '&amp;' | '&lt;' | '&gt;' | '&quot;'
- | '&#9;'| '&#10;'| '&#13;'
- | (Char - ('&' | '<' | '>' | '"' | #x9 | #xA | #xD))
-Name ::= (see XML spec)
-Char ::= (see XML spec)
-S ::= (see XML spec)
-</PRE>
-<P>
-Attributes are in lexicographical order (in Unicode bit order).
-<P>
-A canonical XML document is encoded in UTF-8.
-<P>
-Ignorable white space is considered significant and is treated equivalently
-to data.
-<P>
-<ADDRESS>
-<A HREF="mailto:jjc@jclark.com">James Clark</A>
-</ADDRESS>
-
-</BODY>
-</HTML>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/002.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/002.ent deleted file mode 100644 index 4cb848b438..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/002.ent +++ /dev/null @@ -1,2 +0,0 @@ -<!ENTITY % e "(#PCDATA">
-<!ELEMENT doc %e;)>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/002.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/002.xml deleted file mode 100644 index 5a3a96d1ab..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/002.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "002.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/005.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/005.ent deleted file mode 100644 index 85e16474a6..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/005.ent +++ /dev/null @@ -1,2 +0,0 @@ -<!ENTITY % e ">">
-<!ELEMENT doc (#PCDATA) %e;
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/005.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/005.xml deleted file mode 100644 index 383553d24f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/005.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "005.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/006.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/006.ent deleted file mode 100644 index 116ca79657..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/006.ent +++ /dev/null @@ -1,2 +0,0 @@ -<!ENTITY % e "(#PCDATA)>">
-<!ELEMENT doc %e;
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/006.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/006.xml deleted file mode 100644 index 2f14e839e2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/006.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "006.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/CVS/Entries deleted file mode 100644 index 04159c511f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/CVS/Entries +++ /dev/null @@ -1,7 +0,0 @@ -/002.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/002.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/005.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/005.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/006.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/006.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -D/not-sa//// diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/CVS/Repository deleted file mode 100644 index 3df0ffe37c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -2001/XML-Test-Suite/xmlconf/xmltest/invalid diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/CVS/Root deleted file mode 100644 index 3c7177e4bb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/022.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/022.ent deleted file mode 100644 index 26f2d8beb2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/022.ent +++ /dev/null @@ -1,3 +0,0 @@ -<!ENTITY % e "INCLUDE[">
-<!ELEMENT doc (#PCDATA)>
-<![ %e; <!ATTLIST doc a1 CDATA "v1"> ]]>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/022.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/022.xml deleted file mode 100644 index b639f2551c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/022.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "022.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/CVS/Entries deleted file mode 100644 index 104a6d8a5a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/CVS/Entries +++ /dev/null @@ -1,3 +0,0 @@ -/022.ent/1.1/Tue Feb 26 18:02:12 2002// -/022.xml/1.1/Tue Feb 26 18:02:12 2002// -D/out//// diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/CVS/Repository deleted file mode 100644 index f86b20a1d9..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -2001/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/CVS/Root deleted file mode 100644 index 3c7177e4bb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/out/022.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/out/022.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/out/022.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/out/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/out/CVS/Entries deleted file mode 100644 index 9692ca4b59..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/out/CVS/Entries +++ /dev/null @@ -1,2 +0,0 @@ -/022.xml/1.1/Tue Feb 26 18:03:20 2002// -D diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/out/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/out/CVS/Repository deleted file mode 100644 index 54370965bc..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/out/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -2001/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/out diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/out/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/out/CVS/Root deleted file mode 100644 index 3c7177e4bb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/invalid/not-sa/out/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/CVS/Entries deleted file mode 100644 index 1784810501..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/CVS/Entries.Log b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/CVS/Entries.Log deleted file mode 100644 index 818f7c93e6..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/CVS/Entries.Log +++ /dev/null @@ -1,3 +0,0 @@ -A D/ext-sa//// -A D/not-sa//// -A D/sa//// diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/CVS/Repository deleted file mode 100644 index 18854d8755..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -2001/XML-Test-Suite/xmlconf/xmltest/not-wf diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/CVS/Root deleted file mode 100644 index 3c7177e4bb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/001.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/001.ent deleted file mode 100644 index 378a2074b7..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/001.ent +++ /dev/null @@ -1 +0,0 @@ -&e;
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/001.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/001.xml deleted file mode 100644 index aa624cbe71..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/001.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e SYSTEM "001.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/002.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/002.ent deleted file mode 100644 index 2cd184a213..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/002.ent +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" standalone="yes"?>
-data
-
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/002.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/002.xml deleted file mode 100644 index 9eaf91724f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/002.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "002.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/003.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/003.ent deleted file mode 100644 index ac292ee2f3..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/003.ent +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><?xml version="1.0" encoding="UTF-8"?>
-data
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/003.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/003.xml deleted file mode 100644 index bb60b663ef..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/003.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "003.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/CVS/Entries deleted file mode 100644 index 85dc74e395..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/CVS/Entries +++ /dev/null @@ -1,7 +0,0 @@ -/001.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/001.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/002.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/002.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/003.ent/1.2/Fri Feb 22 18:52:54 2002// -/003.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -D diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/CVS/Repository deleted file mode 100644 index 702914cf3a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -2001/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/CVS/Root deleted file mode 100644 index 3c7177e4bb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/ext-sa/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/001.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/001.ent deleted file mode 100644 index 00096e572e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/001.ent +++ /dev/null @@ -1,3 +0,0 @@ -<![ INCLUDE [
-<!ELEMENT doc (#PCDATA)>
-]>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/001.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/001.xml deleted file mode 100644 index 36188451ae..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/001.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "001.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/002.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/002.xml deleted file mode 100644 index dd73174135..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/002.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e "<?xml version='1.0' encoding='UTF-8'?>">
-%e;
-]>
-<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/003.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/003.ent deleted file mode 100644 index abf1b1a35e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/003.ent +++ /dev/null @@ -1,2 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<![ IGNORE [
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/003.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/003.xml deleted file mode 100644 index dd01f41126..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/003.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "003.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/004.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/004.ent deleted file mode 100644 index 552e4f520a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/004.ent +++ /dev/null @@ -1,2 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<![ INCLUDE [
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/004.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/004.xml deleted file mode 100644 index 20cdf6d0e5..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/004.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "004.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/005.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/005.ent deleted file mode 100644 index 9a369cef12..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/005.ent +++ /dev/null @@ -1,2 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-%e;
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/005.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/005.xml deleted file mode 100644 index 383553d24f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/005.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "005.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/006.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/006.ent deleted file mode 100644 index 771daf1915..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/006.ent +++ /dev/null @@ -1,3 +0,0 @@ -<![INCLUDE
-<!ELEMENT doc (#PCDATA)>
-]]>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/006.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/006.xml deleted file mode 100644 index 2f14e839e2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/006.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "006.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/007.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/007.ent deleted file mode 100644 index 9e9866d2ad..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/007.ent +++ /dev/null @@ -1,3 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/007.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/007.xml deleted file mode 100644 index 38897e34ea..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/007.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "007.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/008.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/008.ent deleted file mode 100644 index f8b1cd3dad..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/008.ent +++ /dev/null @@ -1,2 +0,0 @@ -<!ELEMENT doc ANY>
-<!ENTITY e "100%">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/008.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/008.xml deleted file mode 100644 index 54351009cd..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/008.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "008.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/009.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/009.ent deleted file mode 100644 index f70eaea9c4..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/009.ent +++ /dev/null @@ -1,3 +0,0 @@ -<!ELEMENT doc EMPTY>
-<!ENTITY % e "<!--">
-%e; -->
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/009.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/009.xml deleted file mode 100644 index 9aa72898c2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/009.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "009.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/010.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/010.ent deleted file mode 100644 index 54f3c821b8..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/010.ent +++ /dev/null @@ -1,2 +0,0 @@ -<!ENTITY % e "<!ELEMENT ">
-%e; doc (#PCDATA)>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/010.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/010.xml deleted file mode 100644 index 963e4c2f75..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/010.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "010.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/011.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/011.ent deleted file mode 100644 index aae4cc2929..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/011.ent +++ /dev/null @@ -1,3 +0,0 @@ -<!ENTITY % e1 "<!ELEMENT ">
-<!ENTITY % e2 ">">
-%e1; doc (#PCDATA) %e2;
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/011.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/011.xml deleted file mode 100644 index dd40c958c3..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/011.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "011.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/CVS/Entries deleted file mode 100644 index bfc0687397..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/CVS/Entries +++ /dev/null @@ -1,22 +0,0 @@ -/001.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/001.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/002.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/003.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/003.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/004.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/004.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/005.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/005.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/006.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/006.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/007.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/007.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/008.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/008.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/009.ent/1.1/Mon Mar 25 18:59:43 2002// -/009.xml/1.1/Mon Mar 25 18:59:17 2002// -/010.ent/1.1/Mon Mar 25 18:34:47 2002// -/010.xml/1.1/Mon Mar 25 18:33:57 2002// -/011.ent/1.1/Mon Mar 25 19:08:52 2002// -/011.xml/1.1/Mon Mar 25 19:08:40 2002// -D diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/CVS/Repository deleted file mode 100644 index 031f3dedd2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -2001/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/CVS/Root deleted file mode 100644 index 3c7177e4bb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/not-sa/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/001.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/001.xml deleted file mode 100644 index d33ec68dcd..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/001.xml +++ /dev/null @@ -1,5 +0,0 @@ -<doc>
-<doc
-?
-<a</a>
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/002.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/002.xml deleted file mode 100644 index 0a64d52428..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/002.xml +++ /dev/null @@ -1,4 +0,0 @@ -<doc>
-<.doc></.doc>
-</doc>
-
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/003.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/003.xml deleted file mode 100644 index e0b8bae4a4..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/003.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><? ?></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/004.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/004.xml deleted file mode 100644 index e85bc96e56..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/004.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><?target some data></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/005.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/005.xml deleted file mode 100644 index 7cd44ef10c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/005.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><?target some data?</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/006.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/006.xml deleted file mode 100644 index 8594c35cc7..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/006.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><!-- a comment -- another --></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/007.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/007.xml deleted file mode 100644 index 286756fdd5..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/007.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>& no refc</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/008.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/008.xml deleted file mode 100644 index 29ef40306b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/008.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>&.entity;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/009.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/009.xml deleted file mode 100644 index 8e3ff7de10..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/009.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>&#RE;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/010.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/010.xml deleted file mode 100644 index a6790846c9..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/010.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>A & B</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/011.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/011.xml deleted file mode 100644 index 57eaf9fc48..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/011.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/012.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/012.xml deleted file mode 100644 index 1b2539ffa6..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/012.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1=v1></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/013.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/013.xml deleted file mode 100644 index 3540df9143..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/013.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1'></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/014.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/014.xml deleted file mode 100644 index a613115609..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/014.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="<foo>"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/015.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/015.xml deleted file mode 100644 index f2baf947b5..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/015.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1=></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/016.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/016.xml deleted file mode 100644 index 22d4b2e265..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/016.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1" "v2"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/017.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/017.xml deleted file mode 100644 index a76f5929e9..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/017.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><![CDATA[</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/018.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/018.xml deleted file mode 100644 index 66e204acc4..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/018.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><![CDATA [ stuff]]></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/019.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/019.xml deleted file mode 100644 index b835c2d752..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/019.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/020.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/020.xml deleted file mode 100644 index b30cfcfc10..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/020.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="A & B"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/021.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/021.xml deleted file mode 100644 index 1bfa84aa64..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/021.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="a&b"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/022.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/022.xml deleted file mode 100644 index 44c803bf1b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/022.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="{:"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/023.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/023.xml deleted file mode 100644 index b877ae2a6b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/023.xml +++ /dev/null @@ -1 +0,0 @@ -<doc 12="34"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/024.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/024.xml deleted file mode 100644 index cf68f2c073..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/024.xml +++ /dev/null @@ -1,3 +0,0 @@ -<doc>
-<123></123>
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/025.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/025.xml deleted file mode 100644 index 6cba95cd78..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/025.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>]]></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/026.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/026.xml deleted file mode 100644 index 347984fa73..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/026.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>]]]></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/027.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/027.xml deleted file mode 100644 index cfafaf0d70..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/027.xml +++ /dev/null @@ -1,3 +0,0 @@ -<doc>
-<!-- abc
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/028.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/028.xml deleted file mode 100644 index 522714993a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/028.xml +++ /dev/null @@ -1,4 +0,0 @@ -<doc>
-<?a pi that is not closed
-</doc>
-
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/029.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/029.xml deleted file mode 100644 index 9a8008bc9f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/029.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>abc]]]>def</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/030.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/030.xml deleted file mode 100644 index 25861fa19b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/030.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>A form feed ( ) is not legal in data</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/031.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/031.xml deleted file mode 100644 index f946536f39..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/031.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><?pi a form feed ( ) is not allowed in a pi?></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/032.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/032.xml deleted file mode 100644 index 75952017ca..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/032.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><!-- a form feed ( ) is not allowed in a comment --></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/033.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/033.xml deleted file mode 100644 index afd2328402..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/033.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>abcdef</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/034.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/034.xml deleted file mode 100644 index d74a77719b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/034.xml +++ /dev/null @@ -1 +0,0 @@ -<doc >A form-feed is not white space or a name character</doc >
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/035.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/035.xml deleted file mode 100644 index e1fc920522..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/035.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>1 < 2 but not in XML</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/036.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/036.xml deleted file mode 100644 index b8ecb21ba1..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/036.xml +++ /dev/null @@ -1,2 +0,0 @@ -<doc></doc>
-Illegal data
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/037.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/037.xml deleted file mode 100644 index 2e02662926..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/037.xml +++ /dev/null @@ -1,2 +0,0 @@ -<doc></doc>
- 
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/038.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/038.xml deleted file mode 100644 index 68b2803f82..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/038.xml +++ /dev/null @@ -1 +0,0 @@ -<doc x="foo" y="bar" x="baz"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/039.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/039.xml deleted file mode 100644 index 80429e3e40..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/039.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><a></aa></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/040.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/040.xml deleted file mode 100644 index dc8ba5a434..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/040.xml +++ /dev/null @@ -1,2 +0,0 @@ -<doc></doc>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/041.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/041.xml deleted file mode 100644 index 30bcdd6bfe..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/041.xml +++ /dev/null @@ -1,2 +0,0 @@ -<doc/>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/042.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/042.xml deleted file mode 100644 index 4ae50efc7b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/042.xml +++ /dev/null @@ -1 +0,0 @@ -<doc/></doc/>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/043.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/043.xml deleted file mode 100644 index 41824eee4b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/043.xml +++ /dev/null @@ -1,2 +0,0 @@ -<doc/>
-Illegal data
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/044.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/044.xml deleted file mode 100644 index 3fc232dc37..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/044.xml +++ /dev/null @@ -1 +0,0 @@ -<doc/><doc/>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/045.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/045.xml deleted file mode 100644 index 00c10f00bf..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/045.xml +++ /dev/null @@ -1,4 +0,0 @@ -<doc>
-<a/
-</doc>
-
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/046.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/046.xml deleted file mode 100644 index 265cb15301..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/046.xml +++ /dev/null @@ -1,3 +0,0 @@ -<doc>
-<a/</a>
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/047.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/047.xml deleted file mode 100644 index d18a4a4440..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/047.xml +++ /dev/null @@ -1,3 +0,0 @@ -<doc>
-<a / >
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/048.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/048.xml deleted file mode 100644 index 67419c1ed5..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/048.xml +++ /dev/null @@ -1,3 +0,0 @@ -<doc>
-</doc>
-<![CDATA[]]>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/049.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/049.xml deleted file mode 100644 index 3cf0e79422..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/049.xml +++ /dev/null @@ -1,4 +0,0 @@ -<doc>
-<a><![CDATA[xyz]]]></a>
-<![CDATA[]]></a>
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/050.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/050.xml deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/050.xml +++ /dev/null diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/051.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/051.xml deleted file mode 100644 index b52df12cc4..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/051.xml +++ /dev/null @@ -1,3 +0,0 @@ -<!-- a comment -->
-<![CDATA[]]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/052.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/052.xml deleted file mode 100644 index 8283895990..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/052.xml +++ /dev/null @@ -1,3 +0,0 @@ -<!-- a comment -->
- 
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/053.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/053.xml deleted file mode 100644 index 9d7f36920f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/053.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></DOC>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/054.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/054.xml deleted file mode 100644 index eda553c6d3..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/054.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY foo PUBLIC "some public id">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/055.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/055.xml deleted file mode 100644 index cbb3683a9d..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/055.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc [
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/056.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/056.xml deleted file mode 100644 index a681684c58..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/056.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc -- a comment -- []>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/057.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/057.xml deleted file mode 100644 index 848d347120..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/057.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "whatever" -- a comment -->
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/058.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/058.xml deleted file mode 100644 index daba266af2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/058.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 (foo,bar) #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/059.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/059.xml deleted file mode 100644 index 316083dc25..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/059.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 NMTOKEN v1>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/060.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/060.xml deleted file mode 100644 index 9a610fd38f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/060.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 NAME #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/061.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/061.xml deleted file mode 100644 index 59181e706f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/061.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e PUBLIC "whatever""e.ent">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/062.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/062.xml deleted file mode 100644 index e62e9cd370..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/062.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY foo"some text">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/063.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/063.xml deleted file mode 100644 index 98675b9040..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/063.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<![INCLUDE[ ]]>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/064.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/064.xml deleted file mode 100644 index 3888c46b8b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/064.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST e a1 CDATA"foo">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/065.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/065.xml deleted file mode 100644 index da9cafd137..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/065.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1(foo|bar) #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/066.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/066.xml deleted file mode 100644 index 9c09eb4e5d..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/066.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 (foo|bar)#IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/067.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/067.xml deleted file mode 100644 index 7e0809bd34..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/067.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 (foo)"foo">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/068.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/068.xml deleted file mode 100644 index 53a80a83a8..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/068.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 NOTATION(foo) #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/069.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/069.xml deleted file mode 100644 index 6f891dd5e1..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/069.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!NOTATION eps SYSTEM "eps.exe">
-<!-- missing space before NDATA -->
-<!ENTITY foo SYSTEM "foo.eps"NDATA eps>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/070.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/070.xml deleted file mode 100644 index faf4b0ae4c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/070.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!-- a comment ending with three dashes --->
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/071.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/071.xml deleted file mode 100644 index 5bd3908968..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/071.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e1 "&e2;">
-<!ENTITY e2 "&e3;">
-<!ENTITY e3 "&e1;">
-]>
-<doc>&e1;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/072.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/072.xml deleted file mode 100644 index 743ba79429..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/072.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>&foo;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/073.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/073.xml deleted file mode 100644 index 2578af42ec..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/073.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "whatever">
-]>
-<doc>&f;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/074.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/074.xml deleted file mode 100644 index f8abaeb22c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/074.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "</foo><foo>">
-]>
-<doc>
-<foo>&e;</foo>
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/075.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/075.xml deleted file mode 100644 index d3dbf50ed6..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/075.xml +++ /dev/null @@ -1,7 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e1 "&e2;">
-<!ENTITY e2 "&e3;">
-<!ENTITY e3 "&e1;">
-]>
-<doc a="&e1;"></doc>
-
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/076.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/076.xml deleted file mode 100644 index 60546720e7..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/076.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a="&foo;"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/077.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/077.xml deleted file mode 100644 index f8ac23a5a2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/077.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY foo "&bar;">
-]>
-<doc a="&foo;"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/078.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/078.xml deleted file mode 100644 index 446cd85ef9..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/078.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA "&foo;">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/079.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/079.xml deleted file mode 100644 index da016fd3b2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/079.xml +++ /dev/null @@ -1,8 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e1 "&e2;">
-<!ENTITY e2 "&e3;">
-<!ENTITY e3 "&e1;">
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA "&e1;">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/080.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/080.xml deleted file mode 100644 index fa4b9e428d..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/080.xml +++ /dev/null @@ -1,8 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e1 "&e2;">
-<!ENTITY e2 "&e3;">
-<!ENTITY e3 "&e1;">
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #FIXED "&e1;">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/081.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/081.xml deleted file mode 100644 index d676100e8a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/081.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e SYSTEM "nul">
-]>
-<doc a="&e;"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/082.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/082.xml deleted file mode 100644 index 3217d6f8b4..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/082.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e SYSTEM "nul">
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA "&e;">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/083.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/083.xml deleted file mode 100644 index 469d43fd42..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/083.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e SYSTEM "nul" NDATA n>
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/084.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/084.xml deleted file mode 100644 index abbbcdea69..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/084.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e SYSTEM "nul" NDATA n>
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA "&e;">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/085.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/085.xml deleted file mode 100644 index ac0aeca3e4..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/085.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc PUBLIC "[" "null.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/086.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/086.xml deleted file mode 100644 index df6adfd884..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/086.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY foo PUBLIC "[" "null.xml">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/087.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/087.xml deleted file mode 100644 index ed49492a7a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/087.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!NOTATION foo PUBLIC "[" "null.ent">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/088.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/088.xml deleted file mode 100644 index da0a68c401..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/088.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #IMPLIED>
-<!ENTITY e '"'>
-]>
-<doc a="&e;></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/089.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/089.xml deleted file mode 100644 index 0c6cf404c2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/089.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY % foo SYSTEM "foo.xml" NDATA bar>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/090.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/090.xml deleted file mode 100644 index 3fb72f3cc0..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/090.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "<foo a='<'></foo>">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/091.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/091.xml deleted file mode 100644 index a61d0914f8..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/091.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!NOTATION n SYSTEM "n">
-<!ENTITY % foo SYSTEM "foo.xml" NDATA n>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/092.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/092.xml deleted file mode 100644 index be5266dada..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/092.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "<foo a='&'></foo>">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/093.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/093.xml deleted file mode 100644 index 4af61bc645..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/093.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>X</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/094.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/094.xml deleted file mode 100644 index bdec7a4660..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/094.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml VERSION="1.0"?>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/095.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/095.xml deleted file mode 100644 index 090b8b4eec..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/095.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml encoding="UTF-8" version="1.0"?>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/096.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/096.xml deleted file mode 100644 index d806c3b952..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/096.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0"encoding="UTF-8" ?>
-<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/097.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/097.xml deleted file mode 100644 index d4def544b0..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/097.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0' encoding="UTF-8" ?>
-<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/098.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/098.xml deleted file mode 100644 index 9798496aa3..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/098.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" version="1.0"?>
-<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/099.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/099.xml deleted file mode 100644 index d5be08eff0..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/099.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" valid="no" ?>
-<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/100.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/100.xml deleted file mode 100644 index 51e06231c2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/100.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" standalone="YES" ?>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/101.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/101.xml deleted file mode 100644 index afa5a455fc..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/101.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding=" UTF-8"?>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/102.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/102.xml deleted file mode 100644 index 8734adaa6e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/102.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0 " ?>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/103.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/103.xml deleted file mode 100644 index 6c4716798f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/103.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "<foo>">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/104.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/104.xml deleted file mode 100644 index dd57396239..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/104.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "<foo>">
-]>
-<doc>&e;</foo></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/105.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/105.xml deleted file mode 100644 index 809e705870..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/105.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?pi stuff?>
-<![CDATA[]]>
-<doc>
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/106.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/106.xml deleted file mode 100644 index d32319ef09..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/106.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?pi data?>
- <doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/107.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/107.xml deleted file mode 100644 index 3dfd8200e2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/107.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<![CDATA[]]>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/108.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/108.xml deleted file mode 100644 index af5cf50d48..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/108.xml +++ /dev/null @@ -1,3 +0,0 @@ -<doc>
-<![CDATA [ ]]>
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/109.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/109.xml deleted file mode 100644 index 5afc03e8db..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/109.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "<doc></doc>">
-]>
-&e;
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/110.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/110.xml deleted file mode 100644 index cf54ebe5c0..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/110.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "">
-]>
-<doc></doc>
-&e;
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/111.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/111.xml deleted file mode 100644 index 84a469f5d1..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/111.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "foo='bar'">
-]>
-<doc &e;></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/112.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/112.xml deleted file mode 100644 index 0c5c1a4341..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/112.xml +++ /dev/null @@ -1,3 +0,0 @@ -<doc>
-<![cdata[data]]>
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/113.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/113.xml deleted file mode 100644 index 04fc9d2318..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/113.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY % foo "&">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/114.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/114.xml deleted file mode 100644 index 1261ee49e1..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/114.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY foo "&">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/115.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/115.xml deleted file mode 100644 index f111dbe153..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/115.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "&">
-]>
-<doc a="&e;"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/116.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/116.xml deleted file mode 100644 index 84bb762fdf..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/116.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "&#9">
-]>
-<doc>&e;7;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/117.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/117.xml deleted file mode 100644 index e4a5e572ef..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/117.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "&">
-]>
-<doc>&e;#97;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/118.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/118.xml deleted file mode 100644 index 494d53d208..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/118.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "#">
-]>
-<doc>&&e;97;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/119.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/119.xml deleted file mode 100644 index aefaa44a1c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/119.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "&">
-]>
-<doc>
-&e;#38;
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/120.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/120.xml deleted file mode 100644 index b7d6ff9ce9..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/120.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "&">
-]>
-<doc>
-&e;
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/121.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/121.xml deleted file mode 100644 index 2b4adcc6b4..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/121.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY #DEFAULT "default">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/122.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/122.xml deleted file mode 100644 index ef0b057cee..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/122.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (a, (b) | c)?>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/123.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/123.xml deleted file mode 100644 index 06d65f045b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/123.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc ((doc?)))>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/124.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/124.xml deleted file mode 100644 index 3bbe0f91a6..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/124.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (doc|#PCDATA)*>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/125.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/125.xml deleted file mode 100644 index 5f9c22c0c6..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/125.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc ((#PCDATA))>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/126.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/126.xml deleted file mode 100644 index 13e74d6d5e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/126.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)+>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/127.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/127.xml deleted file mode 100644 index a379b9e539..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/127.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)?>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/128.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/128.xml deleted file mode 100644 index dd706bb21f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/128.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc CDATA>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/129.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/129.xml deleted file mode 100644 index d4e4461a6d..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/129.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc - - (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/130.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/130.xml deleted file mode 100644 index fa7be641f1..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/130.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (doc?) +(foo)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/131.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/131.xml deleted file mode 100644 index f34ed453b5..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/131.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (doc?) -(foo)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/132.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/132.xml deleted file mode 100644 index ab6cc416e9..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/132.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (a, (b, c), (d, (e, f) | g))?>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/133.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/133.xml deleted file mode 100644 index d2aa604e9f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/133.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (a *)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/134.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/134.xml deleted file mode 100644 index c8919c5ef8..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/134.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (a) *>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/135.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/135.xml deleted file mode 100644 index e639e8b6ea..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/135.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (a & b)?>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/136.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/136.xml deleted file mode 100644 index 499e68bcea..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/136.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc O O (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/137.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/137.xml deleted file mode 100644 index 723b77f776..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/137.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc(#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/138.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/138.xml deleted file mode 100644 index 16934cc88e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/138.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (doc*?)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/139.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/139.xml deleted file mode 100644 index 34df52ed93..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/139.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc ()>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/140.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/140.xml deleted file mode 100644 index 467d5ed301..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/140.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "<゚></゚>">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/141.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/141.xml deleted file mode 100644 index 409d0a7568..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/141.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "<X๜></X๜>">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/142.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/142.xml deleted file mode 100644 index 20e88f88b3..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/142.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>�</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/143.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/143.xml deleted file mode 100644 index 0ee1c614f8..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/143.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/144.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/144.xml deleted file mode 100644 index 437548c0ba..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/144.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/145.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/145.xml deleted file mode 100644 index 71b187a933..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/145.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>�</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/146.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/146.xml deleted file mode 100644 index d0bfbca723..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/146.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>�</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/147.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/147.xml deleted file mode 100644 index 3b6145615f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/147.xml +++ /dev/null @@ -1,3 +0,0 @@ -
-<?xml version="1.0"?>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/148.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/148.xml deleted file mode 100644 index 774dce18fd..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/148.xml +++ /dev/null @@ -1,3 +0,0 @@ -<!-- -->
-<?xml version="1.0"?>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/149.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/149.xml deleted file mode 100644 index 725eea0dec..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/149.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<?xml version="1.0"?>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/150.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/150.xml deleted file mode 100644 index 44f6b6df92..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/150.xml +++ /dev/null @@ -1,3 +0,0 @@ -<doc>
-<?xml version="1.0"?>
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/151.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/151.xml deleted file mode 100644 index fecc4f24e3..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/151.xml +++ /dev/null @@ -1,3 +0,0 @@ -<doc>
-</doc>
-<?xml version="1.0"?>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/152.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/152.xml deleted file mode 100644 index b5c5cb26ae..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/152.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml encoding="UTF-8"?>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/153.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/153.xml deleted file mode 100644 index 5e2973707e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/153.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e "<?xml encoding='UTF-8'?>">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/154.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/154.xml deleted file mode 100644 index 96e01d63f5..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/154.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?XML version="1.0"?>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/155.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/155.xml deleted file mode 100644 index 4f16d0f163..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/155.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xmL version="1.0"?>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/156.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/156.xml deleted file mode 100644 index c6d93fd312..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/156.xml +++ /dev/null @@ -1,3 +0,0 @@ -<doc>
-<?xMl version="1.0"?>
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/157.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/157.xml deleted file mode 100644 index 2f058dac3e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/157.xml +++ /dev/null @@ -1,3 +0,0 @@ -<doc>
-<?xmL?>
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/158.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/158.xml deleted file mode 100644 index 32b90b722d..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/158.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!NOTATION gif PUBLIC "image/gif" "">
-<!ATTLIST #NOTATION gif a1 CDATA #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/159.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/159.xml deleted file mode 100644 index 066244cb91..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/159.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e "<![CDATA[Tim & Michael]]>">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/160.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/160.xml deleted file mode 100644 index 85424acb1b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/160.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e "">
-<!ENTITY foo "%e;">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/161.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/161.xml deleted file mode 100644 index 4f8a5b7b6b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/161.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY % e "#PCDATA">
-<!ELEMENT doc (%e;)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/162.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/162.xml deleted file mode 100644 index efae4b190e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/162.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e1 "">
-<!ENTITY % e2 "%e1;">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/163.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/163.xml deleted file mode 100644 index e14fb76c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/163.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e "">
-]>
-%e;
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/164.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/164.xml deleted file mode 100644 index 98dd267c21..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/164.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e "">
-] %e; >
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/165.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/165.xml deleted file mode 100644 index 36c04618ef..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/165.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY% e "">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/166.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/166.xml deleted file mode 100644 index ee2ce28630..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/166.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/167.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/167.xml deleted file mode 100644 index 9bdc6c1278..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/167.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/168.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/168.xml deleted file mode 100644 index f83221a3ad..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/168.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/169.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/169.xml deleted file mode 100644 index 310029b976..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/169.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/170.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/170.xml deleted file mode 100644 index cfa0aee155..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/170.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/171.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/171.xml deleted file mode 100644 index 48b5c7d3bc..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/171.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!-- -->
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/172.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/172.xml deleted file mode 100644 index 6651d4d299..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/172.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?pi ?>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/173.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/173.xml deleted file mode 100644 index f9f9f42023..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/173.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a=""></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/174.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/174.xml deleted file mode 100644 index 42bef861c6..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/174.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><![CDATA[]]></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/175.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/175.xml deleted file mode 100644 index 69912f36d2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/175.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e "">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/176.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/176.xml deleted file mode 100644 index 9c8e2e47d1..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/176.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [ -<!ELEMENT doc (#PCDATA)> -]> -<doc> diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/177.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/177.xml deleted file mode 100644 index 6bc8228879..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/177.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>A</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/178.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/178.xml deleted file mode 100644 index e8f2d18eed..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/178.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a=""></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/179.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/179.xml deleted file mode 100644 index e8f1f419db..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/179.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/180.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/180.xml deleted file mode 100644 index 569d553a8c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/180.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA "&e;">
-<!ENTITY e "v">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/181.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/181.xml deleted file mode 100644 index 4341d99ee2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/181.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "<![CDATA[">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&e;]]></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/182.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/182.xml deleted file mode 100644 index 920f431666..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/182.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "<!--">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&e;--></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/183.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/183.xml deleted file mode 100644 index 7a5677de54..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/183.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA | foo*)* >
-<!ELEMENT foo EMPTY>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/184.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/184.xml deleted file mode 100644 index 103384a06e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/184.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA | (foo))* >
-<!ELEMENT foo EMPTY>
-]>
-<doc></doc>
-
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/185.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/185.ent deleted file mode 100644 index e557426454..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/185.ent +++ /dev/null @@ -1 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/185.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/185.xml deleted file mode 100644 index 81d5ef4bcd..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/185.xml +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" standalone="yes"?>
-<!DOCTYPE doc SYSTEM "185.ent">
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/186.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/186.xml deleted file mode 100644 index 85b26ec0a2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/186.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE a [
-<!ELEMENT a EMPTY>
-<!ATTLIST a b CDATA #IMPLIED d CDATA #IMPLIED>
-]>
-<a b="c"d="e"/>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/CVS/Entries deleted file mode 100644 index aef1bd67df..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/CVS/Entries +++ /dev/null @@ -1,189 +0,0 @@ -/001.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/002.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/003.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/004.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/005.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/006.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/007.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/008.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/009.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/010.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/011.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/012.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/013.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/014.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/015.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/016.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/017.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/018.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/019.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/020.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/021.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/022.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/023.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/024.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/025.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/026.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/027.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/028.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/029.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/030.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/031.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/032.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/033.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/034.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/035.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/036.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/037.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/038.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/039.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/040.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/041.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/042.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/043.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/044.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/045.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/046.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/047.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/048.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/049.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/050.xml/1.1/Mon Feb 11 18:42:19 2002// -/051.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/052.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/053.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/054.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/055.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/056.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/057.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/058.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/059.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/060.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/061.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/062.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/063.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/064.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/065.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/066.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/067.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/068.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/069.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/070.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/071.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/072.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/073.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/074.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/075.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/076.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/077.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/078.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/079.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/080.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/081.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/082.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/083.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/084.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/085.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/086.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/087.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/088.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/089.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/090.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/091.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/092.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/093.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/094.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/095.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/096.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/097.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/098.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/099.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/100.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/101.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/102.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/103.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/104.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/105.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/106.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/107.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/108.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/109.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/110.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/111.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/112.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/113.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/114.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/115.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/116.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/117.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/118.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/119.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/120.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/121.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/122.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/123.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/124.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/125.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/126.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/127.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/128.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/129.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/130.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/131.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/132.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/133.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/134.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/135.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/136.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/137.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/138.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/139.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/140.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/141.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/142.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/143.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/144.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/145.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/146.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/147.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/148.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/149.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/150.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/151.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/152.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/153.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/154.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/155.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/156.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/157.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/158.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/159.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/160.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/161.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/162.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/163.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/164.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/165.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/166.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/167.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/168.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/169.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/170.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/171.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/172.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/173.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/174.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/175.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/176.xml/1.2/Mon Apr 22 13:20:31 2002// -/177.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/178.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/179.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/180.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/181.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/182.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/183.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/184.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/185.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/185.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/186.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/null.ent/1.1/Mon Feb 11 18:43:34 2002// -D diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/CVS/Repository deleted file mode 100644 index ede48b429c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -2001/XML-Test-Suite/xmlconf/xmltest/not-wf/sa diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/CVS/Root deleted file mode 100644 index 3c7177e4bb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/null.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/null.ent deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/not-wf/sa/null.ent +++ /dev/null diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/readme.html b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/readme.html deleted file mode 100644 index fc7310c68e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/readme.html +++ /dev/null @@ -1,60 +0,0 @@ -<HTML>
-<TITLE>XML Test Cases</TITLE>
-<BODY>
-<H1>XML Test Cases version 1998-11-18</H1>
-<P>
-Copyright (C) 1998 James Clark. All rights reserved. Permission is
-granted to copy and modify this collection in any way for internal use
-within a company or organization. Permission is granted to
-redistribute the file <code>xmltest.zip</code> containing this
-collection to third parties provided that no modifications of any kind
-are made to this file. Note that permission to distribute the
-collection in any other form is not granted.
-<P>
-The collection is structured into three directories:
-<DL>
-<DT><CODE>not-wf</CODE>
-<DD>this contains cases that are not well-formed XML documents
-<DT><CODE>valid</CODE>
-<DD>this contains cases that are valid XML documents
-<DT><CODE>invalid</CODE>
-<DD>this contains cases that are well-formed XML documents
-but are not valid XML documents
-</DL>
-<P>
-The <CODE>not-wf</CODE> and <CODE>valid</CODE> directories each have
-three subdirectories:
-<DL>
-<DT>
-<CODE>sa</CODE>
-<DD>
-this contains cases that are standalone (as defined in XML) and do not
-have references to external general entities
-<DT>
-<CODE>ext-sa</CODE>
-<DD>
-this contains case that are standalone and have references to external
-general entities
-<DT>
-<CODE>not-sa</CODE>
-<DD>
-this contains cases that are not standalone
-</DL>
-<P>
-In each directory, files with a <CODE>.xml</CODE> extension are the
-XML document test cases, and files with a <CODE>.ent</CODE> extension
-are external entities referenced by the test cases.
-<P>
-Within the <CODE>valid</CODE> directory, each of these three
-subdirectories has an <CODE>out</CODE> subdirectory which contains an
-equivalent <A HREF="canonxml.html">canonical XML</A> document for each
-of the cases.
-<P>
-<P>
-Bug reports and contributions of new test cases are welcome.
-<P>
-<ADDRESS>
-<A HREF="mailto:jjc@jclark.com">James Clark</A>
-</ADDRESS>
-</BODY>
-</HTML>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/CVS/Entries deleted file mode 100644 index 1784810501..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/CVS/Entries +++ /dev/null @@ -1 +0,0 @@ -D diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/CVS/Entries.Log b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/CVS/Entries.Log deleted file mode 100644 index 818f7c93e6..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/CVS/Entries.Log +++ /dev/null @@ -1,3 +0,0 @@ -A D/ext-sa//// -A D/not-sa//// -A D/sa//// diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/CVS/Repository deleted file mode 100644 index 48324028e6..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -2001/XML-Test-Suite/xmlconf/xmltest/valid diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/CVS/Root deleted file mode 100644 index 3c7177e4bb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/001.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/001.ent deleted file mode 100644 index 1cff3fd44f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/001.ent +++ /dev/null @@ -1 +0,0 @@ -Data
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/001.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/001.xml deleted file mode 100644 index 147d70d2d1..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/001.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "001.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/002.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/002.ent deleted file mode 100644 index 45f6d8e74e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/002.ent +++ /dev/null @@ -1 +0,0 @@ -Data
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/002.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/002.xml deleted file mode 100644 index 9eaf91724f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/002.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "002.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/003.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/003.ent deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/003.ent +++ /dev/null diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/003.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/003.xml deleted file mode 100644 index bb60b663ef..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/003.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "003.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/004.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/004.ent deleted file mode 100644 index 3436f20001..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/004.ent +++ /dev/null @@ -1 +0,0 @@ -Data
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/004.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/004.xml deleted file mode 100644 index 074498ce19..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/004.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "004.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/005.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/005.ent deleted file mode 100644 index c6e97f821f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/005.ent +++ /dev/null @@ -1 +0,0 @@ -<e/><e/><e/>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/005.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/005.xml deleted file mode 100644 index 82a6228205..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/005.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (e*)>
-<!ELEMENT e EMPTY>
-<!ENTITY e SYSTEM "005.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/006.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/006.ent deleted file mode 100644 index 4df2f0c2ac..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/006.ent +++ /dev/null @@ -1,4 +0,0 @@ -Data
-<e/>
-More data
-<e/>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/006.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/006.xml deleted file mode 100644 index 0b326cad4c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/006.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA|e)*>
-<!ELEMENT e EMPTY>
-<!ENTITY e SYSTEM "006.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/007.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/007.ent Binary files differdeleted file mode 100644 index ab1d696dd7..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/007.ent +++ /dev/null diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/007.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/007.xml deleted file mode 100644 index 825e3b286a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/007.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "007.ent">
-]>
-<doc>X&e;Z</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/008.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/008.ent Binary files differdeleted file mode 100644 index c6ca61f9c8..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/008.ent +++ /dev/null diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/008.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/008.xml deleted file mode 100644 index 3c001b6cb3..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/008.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "008.ent">
-]>
-<doc>X&e;Z</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/009.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/009.ent deleted file mode 100644 index 67c3297611..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/009.ent +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/009.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/009.xml deleted file mode 100644 index a5866e5a77..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/009.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "009.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/010.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/010.ent deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/010.ent +++ /dev/null diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/010.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/010.xml deleted file mode 100644 index 418e9b0141..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/010.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "010.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/011.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/011.ent deleted file mode 100644 index b19be3a497..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/011.ent +++ /dev/null @@ -1 +0,0 @@ -xyzzy
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/011.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/011.xml deleted file mode 100644 index 2ceefa1d21..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/011.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e PUBLIC "a not very interesting file" "011.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/012.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/012.ent deleted file mode 100644 index 8eb1fb9c41..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/012.ent +++ /dev/null @@ -1 +0,0 @@ -&e4;
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/012.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/012.xml deleted file mode 100644 index 5a8f009b4a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/012.xml +++ /dev/null @@ -1,9 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e1 "&e2;">
-<!ENTITY e2 "&e3;">
-<!ENTITY e3 SYSTEM "012.ent">
-<!ENTITY e4 "&e5;">
-<!ENTITY e5 "(e5)">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&e1;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/013.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/013.ent deleted file mode 100644 index 7f25c502dd..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/013.ent +++ /dev/null @@ -1 +0,0 @@ -<e/>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/013.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/013.xml deleted file mode 100644 index 7717c97afe..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/013.xml +++ /dev/null @@ -1,10 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (e)>
-<!ELEMENT e (#PCDATA)>
-<!ATTLIST e
- a1 CDATA "a1 default"
- a2 NMTOKENS "a2 default"
->
-<!ENTITY x SYSTEM "013.ent">
-]>
-<doc>&x;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/014.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/014.ent Binary files differdeleted file mode 100644 index 470fd6fe44..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/014.ent +++ /dev/null diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/014.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/014.xml deleted file mode 100644 index 816fd1e796..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/014.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e SYSTEM "014.ent">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/CVS/Entries deleted file mode 100644 index 33a4a0da95..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/CVS/Entries +++ /dev/null @@ -1,29 +0,0 @@ -/001.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/001.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/002.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/002.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/003.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/003.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/004.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/004.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/005.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/005.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/006.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/006.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/007.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/007.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/008.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/008.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/009.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/009.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/010.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/010.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/011.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/011.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/012.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/012.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/013.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/013.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/014.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/014.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -D/out//// diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/CVS/Repository deleted file mode 100644 index 3753e3a5c9..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -2001/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/CVS/Root deleted file mode 100644 index 3c7177e4bb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/001.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/001.xml deleted file mode 100644 index 0a7acf8ebe..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/001.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>Data </doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/002.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/002.xml deleted file mode 100644 index d4a445e555..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/002.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>Data</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/003.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/003.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/003.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/004.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/004.xml deleted file mode 100644 index 0a7acf8ebe..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/004.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>Data </doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/005.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/005.xml deleted file mode 100644 index 6e293aa70e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/005.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><e></e><e></e><e></e></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/006.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/006.xml deleted file mode 100644 index 04b6fc82ee..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/006.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>Data <e></e> More data <e></e> </doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/007.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/007.xml deleted file mode 100644 index ab2a74c9d1..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/007.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>XYZ</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/008.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/008.xml deleted file mode 100644 index ab2a74c9d1..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/008.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>XYZ</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/009.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/009.xml deleted file mode 100644 index a79dff65fd..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/009.xml +++ /dev/null @@ -1 +0,0 @@ -<doc> </doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/010.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/010.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/010.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/011.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/011.xml deleted file mode 100644 index bf275adb2b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/011.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>xyzzy </doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/012.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/012.xml deleted file mode 100644 index 81a251cb4b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/012.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>(e5)</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/013.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/013.xml deleted file mode 100644 index 524d94ee6b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/013.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><e a1="a1 default" a2="a2 default"></e></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/014.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/014.xml deleted file mode 100644 index 71c6dc3e8e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/014.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>data</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/CVS/Entries deleted file mode 100644 index 577936756f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/CVS/Entries +++ /dev/null @@ -1,15 +0,0 @@ -/001.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/002.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/003.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/004.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/005.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/006.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/007.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/008.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/009.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/010.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/011.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/012.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/013.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/014.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -D diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/CVS/Repository deleted file mode 100644 index 889051e1ae..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -2001/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/CVS/Root deleted file mode 100644 index 3c7177e4bb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/ext-sa/out/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/001.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/001.ent deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/001.ent +++ /dev/null diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/001.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/001.xml deleted file mode 100644 index 2d6f41a137..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/001.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc SYSTEM "001.ent" [
-<!ELEMENT doc EMPTY>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/002.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/002.ent deleted file mode 100644 index 67c3297611..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/002.ent +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/002.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/002.xml deleted file mode 100644 index 023fce8499..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/002.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc SYSTEM "002.ent" [
-<!ELEMENT doc EMPTY>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/003-1.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/003-1.ent deleted file mode 100644 index 931f3ad6d8..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/003-1.ent +++ /dev/null @@ -1,3 +0,0 @@ -<!ELEMENT doc EMPTY>
-<!ENTITY % e SYSTEM "003-2.ent">
-<!ATTLIST doc a1 CDATA %e; "v1">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/003-2.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/003-2.ent deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/003-2.ent +++ /dev/null diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/003.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/003.xml deleted file mode 100644 index 63a5e8bdfc..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/003.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "003-1.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/004-1.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/004-1.ent deleted file mode 100644 index 40f7ff58a2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/004-1.ent +++ /dev/null @@ -1,4 +0,0 @@ -<!ELEMENT doc EMPTY>
-<!ENTITY % e1 SYSTEM "004-2.ent">
-<!ENTITY % e2 "%e1;">
-%e1;
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/004-2.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/004-2.ent deleted file mode 100644 index 61def75cb7..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/004-2.ent +++ /dev/null @@ -1 +0,0 @@ -<!ATTLIST doc a1 CDATA "value">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/004.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/004.xml deleted file mode 100644 index adc9201496..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/004.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "004-1.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/005-1.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/005-1.ent deleted file mode 100644 index ade9599032..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/005-1.ent +++ /dev/null @@ -1,3 +0,0 @@ -<!ELEMENT doc EMPTY>
-<!ENTITY % e SYSTEM "005-2.ent">
-%e;
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/005-2.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/005-2.ent deleted file mode 100644 index bef50b1f38..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/005-2.ent +++ /dev/null @@ -1 +0,0 @@ -<!ATTLIST doc a1 CDATA "v1">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/005.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/005.xml deleted file mode 100644 index 6bd44cfee0..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/005.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "005-1.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/006.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/006.ent deleted file mode 100644 index 8f305a82bd..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/006.ent +++ /dev/null @@ -1,2 +0,0 @@ -<!ELEMENT doc EMPTY>
-<!ATTLIST doc a1 CDATA "w1" a2 CDATA "w2">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/006.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/006.xml deleted file mode 100644 index eb80bb7409..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/006.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc SYSTEM "006.ent" [
-<!ATTLIST doc a1 CDATA "v1">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/007.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/007.ent deleted file mode 100644 index fbf4ca4947..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/007.ent +++ /dev/null @@ -1,2 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "v1">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/007.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/007.xml deleted file mode 100644 index 38897e34ea..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/007.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "007.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/008.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/008.ent deleted file mode 100644 index fbf4ca4947..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/008.ent +++ /dev/null @@ -1,2 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "v1">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/008.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/008.xml deleted file mode 100644 index bf777a7ff2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/008.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc PUBLIC "whatever" "008.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/009.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/009.ent deleted file mode 100644 index fbf4ca4947..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/009.ent +++ /dev/null @@ -1,2 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "v1">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/009.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/009.xml deleted file mode 100644 index c17562fe68..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/009.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc PUBLIC "whatever" "009.ent" [
-<!ATTLIST doc a2 CDATA "v2">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/010.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/010.ent deleted file mode 100644 index 52a28f5deb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/010.ent +++ /dev/null @@ -1,2 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "v2">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/010.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/010.xml deleted file mode 100644 index 2786b328f3..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/010.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc SYSTEM "010.ent" [
-<!ATTLIST doc a1 CDATA "v1">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/011.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/011.ent deleted file mode 100644 index fbf4ca4947..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/011.ent +++ /dev/null @@ -1,2 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "v1">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/011.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/011.xml deleted file mode 100644 index 03b482bbb6..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/011.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY % e SYSTEM "011.ent">
-%e;
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/012.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/012.ent deleted file mode 100644 index 7e372e65e9..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/012.ent +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "v1">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/012.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/012.xml deleted file mode 100644 index 1967edbba7..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/012.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY % e SYSTEM "012.ent">
-%e;
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/013.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/013.ent deleted file mode 100644 index a3691d9f08..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/013.ent +++ /dev/null @@ -1,4 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<![ INCLUDE [
-<!ATTLIST doc a1 CDATA "v1">
-]]>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/013.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/013.xml deleted file mode 100644 index cf44f2600a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/013.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "013.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/014.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/014.ent deleted file mode 100644 index 6eaf779329..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/014.ent +++ /dev/null @@ -1,4 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<![ %e; [
-<!ATTLIST doc a1 CDATA "v1">
-]]>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/014.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/014.xml deleted file mode 100644 index bd08502489..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/014.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc SYSTEM "014.ent" [
-<!ENTITY % e "INCLUDE">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/015.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/015.ent deleted file mode 100644 index 00d2f30e1d..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/015.ent +++ /dev/null @@ -1,5 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<![ %e; [
-<!ATTLIST doc a1 CDATA "v1">
-]]>
-<!ATTLIST doc a2 CDATA "v2">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/015.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/015.xml deleted file mode 100644 index e04e75ffca..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/015.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc SYSTEM "015.ent" [
-<!ENTITY % e "IGNORE">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/016.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/016.ent deleted file mode 100644 index bf77ef8336..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/016.ent +++ /dev/null @@ -1,4 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<![%e;[
-<!ATTLIST doc a1 CDATA "v1">
-]]>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/016.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/016.xml deleted file mode 100644 index 4ccf4af350..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/016.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc SYSTEM "016.ent" [
-<!ENTITY % e "INCLUDE">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/017.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/017.ent deleted file mode 100644 index ffd9adde61..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/017.ent +++ /dev/null @@ -1,3 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e "<!ATTLIST doc a1 CDATA 'v1'>">
-%e;
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/017.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/017.xml deleted file mode 100644 index 7fe18f4c7a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/017.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "017.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/018.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/018.ent deleted file mode 100644 index 2d46f76fc3..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/018.ent +++ /dev/null @@ -1,3 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e "'v1'">
-<!ATTLIST doc a1 CDATA %e;>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/018.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/018.xml deleted file mode 100644 index 31e90f2405..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/018.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "018.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/019.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/019.ent deleted file mode 100644 index d18201a98b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/019.ent +++ /dev/null @@ -1,3 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e "'v1'">
-<!ATTLIST doc a1 CDATA%e;>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/019.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/019.xml deleted file mode 100644 index b7a18faba0..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/019.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "019.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/020.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/020.ent deleted file mode 100644 index 815291c6d2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/020.ent +++ /dev/null @@ -1,3 +0,0 @@ -<!ENTITY % e "doc">
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST%e;a1 CDATA "v1">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/020.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/020.xml deleted file mode 100644 index d70892f7ad..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/020.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "020.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/021.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/021.ent deleted file mode 100644 index 9f8f2afd2b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/021.ent +++ /dev/null @@ -1,3 +0,0 @@ -<!ENTITY % e "doc a1 CDATA">
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST %e; "v1">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/021.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/021.xml deleted file mode 100644 index 70c28730db..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/021.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "021.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/023.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/023.ent deleted file mode 100644 index e3268819f7..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/023.ent +++ /dev/null @@ -1,5 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e1 "do">
-<!ENTITY % e2 "c">
-<!ENTITY % e3 "%e1;%e2;">
-<!ATTLIST %e3; a1 CDATA "v1">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/023.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/023.xml deleted file mode 100644 index 1c2484b70b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/023.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "023.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/024.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/024.ent deleted file mode 100644 index aa6d0eccac..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/024.ent +++ /dev/null @@ -1,4 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e1 "'v1'">
-<!ENTITY % e2 'a1 CDATA %e1;'>
-<!ATTLIST doc %e2;>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/024.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/024.xml deleted file mode 100644 index 96e1ecb61b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/024.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "024.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/025.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/025.ent deleted file mode 100644 index 389d259eb1..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/025.ent +++ /dev/null @@ -1,5 +0,0 @@ -<!ELEMENT doc EMPTY>
-<!ENTITY % e "x">
-<!ENTITY % e "y">
-<!ENTITY % v "'%e;'">
-<!ATTLIST doc a1 CDATA %v;>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/025.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/025.xml deleted file mode 100644 index 8fdbc14c47..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/025.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "025.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/026.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/026.ent deleted file mode 100644 index bdc93af639..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/026.ent +++ /dev/null @@ -1 +0,0 @@ -<!ATTLIST doc a1 CDATA "w1">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/026.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/026.xml deleted file mode 100644 index 7b109c0913..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/026.xml +++ /dev/null @@ -1,7 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc ANY>
-<!ENTITY % e SYSTEM "026.ent">
-%e;
-<!ATTLIST doc a1 CDATA "x1" a2 CDATA "x2">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/027.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/027.ent deleted file mode 100644 index 712cce3700..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/027.ent +++ /dev/null @@ -1,2 +0,0 @@ -<!ENTITY % e "">
-<!ELEMENT doc (#PCDATA %e;)>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/027.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/027.xml deleted file mode 100644 index d0c8c7abb5..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/027.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "027.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/028.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/028.ent deleted file mode 100644 index ac249d7b2c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/028.ent +++ /dev/null @@ -1,2 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<![INCLUDE[<!ATTLIST doc a1 CDATA "v1">]]>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/028.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/028.xml deleted file mode 100644 index 50e5248cbf..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/028.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "028.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/029.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/029.ent deleted file mode 100644 index df94df5560..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/029.ent +++ /dev/null @@ -1,3 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<![IGNORE[<!ATTLIST doc a1 CDATA "v1">]]>
-<!ATTLIST doc a1 CDATA "v2">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/029.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/029.xml deleted file mode 100644 index 07e226c1d7..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/029.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "029.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/030.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/030.ent deleted file mode 100644 index e3864460df..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/030.ent +++ /dev/null @@ -1,3 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<![IGNORE[]]>
-<![INCLUDE[]]>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/030.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/030.xml deleted file mode 100644 index 01fc2be4ca..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/030.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "030.ent">
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/031-1.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/031-1.ent deleted file mode 100644 index f7f94ab152..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/031-1.ent +++ /dev/null @@ -1,3 +0,0 @@ -<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e SYSTEM "031-2.ent">
-<!ENTITY e "<![CDATA[%e;]]>">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/031-2.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/031-2.ent deleted file mode 100644 index bef50b1f38..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/031-2.ent +++ /dev/null @@ -1 +0,0 @@ -<!ATTLIST doc a1 CDATA "v1">
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/031.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/031.xml deleted file mode 100644 index c3fe5fca71..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/031.xml +++ /dev/null @@ -1,2 +0,0 @@ -<!DOCTYPE doc SYSTEM "031-1.ent">
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/CVS/Entries deleted file mode 100644 index 65ee741d6c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/CVS/Entries +++ /dev/null @@ -1,65 +0,0 @@ -/001.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/001.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/002.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/002.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/003-1.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/003-2.ent/1.1/Mon Feb 11 18:45:43 2002// -/003.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/004-1.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/004-2.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/004.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/005-1.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/005-2.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/005.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/006.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/006.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/007.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/007.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/008.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/008.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/009.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/009.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/010.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/010.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/011.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/011.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/012.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/012.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/013.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/013.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/014.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/014.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/015.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/015.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/016.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/016.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/017.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/017.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/018.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/018.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/019.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/019.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/020.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/020.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/021.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/021.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/023.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/023.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/024.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/024.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/025.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/025.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/026.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/026.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/027.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/027.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/028.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/028.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/029.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/029.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/030.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/030.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/031-1.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/031-2.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/031.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -D/out//// diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/CVS/Repository deleted file mode 100644 index b16565a893..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -2001/XML-Test-Suite/xmlconf/xmltest/valid/not-sa diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/CVS/Root deleted file mode 100644 index 3c7177e4bb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/001.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/001.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/001.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/002.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/002.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/002.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/003.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/003.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/003.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/004.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/004.xml deleted file mode 100644 index bdc39e2224..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/004.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="value"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/005.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/005.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/005.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/006.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/006.xml deleted file mode 100644 index d07627d7a3..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/006.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1" a2="w2"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/007.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/007.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/007.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/008.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/008.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/008.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/009.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/009.xml deleted file mode 100644 index 7293fb63dc..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/009.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1" a2="v2"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/010.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/010.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/010.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/011.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/011.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/011.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/012.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/012.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/012.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/013.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/013.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/013.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/014.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/014.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/014.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/015.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/015.xml deleted file mode 100644 index 131a32fe69..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/015.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a2="v2"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/016.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/016.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/016.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/017.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/017.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/017.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/018.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/018.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/018.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/019.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/019.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/019.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/020.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/020.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/020.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/021.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/021.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/021.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/022.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/022.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/022.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/023.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/023.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/023.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/024.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/024.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/024.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/025.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/025.xml deleted file mode 100644 index eb3f9674e8..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/025.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="x"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/026.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/026.xml deleted file mode 100644 index 71c02026e4..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/026.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="w1" a2="x2"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/027.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/027.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/027.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/028.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/028.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/028.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/029.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/029.xml deleted file mode 100644 index 7ac8b2b89d..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/029.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v2"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/030.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/030.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/030.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/031.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/031.xml deleted file mode 100644 index 03a6c3f9cd..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/031.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><!ATTLIST doc a1 CDATA "v1"> </doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/CVS/Entries deleted file mode 100644 index 5c3b4ac876..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/CVS/Entries +++ /dev/null @@ -1,32 +0,0 @@ -/001.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/002.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/003.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/004.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/005.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/006.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/007.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/008.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/009.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/010.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/011.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/012.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/013.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/014.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/015.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/016.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/017.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/018.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/019.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/020.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/021.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/022.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/023.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/024.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/025.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/026.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/027.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/028.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/029.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/030.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/031.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -D diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/CVS/Repository deleted file mode 100644 index 221d7aeedf..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -2001/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/CVS/Root deleted file mode 100644 index 3c7177e4bb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/not-sa/out/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/001.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/001.xml deleted file mode 100644 index 7fbef49502..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/001.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/002.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/002.xml deleted file mode 100644 index 2e3f1d81dd..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/002.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc ></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/003.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/003.xml deleted file mode 100644 index c841b81784..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/003.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc >
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/004.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/004.xml deleted file mode 100644 index a9c5756933..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/004.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA #IMPLIED>
-]>
-<doc a1="v1"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/005.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/005.xml deleted file mode 100644 index b069efe727..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/005.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA #IMPLIED>
-]>
-<doc a1 = "v1"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/006.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/006.xml deleted file mode 100644 index 39a346342f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/006.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA #IMPLIED>
-]>
-<doc a1='v1'></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/007.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/007.xml deleted file mode 100644 index cc3dc53166..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/007.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc> </doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/008.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/008.xml deleted file mode 100644 index b3370eb1cc..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/008.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&<>"'</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/009.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/009.xml deleted file mode 100644 index 0fa183eccf..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/009.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc> </doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/010.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/010.xml deleted file mode 100644 index eb64d18590..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/010.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA #IMPLIED>
-]>
-<doc a1="v1" ></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/011.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/011.xml deleted file mode 100644 index 4cac44b4e4..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/011.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA #IMPLIED a2 CDATA #IMPLIED>
-]>
-<doc a1="v1" a2="v2"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/012.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/012.xml deleted file mode 100644 index 6ce2a3eae2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/012.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc : CDATA #IMPLIED>
-]>
-<doc :="v1"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/013.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/013.xml deleted file mode 100644 index 2f4aae4e28..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/013.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc _.-0123456789 CDATA #IMPLIED>
-]>
-<doc _.-0123456789="v1"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/014.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/014.xml deleted file mode 100644 index 47f1f723e3..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/014.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc abcdefghijklmnopqrstuvwxyz CDATA #IMPLIED>
-]>
-<doc abcdefghijklmnopqrstuvwxyz="v1"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/015.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/015.xml deleted file mode 100644 index 861df8a610..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/015.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc ABCDEFGHIJKLMNOPQRSTUVWXYZ CDATA #IMPLIED>
-]>
-<doc ABCDEFGHIJKLMNOPQRSTUVWXYZ="v1"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/016.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/016.xml deleted file mode 100644 index 66b1973c5d..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/016.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><?pi?></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/017.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/017.xml deleted file mode 100644 index 827ba963bf..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/017.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><?pi some data ? > <??></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/018.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/018.xml deleted file mode 100644 index 4570903fee..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/018.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><![CDATA[<foo>]]></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/019.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/019.xml deleted file mode 100644 index 3e6b74cbf2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/019.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><![CDATA[<&]]></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/020.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/020.xml deleted file mode 100644 index f749551a1b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/020.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><![CDATA[<&]>]]]></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/021.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/021.xml deleted file mode 100644 index 13dda8c8a5..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/021.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><!-- a comment --></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/022.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/022.xml deleted file mode 100644 index 41d300e950..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/022.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><!-- a comment ->--></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/023.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/023.xml deleted file mode 100644 index 3837b831ad..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/023.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e "">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/024.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/024.xml deleted file mode 100644 index b0655c634c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/024.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (foo)>
-<!ELEMENT foo (#PCDATA)>
-<!ENTITY e "<foo></foo>">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/025.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/025.xml deleted file mode 100644 index ed01f36d89..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/025.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (foo*)>
-<!ELEMENT foo (#PCDATA)>
-]>
-<doc><foo/><foo></foo></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/026.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/026.xml deleted file mode 100644 index 1ba033c1a7..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/026.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (foo*)>
-<!ELEMENT foo EMPTY>
-]>
-<doc><foo/><foo></foo></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/027.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/027.xml deleted file mode 100644 index ee02439051..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/027.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (foo*)>
-<!ELEMENT foo ANY>
-]>
-<doc><foo/><foo></foo></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/028.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/028.xml deleted file mode 100644 index 3d95747913..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/028.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0"?>
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/029.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/029.xml deleted file mode 100644 index 909f6ff712..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/029.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version='1.0'?>
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/030.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/030.xml deleted file mode 100644 index 3a7ddaa716..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/030.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version = "1.0"?>
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/031.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/031.xml deleted file mode 100644 index a58e05867f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/031.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/032.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/032.xml deleted file mode 100644 index be55c8d721..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/032.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version='1.0' standalone='yes'?>
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/033.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/033.xml deleted file mode 100644 index a3f9053868..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/033.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version='1.0' encoding="UTF-8" standalone='yes'?>
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/034.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/034.xml deleted file mode 100644 index 7d52f31c0e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/034.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc/>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/035.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/035.xml deleted file mode 100644 index f109a8b782..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/035.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc />
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/036.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/036.xml deleted file mode 100644 index 8ab2b3fb16..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/036.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
-<?pi data?>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/037.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/037.xml deleted file mode 100644 index f9b2113940..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/037.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
-<!-- comment -->
-
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/038.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/038.xml deleted file mode 100644 index d14f41bfe2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/038.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!-- comment -->
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
-
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/039.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/039.xml deleted file mode 100644 index 0897316e46..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/039.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?pi data?>
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/040.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/040.xml deleted file mode 100644 index 12c419b65b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/040.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA #IMPLIED>
-]>
-<doc a1=""<&>'"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/041.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/041.xml deleted file mode 100644 index a59f536277..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/041.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA #IMPLIED>
-]>
-<doc a1="A"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/042.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/042.xml deleted file mode 100644 index 5d7c650944..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/042.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>A</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/043.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/043.xml deleted file mode 100644 index a8095dfe28..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/043.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ATTLIST doc a1 CDATA #IMPLIED>
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc a1="foo
-bar"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/044.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/044.xml deleted file mode 100644 index bee1d23e1a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/044.xml +++ /dev/null @@ -1,10 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (e*)>
-<!ELEMENT e EMPTY>
-<!ATTLIST e a1 CDATA "v1" a2 CDATA "v2" a3 CDATA #IMPLIED>
-]>
-<doc>
-<e a3="v3"/>
-<e a1="w1"/>
-<e a2="w2" a3="v3"/>
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/045.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/045.xml deleted file mode 100644 index e2567f532d..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/045.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "v1">
-<!ATTLIST doc a1 CDATA "z1">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/046.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/046.xml deleted file mode 100644 index c50a2846f9..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/046.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "v1">
-<!ATTLIST doc a2 CDATA "v2">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/047.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/047.xml deleted file mode 100644 index a4c688cf1a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/047.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>X
-Y</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/048.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/048.xml deleted file mode 100644 index c6b2dedbba..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/048.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>]</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/049.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/049.xml Binary files differdeleted file mode 100644 index c3cc797b59..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/049.xml +++ /dev/null diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/050.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/050.xml Binary files differdeleted file mode 100644 index 12303b1af2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/050.xml +++ /dev/null diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/051.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/051.xml Binary files differdeleted file mode 100644 index 7ae8f6c73a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/051.xml +++ /dev/null diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/052.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/052.xml deleted file mode 100644 index 3f33a4c760..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/052.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>𐀀</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/053.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/053.xml deleted file mode 100644 index 0d88f28718..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/053.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "<e/>">
-<!ELEMENT doc (e)>
-<!ELEMENT e EMPTY>
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/054.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/054.xml deleted file mode 100644 index 5d1c88b946..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/054.xml +++ /dev/null @@ -1,10 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-
-
-<doc
-></doc
->
-
-
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/055.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/055.xml deleted file mode 100644 index da0292c5bc..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/055.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<?pi data?>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/056.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/056.xml deleted file mode 100644 index 144871b2a3..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/056.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>A</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/057.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/057.xml deleted file mode 100644 index c1ac849ed1..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/057.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (a*)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/058.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/058.xml deleted file mode 100644 index 2ff23b233f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/058.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ATTLIST doc a1 NMTOKENS #IMPLIED>
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc a1=" 1 2 "></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/059.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/059.xml deleted file mode 100644 index 2171480ecf..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/059.xml +++ /dev/null @@ -1,10 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (e*)>
-<!ELEMENT e EMPTY>
-<!ATTLIST e a1 CDATA #IMPLIED a2 CDATA #IMPLIED a3 CDATA #IMPLIED>
-]>
-<doc>
-<e a1="v1" a2="v2" a3="v3"/>
-<e a1="w1" a2="v2"/>
-<e a1="v1" a2="w2" a3="v3"/>
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/060.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/060.xml deleted file mode 100644 index 6cd6b4386b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/060.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>X Y</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/061.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/061.xml deleted file mode 100644 index bbdc152492..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/061.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>£</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/062.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/062.xml deleted file mode 100644 index f4ba53090a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/062.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>เจมส์</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/063.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/063.xml deleted file mode 100644 index 9668f2da73..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/063.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE เจมส์ [
-<!ELEMENT เจมส์ (#PCDATA)>
-]>
-<เจมส์></เจมส์>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/064.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/064.xml deleted file mode 100644 index 74a97aa431..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/064.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>𐀀􏿽</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/065.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/065.xml deleted file mode 100644 index f708f2bc17..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/065.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "<">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/066.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/066.xml deleted file mode 100644 index a27340b9a7..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/066.xml +++ /dev/null @@ -1,7 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA #IMPLIED>
-<!-- 34 is double quote -->
-<!ENTITY e1 """>
-]>
-<doc a1="&e1;"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/067.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/067.xml deleted file mode 100644 index a0ccf772a5..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/067.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc> </doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/068.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/068.xml deleted file mode 100644 index 8ed806b9a3..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/068.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e " ">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/069.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/069.xml deleted file mode 100644 index 2437f60530..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/069.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!NOTATION n PUBLIC "whatever">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/070.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/070.xml deleted file mode 100644 index eef097df76..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/070.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY % e "<!ELEMENT doc (#PCDATA)>">
-%e;
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/071.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/071.xml deleted file mode 100644 index ebfba230a4..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/071.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a ID #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/072.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/072.xml deleted file mode 100644 index 6ef39dc49e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/072.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a IDREF #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/073.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/073.xml deleted file mode 100644 index 217476d9a9..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/073.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a IDREFS #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/074.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/074.xml deleted file mode 100644 index 8b2354ff73..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/074.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a ENTITY #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/075.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/075.xml deleted file mode 100644 index 33c012441a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/075.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a ENTITIES #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/076.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/076.xml deleted file mode 100644 index 65b731cf6d..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/076.xml +++ /dev/null @@ -1,7 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a NOTATION (n1|n2) #IMPLIED>
-<!NOTATION n1 SYSTEM "http://www.w3.org/">
-<!NOTATION n2 SYSTEM "http://www.w3.org/">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/077.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/077.xml deleted file mode 100644 index e5f301eac8..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/077.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a (1|2) #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/078.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/078.xml deleted file mode 100644 index b31f40f94e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/078.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #REQUIRED>
-]>
-<doc a="v"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/079.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/079.xml deleted file mode 100644 index a3290d6cbb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/079.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #FIXED "v">
-]>
-<doc a="v"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/080.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/080.xml deleted file mode 100644 index 3208fa9aa5..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/080.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #FIXED "v">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/081.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/081.xml deleted file mode 100644 index 51ee1a375c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/081.xml +++ /dev/null @@ -1,7 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (a, b, c)>
-<!ELEMENT a (a?)>
-<!ELEMENT b (b*)>
-<!ELEMENT c (a | b)+>
-]>
-<doc><a/><b/><c><a/></c></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/082.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/082.xml deleted file mode 100644 index d5245ac51a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/082.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY % e SYSTEM "e.dtd">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/083.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/083.xml deleted file mode 100644 index 937cfc0bdd..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/083.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY % e PUBLIC 'whatever' "e.dtd">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/084.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/084.xml deleted file mode 100644 index 82760767aa..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/084.xml +++ /dev/null @@ -1 +0,0 @@ -<!DOCTYPE doc [<!ELEMENT doc (#PCDATA)>]><doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/085.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/085.xml deleted file mode 100644 index cf5834f2a5..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/085.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e "<foo>">
-<!ENTITY e "">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/086.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/086.xml deleted file mode 100644 index bbc3080db6..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/086.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e "">
-<!ENTITY e "<foo>">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/087.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/087.xml deleted file mode 100644 index 34797a67d7..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/087.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "<foo/>">
-<!ELEMENT doc (foo)>
-<!ELEMENT foo EMPTY>
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/088.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/088.xml deleted file mode 100644 index f97d96848d..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/088.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e "<foo>">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/089.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/089.xml deleted file mode 100644 index 42ffcb6782..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/089.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e "𐀀􏿽">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/090.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/090.xml deleted file mode 100644 index c392c96084..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/090.xml +++ /dev/null @@ -1,7 +0,0 @@ -<!DOCTYPE doc [
-<!ATTLIST e a NOTATION (n) #IMPLIED>
-<!ELEMENT doc (e)*>
-<!ELEMENT e (#PCDATA)>
-<!NOTATION n PUBLIC "whatever">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/091.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/091.xml deleted file mode 100644 index 7343d0f795..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/091.xml +++ /dev/null @@ -1,7 +0,0 @@ -<!DOCTYPE doc [
-<!NOTATION n SYSTEM "http://www.w3.org/">
-<!ENTITY e SYSTEM "http://www.w3.org/" NDATA n>
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a ENTITY "e">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/092.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/092.xml deleted file mode 100644 index 627b74ecdf..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/092.xml +++ /dev/null @@ -1,10 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (a)*>
-<!ELEMENT a EMPTY>
-]>
-<doc>
-<a/>
- <a/> <a/>
-
-
-</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/093.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/093.xml deleted file mode 100644 index 300578eb5c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/093.xml +++ /dev/null @@ -1,7 +0,0 @@ -<!DOCTYPE doc [ -<!ELEMENT doc (#PCDATA)> -]> -<doc> - - -</doc> diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/094.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/094.xml deleted file mode 100644 index 5726e7db6f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/094.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY % e "foo">
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a1 CDATA "%e;">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/095.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/095.xml deleted file mode 100644 index 1fe69596da..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/095.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ATTLIST doc a1 CDATA #IMPLIED>
-<!ATTLIST doc a1 NMTOKENS #IMPLIED>
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc a1="1 2"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/096.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/096.xml deleted file mode 100644 index a6f8f43620..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/096.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ATTLIST doc a1 NMTOKENS " 1 2 ">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/097.ent b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/097.ent deleted file mode 100644 index e06554ace2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/097.ent +++ /dev/null @@ -1 +0,0 @@ -<!ATTLIST doc a2 CDATA #IMPLIED>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/097.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/097.xml deleted file mode 100644 index c606afa97f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/097.xml +++ /dev/null @@ -1,8 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY % e SYSTEM "097.ent">
-<!ATTLIST doc a1 CDATA "v1">
-%e;
-<!ATTLIST doc a2 CDATA "v2">
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/098.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/098.xml deleted file mode 100644 index 33a64ce5ae..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/098.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><?pi x
-y?></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/099.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/099.xml deleted file mode 100644 index 1b7214a137..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/099.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/100.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/100.xml deleted file mode 100644 index 5b839e76bc..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/100.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ENTITY e PUBLIC ";!*#@$_%" "100.xml">
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/101.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/101.xml deleted file mode 100644 index f464484bf5..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/101.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e """>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/102.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/102.xml deleted file mode 100644 index f239ff5fee..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/102.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a="""></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/103.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/103.xml deleted file mode 100644 index 1dbbd5bb7c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/103.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/104.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/104.xml deleted file mode 100644 index 666f43de0f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/104.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a="x y"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/105.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/105.xml deleted file mode 100644 index 6b3af2b847..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/105.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a="x	y"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/106.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/106.xml deleted file mode 100644 index 8757c0a5ae..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/106.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a="x y"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/107.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/107.xml deleted file mode 100644 index 3d2c2566a7..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/107.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a="x y"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/108.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/108.xml deleted file mode 100644 index e919bf229a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/108.xml +++ /dev/null @@ -1,7 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e "
-">
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a="x&e;y"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/109.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/109.xml deleted file mode 100644 index 33fa38e13b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/109.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a=""></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/110.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/110.xml deleted file mode 100644 index 0c61c65119..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/110.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e " ">
-<!ATTLIST doc a CDATA #IMPLIED>
-]>
-<doc a="x&e;y"></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/111.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/111.xml deleted file mode 100644 index cb56f264b0..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/111.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST doc a NMTOKENS #IMPLIED>
-]>
-<doc a=" x  y "></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/112.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/112.xml deleted file mode 100644 index 27b6a4c793..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/112.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (a | b)>
-<!ELEMENT a (#PCDATA)>
-]>
-<doc><a></a></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/113.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/113.xml deleted file mode 100644 index d2edd0f01d..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/113.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ATTLIST e a CDATA #IMPLIED>
-]>
-<doc></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/114.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/114.xml deleted file mode 100644 index 52e207096d..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/114.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e "<![CDATA[&foo;]]>">
-]>
-<doc>&e;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/115.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/115.xml deleted file mode 100644 index d939a67010..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/115.xml +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY e1 "&e2;">
-<!ENTITY e2 "v">
-]>
-<doc>&e1;</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/116.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/116.xml deleted file mode 100644 index 55ab49620b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/116.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-]>
-<doc><![CDATA[
-]]></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/117.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/117.xml deleted file mode 100644 index e4f02b14c8..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/117.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY rsqb "]">
-]>
-<doc>]</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/118.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/118.xml deleted file mode 100644 index fba6c44668..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/118.xml +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc (#PCDATA)>
-<!ENTITY rsqb "]]">
-]>
-<doc>]</doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/119.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/119.xml deleted file mode 100644 index 876e74730c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/119.xml +++ /dev/null @@ -1,4 +0,0 @@ -<!DOCTYPE doc [
-<!ELEMENT doc ANY>
-]>
-<doc><!-- -á --></doc>
diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/CVS/Entries deleted file mode 100644 index 5d10c3447a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/CVS/Entries +++ /dev/null @@ -1,121 +0,0 @@ -/001.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/002.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/003.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/004.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/005.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/006.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/007.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/008.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/009.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/010.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/011.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/012.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/013.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/014.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/015.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/016.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/017.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/018.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/019.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/020.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/021.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/022.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/023.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/024.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/025.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/026.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/027.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/028.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/029.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/030.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/031.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/032.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/033.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/034.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/035.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/036.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/037.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/038.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/039.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/040.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/041.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/042.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/043.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/044.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/045.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/046.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/047.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/048.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/049.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/050.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/051.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/052.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/053.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/054.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/055.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/056.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/057.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/058.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/059.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/060.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/061.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/062.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/063.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/064.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/065.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/066.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/067.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/068.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/069.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/070.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/071.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/072.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/073.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/074.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/075.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/076.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/077.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/078.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/079.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/080.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/081.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/082.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/083.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/084.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/085.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/086.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/087.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/088.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/089.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/090.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/091.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/092.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/093.xml/1.2/Mon Apr 22 13:27:36 2002// -/094.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/095.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/096.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/097.ent/1.1.1.1/Wed Oct 17 09:52:58 2001// -/097.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/098.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/099.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/100.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/101.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/102.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/103.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/104.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/105.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/106.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/107.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/108.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/109.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/110.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/111.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/112.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/113.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/114.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/115.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/116.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/117.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/118.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/119.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -D/out//// diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/CVS/Repository deleted file mode 100644 index 7dcbee54f2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -2001/XML-Test-Suite/xmlconf/xmltest/valid/sa diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/CVS/Root deleted file mode 100644 index 3c7177e4bb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/001.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/001.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/001.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/002.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/002.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/002.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/003.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/003.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/003.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/004.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/004.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/004.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/005.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/005.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/005.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/006.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/006.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/006.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/007.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/007.xml deleted file mode 100644 index 97cf3e3b86..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/007.xml +++ /dev/null @@ -1 +0,0 @@ -<doc> </doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/008.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/008.xml deleted file mode 100644 index 3ea232c21a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/008.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>&<>"'</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/009.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/009.xml deleted file mode 100644 index 97cf3e3b86..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/009.xml +++ /dev/null @@ -1 +0,0 @@ -<doc> </doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/010.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/010.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/010.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/011.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/011.xml deleted file mode 100644 index 7293fb63dc..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/011.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1" a2="v2"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/012.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/012.xml deleted file mode 100644 index 5a0c9831ae..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/012.xml +++ /dev/null @@ -1 +0,0 @@ -<doc :="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/013.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/013.xml deleted file mode 100644 index c9c7ec5da8..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/013.xml +++ /dev/null @@ -1 +0,0 @@ -<doc _.-0123456789="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/014.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/014.xml deleted file mode 100644 index ac6b28f97a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/014.xml +++ /dev/null @@ -1 +0,0 @@ -<doc abcdefghijklmnopqrstuvwxyz="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/015.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/015.xml deleted file mode 100644 index 8e216eb99b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/015.xml +++ /dev/null @@ -1 +0,0 @@ -<doc ABCDEFGHIJKLMNOPQRSTUVWXYZ="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/016.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/016.xml deleted file mode 100644 index 4fc76928b2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/016.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><?pi ?></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/017.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/017.xml deleted file mode 100644 index 3b9a2f8d4e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/017.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><?pi some data ? > <??></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/018.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/018.xml deleted file mode 100644 index a5471011df..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/018.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><foo></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/019.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/019.xml deleted file mode 100644 index 05d4e2fcf9..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/019.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><&</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/020.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/020.xml deleted file mode 100644 index 95ae08a12e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/020.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><&]>]</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/021.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/021.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/021.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/022.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/022.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/022.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/023.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/023.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/023.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/024.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/024.xml deleted file mode 100644 index a9aa2074ff..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/024.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><foo></foo></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/025.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/025.xml deleted file mode 100644 index de0f566020..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/025.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><foo></foo><foo></foo></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/026.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/026.xml deleted file mode 100644 index de0f566020..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/026.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><foo></foo><foo></foo></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/027.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/027.xml deleted file mode 100644 index de0f566020..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/027.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><foo></foo><foo></foo></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/028.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/028.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/028.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/029.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/029.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/029.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/030.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/030.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/030.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/031.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/031.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/031.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/032.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/032.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/032.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/033.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/033.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/033.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/034.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/034.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/034.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/035.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/035.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/035.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/036.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/036.xml deleted file mode 100644 index 2bcfb06cf1..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/036.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc><?pi data?>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/037.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/037.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/037.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/038.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/038.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/038.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/039.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/039.xml deleted file mode 100644 index 82d117d492..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/039.xml +++ /dev/null @@ -1 +0,0 @@ -<?pi data?><doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/040.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/040.xml deleted file mode 100644 index d79cfe1493..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/040.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1=""<&>'"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/041.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/041.xml deleted file mode 100644 index 6f2cd5832e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/041.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="A"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/042.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/042.xml deleted file mode 100644 index f683039a80..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/042.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>A</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/043.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/043.xml deleted file mode 100644 index e162b76504..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/043.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="foo bar"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/044.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/044.xml deleted file mode 100644 index 78028b704b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/044.xml +++ /dev/null @@ -1 +0,0 @@ -<doc> <e a1="v1" a2="v2" a3="v3"></e> <e a1="w1" a2="v2"></e> <e a1="v1" a2="w2" a3="v3"></e> </doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/045.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/045.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/045.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/046.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/046.xml deleted file mode 100644 index 7293fb63dc..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/046.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1" a2="v2"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/047.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/047.xml deleted file mode 100644 index b327ebd67f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/047.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>X Y</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/048.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/048.xml deleted file mode 100644 index ced7d02719..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/048.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>]</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/049.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/049.xml deleted file mode 100644 index 7cc53f9ea0..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/049.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>£</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/050.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/050.xml deleted file mode 100644 index 33703c7925..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/050.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>เจมส์</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/051.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/051.xml deleted file mode 100644 index cfeb5a5366..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/051.xml +++ /dev/null @@ -1 +0,0 @@ -<เจมส์></เจมส์>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/052.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/052.xml deleted file mode 100644 index f5a0484791..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/052.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>𐀀</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/053.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/053.xml deleted file mode 100644 index c4083843d9..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/053.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><e></e></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/054.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/054.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/054.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/055.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/055.xml deleted file mode 100644 index 82d117d492..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/055.xml +++ /dev/null @@ -1 +0,0 @@ -<?pi data?><doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/056.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/056.xml deleted file mode 100644 index f683039a80..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/056.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>A</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/057.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/057.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/057.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/058.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/058.xml deleted file mode 100644 index f898cc8c98..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/058.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="1 2"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/059.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/059.xml deleted file mode 100644 index 78028b704b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/059.xml +++ /dev/null @@ -1 +0,0 @@ -<doc> <e a1="v1" a2="v2" a3="v3"></e> <e a1="w1" a2="v2"></e> <e a1="v1" a2="w2" a3="v3"></e> </doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/060.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/060.xml deleted file mode 100644 index b327ebd67f..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/060.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>X Y</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/061.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/061.xml deleted file mode 100644 index 7cc53f9ea0..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/061.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>£</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/062.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/062.xml deleted file mode 100644 index 33703c7925..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/062.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>เจมส์</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/063.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/063.xml deleted file mode 100644 index cfeb5a5366..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/063.xml +++ /dev/null @@ -1 +0,0 @@ -<เจมส์></เจมส์>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/064.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/064.xml deleted file mode 100644 index f5a0484791..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/064.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>𐀀</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/065.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/065.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/065.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/066.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/066.xml deleted file mode 100644 index 7597d31bf9..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/066.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="""></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/067.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/067.xml deleted file mode 100644 index 4bbdad45ed..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/067.xml +++ /dev/null @@ -1 +0,0 @@ -<doc> </doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/068.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/068.xml deleted file mode 100644 index 4bbdad45ed..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/068.xml +++ /dev/null @@ -1 +0,0 @@ -<doc> </doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/070.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/070.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/070.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/071.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/071.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/071.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/072.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/072.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/072.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/073.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/073.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/073.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/074.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/074.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/074.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/075.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/075.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/075.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/077.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/077.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/077.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/078.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/078.xml deleted file mode 100644 index fcab0cd7ff..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/078.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a="v"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/079.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/079.xml deleted file mode 100644 index fcab0cd7ff..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/079.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a="v"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/080.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/080.xml deleted file mode 100644 index fcab0cd7ff..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/080.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a="v"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/081.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/081.xml deleted file mode 100644 index e356e7e4db..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/081.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><a></a><b></b><c><a></a></c></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/082.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/082.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/082.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/083.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/083.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/083.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/084.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/084.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/084.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/085.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/085.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/085.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/086.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/086.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/086.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/087.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/087.xml deleted file mode 100644 index a9aa2074ff..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/087.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><foo></foo></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/088.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/088.xml deleted file mode 100644 index a5471011df..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/088.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><foo></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/089.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/089.xml deleted file mode 100644 index f5a0484791..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/089.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>𐀀</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/092.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/092.xml deleted file mode 100644 index 87269f79d9..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/092.xml +++ /dev/null @@ -1 +0,0 @@ -<doc> <a></a> <a></a>	<a></a> </doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/093.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/093.xml deleted file mode 100644 index 631bfde91e..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/093.xml +++ /dev/null @@ -1 +0,0 @@ -<doc> </doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/094.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/094.xml deleted file mode 100644 index 636ab4729a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/094.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="%e;"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/095.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/095.xml deleted file mode 100644 index a20706ee01..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/095.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="1 2"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/096.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/096.xml deleted file mode 100644 index f898cc8c98..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/096.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="1 2"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/097.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/097.xml deleted file mode 100644 index e05cfe6c31..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/097.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a1="v1"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/098.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/098.xml deleted file mode 100644 index f6408de9b8..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/098.xml +++ /dev/null @@ -1,2 +0,0 @@ -<doc><?pi x -y?></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/099.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/099.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/099.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/100.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/100.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/100.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/101.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/101.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/101.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/102.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/102.xml deleted file mode 100644 index 6e66b8da21..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/102.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a="""></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/103.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/103.xml deleted file mode 100644 index 96495d45c3..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/103.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/104.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/104.xml deleted file mode 100644 index cc3def3336..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/104.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a="x y"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/105.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/105.xml deleted file mode 100644 index 5aed3d613b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/105.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a="x	y"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/106.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/106.xml deleted file mode 100644 index 1197d2ff9c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/106.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a="x y"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/107.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/107.xml deleted file mode 100644 index 288f23cdf2..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/107.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a="x y"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/108.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/108.xml deleted file mode 100644 index cc3def3336..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/108.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a="x y"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/109.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/109.xml deleted file mode 100644 index c43bdf9b9c..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/109.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a=""></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/110.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/110.xml deleted file mode 100644 index a92237b4ec..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/110.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a="x y"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/111.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/111.xml deleted file mode 100644 index cc3def3336..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/111.xml +++ /dev/null @@ -1 +0,0 @@ -<doc a="x y"></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/112.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/112.xml deleted file mode 100644 index c82f47bca8..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/112.xml +++ /dev/null @@ -1 +0,0 @@ -<doc><a></a></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/113.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/113.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/113.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/114.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/114.xml deleted file mode 100644 index 8e0722abad..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/114.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>&foo;</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/115.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/115.xml deleted file mode 100644 index 682b8140ec..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/115.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>v</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/116.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/116.xml deleted file mode 100644 index a79dff65fd..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/116.xml +++ /dev/null @@ -1 +0,0 @@ -<doc> </doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/117.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/117.xml deleted file mode 100644 index ced7d02719..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/117.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>]</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/118.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/118.xml deleted file mode 100644 index 31e37a9398..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/118.xml +++ /dev/null @@ -1 +0,0 @@ -<doc>]]</doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/119.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/119.xml deleted file mode 100644 index 7e8f183484..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/119.xml +++ /dev/null @@ -1 +0,0 @@ -<doc></doc>
\ No newline at end of file diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/CVS/Entries b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/CVS/Entries deleted file mode 100644 index 06b9ee385a..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/CVS/Entries +++ /dev/null @@ -1,120 +0,0 @@ -/001.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/002.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/003.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/004.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/005.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/006.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/007.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/008.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/009.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/010.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/011.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/012.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/013.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/014.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/015.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/016.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/017.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/018.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/019.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/020.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/021.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/022.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/023.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/024.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/025.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/026.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/027.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/028.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/029.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/030.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/031.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/032.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/033.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/034.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/035.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/036.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/037.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/038.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/039.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/040.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/041.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/042.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/043.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/044.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/045.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/046.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/047.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/048.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/049.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/050.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/051.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/052.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/053.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/054.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/055.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/056.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/057.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/058.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/059.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/060.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/061.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/062.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/063.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/064.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/065.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/066.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/067.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/068.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/069.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/070.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/071.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/072.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/073.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/074.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/075.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/076.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/077.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/078.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/079.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/080.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/081.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/082.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/083.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/084.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/085.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/086.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/087.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/088.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/089.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/090.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/091.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/092.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/093.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/094.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/095.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/096.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/097.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/098.xml/1.2/Thu Feb 7 19:44:42 2002// -/099.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/100.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/101.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/102.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/103.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/104.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/105.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/106.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/107.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/108.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/109.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/110.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/111.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/112.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/113.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/114.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/115.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/116.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/117.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/118.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -/119.xml/1.1.1.1/Wed Oct 17 09:52:58 2001// -D diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/CVS/Repository b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/CVS/Repository deleted file mode 100644 index 1e172d2e1b..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/CVS/Repository +++ /dev/null @@ -1 +0,0 @@ -2001/XML-Test-Suite/xmlconf/xmltest/valid/sa/out diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/CVS/Root b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/CVS/Root deleted file mode 100644 index 3c7177e4bb..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/CVS/Root +++ /dev/null @@ -1 +0,0 @@ -:pserver:anonymous@dev.w3.org:/sources/public diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/xmltest.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/xmltest.xml deleted file mode 100644 index bf81c88eb9..0000000000 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/xmltest.xml +++ /dev/null @@ -1,1433 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - @(#)xmltest.xml 1.12 99/02/12 - Copyright 1998-1999 by Sun Microsystems, Inc. - All Rights Reserved. ---> - -<TESTCASES PROFILE="James Clark XMLTEST cases, 18-Nov-1998"> - -<!-- Start: not-wf/sa --> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-001" - URI="not-wf/sa/001.xml" SECTIONS="3.1 [41]"> - Attribute values must start with attribute names, not "?". </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-002" - URI="not-wf/sa/002.xml" SECTIONS="2.3 [4]"> - Names may not start with "."; it's not a Letter. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-003" - URI="not-wf/sa/003.xml" SECTIONS="2.6 [16]"> - Processing Instruction target name is required.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-004" - URI="not-wf/sa/004.xml" SECTIONS="2.6 [16]"> - SGML-ism: processing instructions end in '?>' not '>'. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-005" - URI="not-wf/sa/005.xml" SECTIONS="2.6 [16]"> - Processing instructions end in '?>' not '?'. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-006" - URI="not-wf/sa/006.xml" SECTIONS="2.5 [16]"> - XML comments may not contain "--" </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-007" - URI="not-wf/sa/007.xml" SECTIONS="4.1 [68]"> - General entity references have no whitespace after the - entity name and before the semicolon. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-008" - URI="not-wf/sa/008.xml" SECTIONS="2.3 [5]"> - Entity references must include names, which don't begin - with '.' (it's not a Letter or other name start character). </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-009" - URI="not-wf/sa/009.xml" SECTIONS="4.1 [66]"> - Character references may have only decimal or numeric strings.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-010" - URI="not-wf/sa/010.xml" SECTIONS="4.1 [68]"> - Ampersand may only appear as part of a general entity reference.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-011" - URI="not-wf/sa/011.xml" SECTIONS="3.1 [41]"> - SGML-ism: attribute values must be explicitly assigned a - value, it can't act as a boolean toggle. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-012" - URI="not-wf/sa/012.xml" SECTIONS="2.3 [10]"> - SGML-ism: attribute values must be quoted in all cases. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-013" - URI="not-wf/sa/013.xml" SECTIONS="2.3 [10]"> - The quotes on both ends of an attribute value must match. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-014" - URI="not-wf/sa/014.xml" SECTIONS="2.3 [10]"> - Attribute values may not contain literal '<' characters. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-015" - URI="not-wf/sa/015.xml" SECTIONS="3.1 [41]"> - Attribute values need a value, not just an equals sign. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-016" - URI="not-wf/sa/016.xml" SECTIONS="3.1 [41]"> - Attribute values need an associated name.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-017" - URI="not-wf/sa/017.xml" SECTIONS="2.7 [18]"> - CDATA sections need a terminating ']]>'. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-018" - URI="not-wf/sa/018.xml" SECTIONS="2.7 [19]"> - CDATA sections begin with a literal '<![CDATA[', no space.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-019" - URI="not-wf/sa/019.xml" SECTIONS="3.1 [42]"> - End tags may not be abbreviated as '</>'.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-020" - URI="not-wf/sa/020.xml" SECTIONS="2.3 [10]"> - Attribute values may not contain literal '&' - characters except as part of an entity reference. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-021" - URI="not-wf/sa/021.xml" SECTIONS="2.3 [10]"> - Attribute values may not contain literal '&' - characters except as part of an entity reference. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-022" - URI="not-wf/sa/022.xml" SECTIONS="4.1 [66]"> - Character references end with semicolons, always!</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-023" - URI="not-wf/sa/023.xml" SECTIONS="2.3 [5]"> - Digits are not valid name start characters. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-024" - URI="not-wf/sa/024.xml" SECTIONS="2.3 [5]"> - Digits are not valid name start characters. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-025" - URI="not-wf/sa/025.xml" SECTIONS="2.4 [14]"> - Text may not contain a literal ']]>' sequence. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-026" - URI="not-wf/sa/026.xml" SECTIONS="2.4 [14]"> - Text may not contain a literal ']]>' sequence. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-027" - URI="not-wf/sa/027.xml" SECTIONS="2.5 [15]"> - Comments must be terminated with "-->".</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-028" - URI="not-wf/sa/028.xml" SECTIONS="2.6 [16]"> - Processing instructions must end with '?>'. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-029" - URI="not-wf/sa/029.xml" SECTIONS="2.4 [14]"> - Text may not contain a literal ']]>' sequence. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-030" - URI="not-wf/sa/030.xml" SECTIONS="2.2 [2]"> - A form feed is not a legal XML character. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-031" - URI="not-wf/sa/031.xml" SECTIONS="2.2 [2]"> - A form feed is not a legal XML character. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-032" - URI="not-wf/sa/032.xml" SECTIONS="2.2 [2]"> - A form feed is not a legal XML character. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-033" - URI="not-wf/sa/033.xml" SECTIONS="2.2 [2]"> - An ESC (octal 033) is not a legal XML character. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-034" - URI="not-wf/sa/034.xml" SECTIONS="2.2 [2]"> - A form feed is not a legal XML character. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-035" - URI="not-wf/sa/035.xml" SECTIONS="3.1 [43]"> - The '<' character is a markup delimiter and must - start an element, CDATA section, PI, or comment. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-036" - URI="not-wf/sa/036.xml" SECTIONS="2.8 [27]"> - Text may not appear after the root element. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-037" - URI="not-wf/sa/037.xml" SECTIONS="2.8 [27]"> - Character references may not appear after the root element. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-038" - URI="not-wf/sa/038.xml" SECTIONS="3.1"> - Tests the "Unique Att Spec" WF constraint by providing - multiple values for an attribute.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-039" - URI="not-wf/sa/039.xml" SECTIONS="3"> - Tests the Element Type Match WFC - end tag name must - match start tag name.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-040" - URI="not-wf/sa/040.xml" SECTIONS="2.8 [27]"> - Provides two document elements.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-041" - URI="not-wf/sa/041.xml" SECTIONS="2.8 [27]"> - Provides two document elements.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-042" - URI="not-wf/sa/042.xml" SECTIONS="3.1 [42]"> - Invalid End Tag </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-043" - URI="not-wf/sa/043.xml" SECTIONS="2.8 [27]"> - Provides #PCDATA text after the document element. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-044" - URI="not-wf/sa/044.xml" SECTIONS="2.8 [27]"> - Provides two document elements.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-045" - URI="not-wf/sa/045.xml" SECTIONS="3.1 [44]"> - Invalid Empty Element Tag </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-046" - URI="not-wf/sa/046.xml" SECTIONS="3.1 [40]"> - This start (or empty element) tag was not terminated correctly. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-047" - URI="not-wf/sa/047.xml" SECTIONS="3.1 [44]"> - Invalid empty element tag invalid whitespace </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-048" - URI="not-wf/sa/048.xml" SECTIONS="2.8 [27]"> - Provides a CDATA section after the root element.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-049" - URI="not-wf/sa/049.xml" SECTIONS="3.1 [40]"> - Missing start tag </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-050" - URI="not-wf/sa/050.xml" SECTIONS="2.1 [1]"> - Empty document, with no root element. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-051" - URI="not-wf/sa/051.xml" SECTIONS="2.7 [18]"> - CDATA is invalid at top level of document.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-052" - URI="not-wf/sa/052.xml" SECTIONS="4.1 [66]"> - Invalid character reference. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-053" - URI="not-wf/sa/053.xml" SECTIONS="3.1 [42]"> - End tag does not match start tag. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-054" - URI="not-wf/sa/054.xml" SECTIONS="4.2.2 [75]"> - PUBLIC requires two literals.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-055" - URI="not-wf/sa/055.xml" SECTIONS="2.8 [28]"> - Invalid Document Type Definition format. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-056" - URI="not-wf/sa/056.xml" SECTIONS="2.8 [28]"> - Invalid Document Type Definition format - misplaced comment. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-057" - URI="not-wf/sa/057.xml" SECTIONS="3.2 [45]"> - This isn't SGML; comments can't exist in declarations. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-058" - URI="not-wf/sa/058.xml" SECTIONS="3.3.1 [54]"> - Invalid character , in ATTLIST enumeration </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-059" - URI="not-wf/sa/059.xml" SECTIONS="3.3.1 [59]"> - String literal must be in quotes. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-060" - URI="not-wf/sa/060.xml" SECTIONS="3.3.1 [56]"> - Invalid type NAME defined in ATTLIST.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-061" - URI="not-wf/sa/061.xml" SECTIONS="4.2.2 [75]"> - External entity declarations require whitespace between public - and system IDs.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-062" - URI="not-wf/sa/062.xml" SECTIONS="4.2 [71]"> - Entity declarations need space after the entity name. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-063" - URI="not-wf/sa/063.xml" SECTIONS="2.8 [29]"> - Conditional sections may only appear in the external - DTD subset. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-064" - URI="not-wf/sa/064.xml" SECTIONS="3.3 [53]"> - Space is required between attribute type and default values - in <!ATTLIST...> declarations. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-065" - URI="not-wf/sa/065.xml" SECTIONS="3.3 [53]"> - Space is required between attribute name and type - in <!ATTLIST...> declarations. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-066" - URI="not-wf/sa/066.xml" SECTIONS="3.3 [52]"> - Required whitespace is missing. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-067" - URI="not-wf/sa/067.xml" SECTIONS="3.3 [53]"> - Space is required between attribute type and default values - in <!ATTLIST...> declarations. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-068" - URI="not-wf/sa/068.xml" SECTIONS="3.3.1 [58]"> - Space is required between NOTATION keyword and list of - enumerated choices in <!ATTLIST...> declarations. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-069" - URI="not-wf/sa/069.xml" SECTIONS="4.2.2 [76]"> - Space is required before an NDATA entity annotation.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-070" - URI="not-wf/sa/070.xml" SECTIONS="2.5 [16]"> - XML comments may not contain "--" </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-071" - URI="not-wf/sa/071.xml" SECTIONS="4.1 [68]"> - ENTITY can't reference itself directly or indirectly.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-072" - URI="not-wf/sa/072.xml" SECTIONS="4.1 [68]"> - Undefined ENTITY foo. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-073" - URI="not-wf/sa/073.xml" SECTIONS="4.1 [68]"> - Undefined ENTITY f. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-074" - URI="not-wf/sa/074.xml" SECTIONS="4.3.2"> - Internal general parsed entities are only well formed if - they match the "content" production. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-075" - URI="not-wf/sa/075.xml" SECTIONS="4.1 [68]"> - ENTITY can't reference itself directly or indirectly. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-076" - URI="not-wf/sa/076.xml" SECTIONS="4.1 [68]"> - Undefined ENTITY foo. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-077" - URI="not-wf/sa/077.xml" SECTIONS="41. [68]"> - Undefined ENTITY bar. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-078" - URI="not-wf/sa/078.xml" SECTIONS="4.1 [68]"> - Undefined ENTITY foo. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-079" - URI="not-wf/sa/079.xml" SECTIONS="4.1 [68]"> - ENTITY can't reference itself directly or indirectly. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-080" - URI="not-wf/sa/080.xml" SECTIONS="4.1 [68]"> - ENTITY can't reference itself directly or indirectly. </TEST> -<TEST TYPE="not-wf" ENTITIES="general" ID="not-wf-sa-081" - URI="not-wf/sa/081.xml" SECTIONS="3.1"> - This tests the <EM>No External Entity References</EM> WFC, - since the entity is referred to within an attribute. </TEST> -<TEST TYPE="not-wf" ENTITIES="general" ID="not-wf-sa-082" - URI="not-wf/sa/082.xml" SECTIONS="3.1"> - This tests the <EM>No External Entity References</EM> WFC, - since the entity is referred to within an attribute. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-083" - URI="not-wf/sa/083.xml" SECTIONS="4.2.2 [76]"> - Undefined NOTATION n. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-084" - URI="not-wf/sa/084.xml" SECTIONS="4.1"> - Tests the <EM>Parsed Entity</EM> WFC by referring to an - unparsed entity. (This precedes the error of not declaring - that entity's notation, which may be detected any time before - the DTD parsing is completed.) </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-085" - URI="not-wf/sa/085.xml" SECTIONS="2.3 [13]"> - Public IDs may not contain "[". </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-086" - URI="not-wf/sa/086.xml" SECTIONS="2.3 [13]"> - Public IDs may not contain "[". </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-087" - URI="not-wf/sa/087.xml" SECTIONS="2.3 [13]"> - Public IDs may not contain "[". </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-088" - URI="not-wf/sa/088.xml" SECTIONS="2.3 [10]"> - Attribute values are terminated by literal quote characters, - and any entity expansion is done afterwards. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-089" - URI="not-wf/sa/089.xml" SECTIONS="4.2 [74]"> - Parameter entities "are" always parsed; NDATA annotations - are not permitted.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-090" - URI="not-wf/sa/090.xml" SECTIONS="2.3 [10]"> - Attributes may not contain a literal "<" character; - this one has one because of reference expansion. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-091" - URI="not-wf/sa/091.xml" SECTIONS="4.2 [74]"> - Parameter entities "are" always parsed; NDATA annotations - are not permitted.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-092" - URI="not-wf/sa/092.xml" SECTIONS="4.5"> - The replacement text of this entity has an illegal reference, - because the character reference is expanded immediately. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-093" - URI="not-wf/sa/093.xml" SECTIONS="4.1 [66]"> - Hexadecimal character references may not use the uppercase 'X'.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-094" - URI="not-wf/sa/094.xml" SECTIONS="2.8 [24]"> - Prolog VERSION must be lowercase. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-095" - URI="not-wf/sa/095.xml" SECTIONS="2.8 [23]"> - VersionInfo must come before EncodingDecl. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-096" - URI="not-wf/sa/096.xml" SECTIONS="2.9 [32]"> - Space is required before the standalone declaration. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-097" - URI="not-wf/sa/097.xml" SECTIONS="2.8 [24]"> - Both quotes surrounding VersionNum must be the same. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-098" - URI="not-wf/sa/098.xml" SECTIONS="2.8 [23]"> - Only one "version=..." string may appear in an XML declaration.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-099" - URI="not-wf/sa/099.xml" SECTIONS="2.8 [23]"> - Only three pseudo-attributes are in the XML declaration, - and "valid=..." is not one of them. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-100" - URI="not-wf/sa/100.xml" SECTIONS="2.9 [32]"> - Only "yes" and "no" are permitted as values of "standalone". </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-101" - URI="not-wf/sa/101.xml" SECTIONS="4.3.3 [81]"> - Space is not permitted in an encoding name. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-102" - URI="not-wf/sa/102.xml" SECTIONS="2.8 [26]"> - Provides an illegal XML version number; spaces are illegal.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-103" - URI="not-wf/sa/103.xml" SECTIONS="4.3.2"> - End-tag required for element foo. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-104" - URI="not-wf/sa/104.xml" SECTIONS="4.3.2"> - Internal general parsed entities are only well formed if - they match the "content" production. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-105" - URI="not-wf/sa/105.xml" SECTIONS="2.7 "> - Invalid placement of CDATA section. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-106" - URI="not-wf/sa/106.xml" SECTIONS="4.2"> - Invalid placement of entity declaration. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-107" - URI="not-wf/sa/107.xml" SECTIONS="2.8 [28]"> - Invalid document type declaration. CDATA alone is invalid.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-108" - URI="not-wf/sa/108.xml" SECTIONS="2.7 [19]"> - No space in '<![CDATA['.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-109" - URI="not-wf/sa/109.xml" SECTIONS="4.2 [70]"> - Tags invalid within EntityDecl. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-110" - URI="not-wf/sa/110.xml" SECTIONS="4.1 [68]"> - Entity reference must be in content of element. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-111" - URI="not-wf/sa/111.xml" SECTIONS="3.1 [43]"> - Entiry reference must be in content of element not Start-tag. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-112" - URI="not-wf/sa/112.xml" SECTIONS="2.7 [19]"> - CDATA sections start '<![CDATA[', not '<!cdata['.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-113" - URI="not-wf/sa/113.xml" SECTIONS="2.3 [9]"> - Parameter entity values must use valid reference syntax; - this reference is malformed.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-114" - URI="not-wf/sa/114.xml" SECTIONS="2.3 [9]"> - General entity values must use valid reference syntax; - this reference is malformed.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-115" - URI="not-wf/sa/115.xml" SECTIONS="4.5"> - The replacement text of this entity is an illegal character - reference, which must be rejected when it is parsed in the - context of an attribute value.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-116" - URI="not-wf/sa/116.xml" SECTIONS="4.3.2"> - Internal general parsed entities are only well formed if - they match the "content" production. This is a partial - character reference, not a full one. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-117" - URI="not-wf/sa/117.xml" SECTIONS="4.3.2"> - Internal general parsed entities are only well formed if - they match the "content" production. This is a partial - character reference, not a full one. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-118" - URI="not-wf/sa/118.xml" SECTIONS="4.1 [68]"> - Entity reference expansion is not recursive.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-119" - URI="not-wf/sa/119.xml" SECTIONS="4.3.2"> - Internal general parsed entities are only well formed if - they match the "content" production. This is a partial - character reference, not a full one. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-120" - URI="not-wf/sa/120.xml" SECTIONS="4.5"> - Character references are expanded in the replacement text of - an internal entity, which is then parsed as usual. Accordingly, - & must be doubly quoted - encoded either as <EM>&amp;</EM> - or as <EM>&#38;#38;</EM>. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-121" - URI="not-wf/sa/121.xml" SECTIONS="4.1 [68]"> - A name of an ENTITY was started with an invalid character. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-122" - URI="not-wf/sa/122.xml" SECTIONS="3.2.1 [47]"> - Invalid syntax mixed connectors are used. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-123" - URI="not-wf/sa/123.xml" SECTIONS="3.2.1 [48]"> - Invalid syntax mismatched parenthesis. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-124" - URI="not-wf/sa/124.xml" SECTIONS="3.2.2 [51]"> - Invalid format of Mixed-content declaration. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-125" - URI="not-wf/sa/125.xml" SECTIONS="3.2.2 [51]"> - Invalid syntax extra set of parenthesis not necessary. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-126" - URI="not-wf/sa/126.xml" SECTIONS="3.2.2 [51]"> - Invalid syntax Mixed-content must be defined as zero or more. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-127" - URI="not-wf/sa/127.xml" SECTIONS="3.2.2 [51]"> - Invalid syntax Mixed-content must be defined as zero or more. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-128" - URI="not-wf/sa/128.xml" SECTIONS="2.7 [18]"> - Invalid CDATA syntax. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-129" - URI="not-wf/sa/129.xml" SECTIONS="3.2 [45]"> - Invalid syntax for Element Type Declaration. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-130" - URI="not-wf/sa/130.xml" SECTIONS="3.2 [45]"> - Invalid syntax for Element Type Declaration. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-131" - URI="not-wf/sa/131.xml" SECTIONS="3.2 [45]"> - Invalid syntax for Element Type Declaration. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-132" - URI="not-wf/sa/132.xml" SECTIONS="3.2.1 [50]"> - Invalid syntax mixed connectors used. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-133" - URI="not-wf/sa/133.xml" SECTIONS="3.2.1"> - Illegal whitespace before optional character causes syntax error. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-134" - URI="not-wf/sa/134.xml" SECTIONS="3.2.1"> - Illegal whitespace before optional character causes syntax error. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-135" - URI="not-wf/sa/135.xml" SECTIONS="3.2.1 [47]"> - Invalid character used as connector. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-136" - URI="not-wf/sa/136.xml" SECTIONS="3.2 [45]"> - Tag omission is invalid in XML. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-137" - URI="not-wf/sa/137.xml" SECTIONS="3.2 [45]"> - Space is required before a content model. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-138" - URI="not-wf/sa/138.xml" SECTIONS="3.2.1 [48]"> - Invalid syntax for content particle. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-139" - URI="not-wf/sa/139.xml" SECTIONS="3.2.1 [46]"> - The element-content model should not be empty. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-140" - URI="not-wf/sa/140.xml" SECTIONS="2.3 [4]"> - Character '&#x309a;' is a CombiningChar, not a - Letter, and so may not begin a name.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-141" - URI="not-wf/sa/141.xml" SECTIONS="2.3 [5]"> - Character #x0E5C is not legal in XML names. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-142" - URI="not-wf/sa/142.xml" SECTIONS="2.2 [2]"> - Character #x0000 is not legal anywhere in an XML document. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-143" - URI="not-wf/sa/143.xml" SECTIONS="2.2 [2]"> - Character #x001F is not legal anywhere in an XML document. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-144" - URI="not-wf/sa/144.xml" SECTIONS="2.2 [2]"> - Character #xFFFF is not legal anywhere in an XML document. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-145" - URI="not-wf/sa/145.xml" SECTIONS="2.2 [2]"> - Character #xD800 is not legal anywhere in an XML document. (If it - appeared in a UTF-16 surrogate pair, it'd represent half of a UCS-4 - character and so wouldn't really be in the document.) </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-146" - URI="not-wf/sa/146.xml" SECTIONS="2.2 [2]"> - Character references must also refer to legal XML characters; - #x00110000 is one more than the largest legal character.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-147" - URI="not-wf/sa/147.xml" SECTIONS="2.8 [22]"> - XML Declaration may not be preceded by whitespace.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-148" - URI="not-wf/sa/148.xml" SECTIONS="2.8 [22]"> - XML Declaration may not be preceded by comments or whitespace.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-149" - URI="not-wf/sa/149.xml" SECTIONS="2.8 [28]"> - XML Declaration may not be within a DTD.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-150" - URI="not-wf/sa/150.xml" SECTIONS="3.1 [43]"> - XML declarations may not be within element content. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-151" - URI="not-wf/sa/151.xml" SECTIONS="2.8 [27]"> - XML declarations may not follow document content.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-152" - URI="not-wf/sa/152.xml" SECTIONS="2.8 [22]"> - XML declarations must include the "version=..." string.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-153" - URI="not-wf/sa/153.xml" SECTIONS="4.3.2"> - Text declarations may not begin internal parsed entities; - they may only appear at the beginning of external parsed - (parameter or general) entities. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-154" - URI="not-wf/sa/154.xml" SECTIONS="2.8 2.6 [23, 17]"> - '<?XML ...?>' is neither an XML declaration - nor a legal processing instruction target name. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-155" - URI="not-wf/sa/155.xml" SECTIONS="2.8 2.6 [23, 17]"> - '<?xmL ...?>' is neither an XML declaration - nor a legal processing instruction target name. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-156" - URI="not-wf/sa/156.xml" SECTIONS="2.8 2.6 [23, 17]"> - '<?xMl ...?>' is neither an XML declaration - nor a legal processing instruction target name. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-157" - URI="not-wf/sa/157.xml" SECTIONS="2.6 [17]"> - '<?xmL ...?>' is not a legal processing instruction - target name. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-158" - URI="not-wf/sa/158.xml" SECTIONS="3.3 [52]"> - SGML-ism: "#NOTATION gif" can't have attributes. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-159" - URI="not-wf/sa/159.xml" SECTIONS="2.3 [9]"> - Uses '&' unquoted in an entity declaration, - which is illegal syntax for an entity reference.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-160" - URI="not-wf/sa/160.xml" SECTIONS="2.8"> - Violates the <EM>PEs in Internal Subset</EM> WFC - by using a PE reference within a declaration. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-161" - URI="not-wf/sa/161.xml" SECTIONS="2.8"> - Violates the <EM>PEs in Internal Subset</EM> WFC - by using a PE reference within a declaration. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-162" - URI="not-wf/sa/162.xml" SECTIONS="2.8"> - Violates the <EM>PEs in Internal Subset</EM> WFC - by using a PE reference within a declaration. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-163" - URI="not-wf/sa/163.xml" SECTIONS="4.1 [69]"> - Invalid placement of Parameter entity reference. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-164" - URI="not-wf/sa/164.xml" SECTIONS="4.1 [69]"> - Invalid placement of Parameter entity reference. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-165" - URI="not-wf/sa/165.xml" SECTIONS="4.2 [72]"> - Parameter entity declarations must have a space before - the '%'. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-166" - URI="not-wf/sa/166.xml" SECTIONS="2.2 [2]"> - Character FFFF is not legal anywhere in an XML document. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-167" - URI="not-wf/sa/167.xml" SECTIONS="2.2 [2]"> - Character FFFE is not legal anywhere in an XML document. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-168" - URI="not-wf/sa/168.xml" SECTIONS="2.2 [2]"> - An unpaired surrogate (D800) is not legal anywhere - in an XML document.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-169" - URI="not-wf/sa/169.xml" SECTIONS="2.2 [2]"> - An unpaired surrogate (DC00) is not legal anywhere - in an XML document.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-170" - URI="not-wf/sa/170.xml" SECTIONS="2.2 [2]"> - Four byte UTF-8 encodings can encode UCS-4 characters - which are beyond the range of legal XML characters - (and can't be expressed in Unicode surrogate pairs). - This document holds such a character. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-171" - URI="not-wf/sa/171.xml" SECTIONS="2.2 [2]"> - Character FFFF is not legal anywhere in an XML document. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-172" - URI="not-wf/sa/172.xml" SECTIONS="2.2 [2]"> - Character FFFF is not legal anywhere in an XML document. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-173" - URI="not-wf/sa/173.xml" SECTIONS="2.2 [2]"> - Character FFFF is not legal anywhere in an XML document. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-174" - URI="not-wf/sa/174.xml" SECTIONS="2.2 [2]"> - Character FFFF is not legal anywhere in an XML document. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-175" - URI="not-wf/sa/175.xml" SECTIONS="2.2 [2]"> - Character FFFF is not legal anywhere in an XML document. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-176" - URI="not-wf/sa/176.xml" SECTIONS="3 [39]"> - Start tags must have matching end tags.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-177" - URI="not-wf/sa/177.xml" SECTIONS="2.2 [2]"> - Character FFFF is not legal anywhere in an XML document. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-178" - URI="not-wf/sa/178.xml" SECTIONS="3.1 [41]"> - Invalid syntax matching double quote is missing. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-179" - URI="not-wf/sa/179.xml" SECTIONS="4.1 [66]"> - Invalid syntax matching double quote is missing. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-180" - URI="not-wf/sa/180.xml" SECTIONS="4.1"> - The <EM>Entity Declared</EM> WFC requires entities to be declared - before they are used in an attribute list declaration. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-181" - URI="not-wf/sa/181.xml" SECTIONS="4.3.2"> - Internal parsed entities must match the <EM>content</EM> - production to be well formed. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-182" - URI="not-wf/sa/182.xml" SECTIONS="4.3.2"> - Internal parsed entities must match the <EM>content</EM> - production to be well formed. </TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-183" - URI="not-wf/sa/183.xml" SECTIONS="3.2.2 [51]"> - Mixed content declarations may not include content particles.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-184" - URI="not-wf/sa/184.xml" SECTIONS="3.2.2 [51]"> - In mixed content models, element names must not be - parenthesized. </TEST> -<TEST TYPE="not-wf" ENTITIES="parameter" ID="not-wf-sa-185" - URI="not-wf/sa/185.xml" SECTIONS="4.1"> - Tests the <EM>Entity Declared</EM> WFC. - <EM>Note:</EM> a nonvalidating parser is permitted not to report - this WFC violation, since it would need to read an external - parameter entity to distinguish it from a violation of - the <EM>Standalone Declaration</EM> VC.</TEST> -<TEST TYPE="not-wf" ENTITIES="none" ID="not-wf-sa-186" - URI="not-wf/sa/186.xml" SECTIONS="3.1 [44]"> - Whitespace is required between attribute/value pairs. </TEST> - -<!-- Start: not-wf/not-sa --> -<TEST TYPE="not-wf" ENTITIES="both" ID="not-wf-not-sa-001" - URI="not-wf/not-sa/001.xml" SECTIONS="3.4 [62]"> - Conditional sections must be properly terminated ("]>" used - instead of "]]>"). </TEST> -<TEST TYPE="not-wf" ENTITIES="both" ID="not-wf-not-sa-002" - URI="not-wf/not-sa/002.xml" SECTIONS="2.6 [17]"> - Processing instruction target names may not be "XML" - in any combination of cases. </TEST> -<TEST TYPE="not-wf" ENTITIES="both" ID="not-wf-not-sa-003" - URI="not-wf/not-sa/003.xml" SECTIONS="3.4 [62]"> - Conditional sections must be properly terminated ("]]>" omitted). </TEST> -<TEST TYPE="not-wf" ENTITIES="both" ID="not-wf-not-sa-004" - URI="not-wf/not-sa/004.xml" SECTIONS="3.4 [62]"> - Conditional sections must be properly terminated ("]]>" omitted). </TEST> -<TEST TYPE="error" ENTITIES="both" ID="not-wf-not-sa-005" - URI="not-wf/not-sa/005.xml" SECTIONS="4.1"> - Tests the <EM>Entity Declared</EM> VC by referring to an - undefined parameter entity within an external entity.</TEST> -<TEST TYPE="not-wf" ENTITIES="both" ID="not-wf-not-sa-006" - URI="not-wf/not-sa/006.xml" SECTIONS="3.4 [62]"> - Conditional sections need a '[' after the INCLUDE or IGNORE. </TEST> -<TEST TYPE="not-wf" ENTITIES="both" ID="not-wf-not-sa-007" - URI="not-wf/not-sa/007.xml" SECTIONS="4.3.2 [79]"> - A <!DOCTYPE ...> declaration may not begin any external - entity; it's only found once, in the document entity.</TEST> -<TEST TYPE="not-wf" ENTITIES="both" ID="not-wf-not-sa-008" - URI="not-wf/not-sa/008.xml" SECTIONS="4.1 [69]"> - In DTDs, the '%' character must be part of a parameter - entity reference.</TEST> -<TEST TYPE="not-wf" ENTITIES="both" ID="not-wf-not-sa-009" - URI="not-wf/not-sa/009.xml" SECTIONS="2.8"> - This test violates WFC:PE Between Declarations in Production 28a. - The last character of a markup declaration is not contained in the same - parameter-entity text replacement.</TEST> -<!-- Start: not-wf/ext-sa --> -<TEST TYPE="not-wf" ENTITIES="both" ID="not-wf-ext-sa-001" - URI="not-wf/ext-sa/001.xml" SECTIONS="4.1"> - Tests the <EM>No Recursion</EM> WFC by having an external general - entity be self-recursive.</TEST> -<TEST TYPE="not-wf" ENTITIES="both" ID="not-wf-ext-sa-002" - URI="not-wf/ext-sa/002.xml" SECTIONS="4.3.1 4.3.2 [77, 78]"> - External entities have "text declarations", which do - not permit the "standalone=..." attribute that's allowed - in XML declarations.</TEST> -<TEST TYPE="not-wf" ENTITIES="both" ID="not-wf-ext-sa-003" - URI="not-wf/ext-sa/003.xml" SECTIONS="2.6 [17]"> - Only one text declaration is permitted; a second one - looks like an illegal processing instruction (target names - of "xml" in any case are not allowed). </TEST> - - -<!-- Start: invalid/ --> - -<TEST TYPE="invalid" ENTITIES="both" ID="invalid--002" - URI="invalid/002.xml" SECTIONS="3.2.1"> - Tests the "Proper Group/PE Nesting" validity constraint by - fragmenting a content model between two parameter entities.</TEST> -<TEST TYPE="invalid" ENTITIES="both" ID="invalid--005" - URI="invalid/005.xml" SECTIONS="2.8"> - Tests the "Proper Declaration/PE Nesting" validity constraint by - fragmenting an element declaration between two parameter entities.</TEST> -<TEST TYPE="invalid" ENTITIES="both" ID="invalid--006" - URI="invalid/006.xml" SECTIONS="2.8"> - Tests the "Proper Declaration/PE Nesting" validity constraint by - fragmenting an element declaration between two parameter entities.</TEST> -<TEST TYPE="invalid" ENTITIES="both" ID="invalid-not-sa-022" - URI="invalid/not-sa/022.xml" SECTIONS="3.4 [62]" - OUTPUT="invalid/not-sa/out/022.xml"> - Test the "Proper Conditional Section/ PE Nesting" validity constraint. </TEST> - -<!-- Start: valid/sa --> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-001" - URI="valid/sa/001.xml" SECTIONS="3.2.2 [51]" - OUTPUT="valid/sa/out/001.xml"> - Test demonstrates an Element Type Declaration with Mixed Content. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-002" - URI="valid/sa/002.xml" SECTIONS="3.1 [40]" - OUTPUT="valid/sa/out/002.xml"> - Test demonstrates that whitespace is permitted after the tag name in a Start-tag. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-003" - URI="valid/sa/003.xml" SECTIONS="3.1 [42]" - OUTPUT="valid/sa/out/003.xml"> - Test demonstrates that whitespace is permitted after the tag name in an End-tag.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-004" - URI="valid/sa/004.xml" SECTIONS="3.1 [41]" - OUTPUT="valid/sa/out/004.xml"> - Test demonstrates a valid attribute specification within a Start-tag. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-005" - URI="valid/sa/005.xml" SECTIONS="3.1 [40]" - OUTPUT="valid/sa/out/005.xml"> - Test demonstrates a valid attribute specification within a Start-tag that -contains whitespace on both sides of the equal sign. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-006" - URI="valid/sa/006.xml" SECTIONS="3.1 [41]" - OUTPUT="valid/sa/out/006.xml"> - Test demonstrates that the AttValue within a Start-tag can use a single quote as a delimter. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-007" - URI="valid/sa/007.xml" SECTIONS="3.1 4.6 [43]" - OUTPUT="valid/sa/out/007.xml"> - Test demonstrates numeric character references can be used for element content. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-008" - URI="valid/sa/008.xml" SECTIONS="2.4 3.1 [43]" - OUTPUT="valid/sa/out/008.xml"> - Test demonstrates character references can be used for element content. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-009" - URI="valid/sa/009.xml" SECTIONS="2.3 3.1 [43]" - OUTPUT="valid/sa/out/009.xml"> - Test demonstrates that PubidChar can be used for element content. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-010" - URI="valid/sa/010.xml" SECTIONS="3.1 [40]" - OUTPUT="valid/sa/out/010.xml"> - Test demonstrates that whitespace is valid after the Attribute in a Start-tag. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-011" - URI="valid/sa/011.xml" SECTIONS="3.1 [40]" - OUTPUT="valid/sa/out/011.xml"> - Test demonstrates mutliple Attibutes within the Start-tag. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-012" - URI="valid/sa/012.xml" SECTIONS="2.3 [4]" - OUTPUT="valid/sa/out/012.xml" NAMESPACE="no"> - Uses a legal XML 1.0 name consisting of a single colon - character (disallowed by the latest XML Namespaces draft).</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-013" - URI="valid/sa/013.xml" SECTIONS="2.3 3.1 [13] [40]" - OUTPUT="valid/sa/out/013.xml"> - Test demonstrates that the Attribute in a Start-tag can consist of numerals along with special characters. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-014" - URI="valid/sa/014.xml" SECTIONS="2.3 3.1 [13] [40]" - OUTPUT="valid/sa/out/014.xml"> - Test demonstrates that all lower case letters are valid for the Attribute in a Start-tag. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-015" - URI="valid/sa/015.xml" SECTIONS="2.3 3.1 [13] [40]" - OUTPUT="valid/sa/out/015.xml"> - Test demonstrates that all upper case letters are valid for the Attribute in a Start-tag. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-016" - URI="valid/sa/016.xml" SECTIONS="2.6 3.1 [16] [43]" - OUTPUT="valid/sa/out/016.xml"> - Test demonstrates that Processing Instructions are valid element content. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-017" - URI="valid/sa/017.xml" SECTIONS="2.6 3.1 [16] [43]" - OUTPUT="valid/sa/out/017.xml"> - Test demonstrates that Processing Instructions are valid element content and there can be more than one. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-018" - URI="valid/sa/018.xml" SECTIONS="2.7 3.1 [18] [43]" - OUTPUT="valid/sa/out/018.xml"> - Test demonstrates that CDATA sections are valid element content. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-019" - URI="valid/sa/019.xml" SECTIONS="2.7 3.1 [18] [43]" - OUTPUT="valid/sa/out/019.xml"> - Test demonstrates that CDATA sections are valid element content and that -ampersands may occur in their literal form. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-020" - URI="valid/sa/020.xml" SECTIONS="2.7 3.1 [18] [43]" - OUTPUT="valid/sa/out/020.xml"> - Test demonstractes that CDATA sections are valid element content and that -everyting between the CDStart and CDEnd is recognized as character data not markup. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-021" - URI="valid/sa/021.xml" SECTIONS="2.5 3.1 [15] [43]" - OUTPUT="valid/sa/out/021.xml"> - Test demonstrates that comments are valid element content. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-022" - URI="valid/sa/022.xml" SECTIONS="2.5 3.1 [15] [43]" - OUTPUT="valid/sa/out/022.xml"> - Test demonstrates that comments are valid element content and that all characters before the double-hypen right angle combination are considered part of thecomment. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-023" - URI="valid/sa/023.xml" SECTIONS="3.1 [43]" - OUTPUT="valid/sa/out/023.xml"> - Test demonstrates that Entity References are valid element content. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-024" - URI="valid/sa/024.xml" SECTIONS="3.1 4.1 [43] [66]" - OUTPUT="valid/sa/out/024.xml"> - Test demonstrates that Entity References are valid element content and also demonstrates a valid Entity Declaration. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-025" - URI="valid/sa/025.xml" SECTIONS="3.2 [46]" - OUTPUT="valid/sa/out/025.xml"> - Test demonstrates an Element Type Declaration and that the contentspec can be of mixed content. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-026" - URI="valid/sa/026.xml" SECTIONS="3.2 [46]" - OUTPUT="valid/sa/out/026.xml"> - Test demonstrates an Element Type Declaration and that EMPTY is a valid contentspec. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-027" - URI="valid/sa/027.xml" SECTIONS="3.2 [46]" - OUTPUT="valid/sa/out/027.xml"> - Test demonstrates an Element Type Declaration and that ANY is a valid contenspec. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-028" - URI="valid/sa/028.xml" SECTIONS="2.8 [24]" - OUTPUT="valid/sa/out/028.xml"> - Test demonstrates a valid prolog that uses double quotes as delimeters around the VersionNum. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-029" - URI="valid/sa/029.xml" SECTIONS="2.8 [24]" - OUTPUT="valid/sa/out/029.xml"> - Test demonstrates a valid prolog that uses single quotes as delimters around the VersionNum. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-030" - URI="valid/sa/030.xml" SECTIONS="2.8 [25]" - OUTPUT="valid/sa/out/030.xml"> - Test demonstrates a valid prolog that contains whitespace on both sides of the equal sign in the VersionInfo. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-031" - URI="valid/sa/031.xml" SECTIONS="4.3.3 [80]" - OUTPUT="valid/sa/out/031.xml"> - Test demonstrates a valid EncodingDecl within the prolog. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-032" - URI="valid/sa/032.xml" SECTIONS="2.9 [32]" - OUTPUT="valid/sa/out/032.xml"> - Test demonstrates a valid SDDecl within the prolog. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-033" - URI="valid/sa/033.xml" SECTIONS="2.8 [23]" - OUTPUT="valid/sa/out/033.xml"> - Test demonstrates that both a EncodingDecl and SDDecl are valid within the prolog. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-034" - URI="valid/sa/034.xml" SECTIONS="3.1 [44]" - OUTPUT="valid/sa/out/034.xml"> - Test demonstrates the correct syntax for an Empty element tag. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-035" - URI="valid/sa/035.xml" SECTIONS="3.1 [44]" - OUTPUT="valid/sa/out/035.xml"> - Test demonstrates that whitespace is permissible after the name in an Empty element tag. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-036" - URI="valid/sa/036.xml" SECTIONS="2.6 [16]" - OUTPUT="valid/sa/out/036.xml"> - Test demonstrates a valid processing instruction. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-037" - URI="valid/sa/037.xml" SECTIONS="2.6 [15]" - OUTPUT="valid/sa/out/037.xml"> - Test demonstrates a valid comment and that it may appear anywhere in the document including at the end. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-038" - URI="valid/sa/038.xml" SECTIONS="2.6 [15]" - OUTPUT="valid/sa/out/038.xml"> - Test demonstrates a valid comment and that it may appear anywhere in the document including the beginning. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-039" - URI="valid/sa/039.xml" SECTIONS="2.6 [16]" - OUTPUT="valid/sa/out/039.xml"> - Test demonstrates a valid processing instruction and that it may appear at the beginning of the document. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-040" - URI="valid/sa/040.xml" SECTIONS="3.3 3.3.1 [52] [54]" - OUTPUT="valid/sa/out/040.xml"> - Test demonstrates an Attribute List declaration that uses a StringType as the AttType. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-041" - URI="valid/sa/041.xml" SECTIONS="3.3.1 4.1 [54] [66]" - OUTPUT="valid/sa/out/041.xml"> - Test demonstrates an Attribute List declaration that uses a StringType as the AttType and also expands the CDATA attribute with a character reference. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-042" - URI="valid/sa/042.xml" SECTIONS="3.3.1 4.1 [54] [66]" - OUTPUT="valid/sa/out/042.xml"> - Test demonstrates an Attribute List declaration that uses a StringType as the AttType and also expands the CDATA attribute with a character reference. The test also shows that the leading zeros in the character reference are ignored. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-043" - URI="valid/sa/043.xml" SECTIONS="3.3" - OUTPUT="valid/sa/out/043.xml"> - An element's attributes may be declared before its content - model; and attribute values may contain newlines. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-044" - URI="valid/sa/044.xml" SECTIONS="3.1 [44]" - OUTPUT="valid/sa/out/044.xml"> - Test demonstrates that the empty-element tag must be use for an elements that are declared EMPTY. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-045" - URI="valid/sa/045.xml" SECTIONS="3.3 [52]" - OUTPUT="valid/sa/out/045.xml"> - Tests whether more than one definition can be provided for the same attribute of a given element type with the first declaration being binding. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-046" - URI="valid/sa/046.xml" SECTIONS="3.3 [52]" - OUTPUT="valid/sa/out/046.xml"> - Test demonstrates that when more than one AttlistDecl is provided for a given element type, the contents of all those provided are merged. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-047" - URI="valid/sa/047.xml" SECTIONS="3.1 [43]" - OUTPUT="valid/sa/out/047.xml"> - Test demonstrates that extra whitespace is normalized into single space character. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-048" - URI="valid/sa/048.xml" SECTIONS="2.4 3.1 [14] [43]" - OUTPUT="valid/sa/out/048.xml"> - Test demonstrates that character data is valid element content. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-049" - URI="valid/sa/049.xml" SECTIONS="2.2 [2]" - OUTPUT="valid/sa/out/049.xml"> - Test demonstrates that characters outside of normal ascii range can be used as element content. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-050" - URI="valid/sa/050.xml" SECTIONS="2.2 [2]" - OUTPUT="valid/sa/out/050.xml"> - Test demonstrates that characters outside of normal ascii range can be used as element content. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-051" - URI="valid/sa/051.xml" SECTIONS="2.2 [2]" - OUTPUT="valid/sa/out/051.xml"> - The document is encoded in UTF-16 and uses some name - characters well outside of the normal ASCII range. - </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-052" - URI="valid/sa/052.xml" SECTIONS="2.2 [2]" - OUTPUT="valid/sa/out/052.xml"> - The document is encoded in UTF-8 and the text inside the - root element uses two non-ASCII characters, encoded in UTF-8 - and each of which expands to a Unicode surrogate pair.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-053" - URI="valid/sa/053.xml" SECTIONS="4.4.2" - OUTPUT="valid/sa/out/053.xml"> - Tests inclusion of a well-formed internal entity, which - holds an element required by the content model.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-054" - URI="valid/sa/054.xml" SECTIONS="3.1 [40] [42]" - OUTPUT="valid/sa/out/054.xml"> - Test demonstrates that extra whitespace within Start-tags and End-tags are nomalized into single spaces. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-055" - URI="valid/sa/055.xml" SECTIONS="2.6 2.10 [16]" - OUTPUT="valid/sa/out/055.xml"> - Test demonstrates that extra whitespace within a processing instruction willnormalized into s single space character. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-056" - URI="valid/sa/056.xml" SECTIONS="3.3.1 4.1 [54] [66]" - OUTPUT="valid/sa/out/056.xml"> - Test demonstrates an Attribute List declaration that uses a StringType as the AttType and also expands the CDATA attribute with a character reference. The test also shows that the leading zeros in the character reference are ignored. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-057" - URI="valid/sa/057.xml" SECTIONS="3.2.1 [47]" - OUTPUT="valid/sa/out/057.xml"> - Test demonstrates an element content model whose element can occur zero or more times. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-058" - URI="valid/sa/058.xml" SECTIONS="3.3.3" - OUTPUT="valid/sa/out/058.xml"> - Test demonstrates that extra whitespace be normalized into a single space character in an attribute of type NMTOKENS. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-059" - URI="valid/sa/059.xml" SECTIONS="3.2 3.3 [46] [53]" - OUTPUT="valid/sa/out/059.xml"> - Test demonstrates an Element Type Declaration that uses the contentspec of EMPTY. The element cannot have any contents and must always appear as an empty element in the document. The test also shows an Attribute-list declaration with multiple AttDef's. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-060" - URI="valid/sa/060.xml" SECTIONS="4.1 [66]" - OUTPUT="valid/sa/out/060.xml"> - Test demonstrates the use of decimal Character References within element content. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-061" - URI="valid/sa/061.xml" SECTIONS="4.1 [66]" - OUTPUT="valid/sa/out/061.xml"> - Test demonstrates the use of decimal Character References within element content. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-062" - URI="valid/sa/062.xml" SECTIONS="4.1 [66]" - OUTPUT="valid/sa/out/062.xml"> - Test demonstrates the use of hexadecimal Character References within element. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-063" - URI="valid/sa/063.xml" SECTIONS="2.3 [5]" - OUTPUT="valid/sa/out/063.xml"> - The document is encoded in UTF-8 and the name of the - root element type uses non-ASCII characters. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-064" - URI="valid/sa/064.xml" SECTIONS="4.1 [66]" - OUTPUT="valid/sa/out/064.xml"> - Tests in-line handling of two legal character references, which - each expand to a Unicode surrogate pair.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-065" - URI="valid/sa/065.xml" SECTIONS="4.5" - OUTPUT="valid/sa/out/065.xml"> - Tests ability to define an internal entity which can't - legally be expanded (contains an unquoted <B><</B>).</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-066" - URI="valid/sa/066.xml" SECTIONS="4.1 [66]" - OUTPUT="valid/sa/out/066.xml"> - Expands a CDATA attribute with a character reference.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-067" - URI="valid/sa/067.xml" SECTIONS="4.1 [66]" - OUTPUT="valid/sa/out/067.xml"> - Test demonstrates the use of decimal character references within element content. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-068" - URI="valid/sa/068.xml" SECTIONS="2.11, 4.5" - OUTPUT="valid/sa/out/068.xml"> - Tests definition of an internal entity holding a carriage return character - reference, which must not be normalized before reporting to the application. Line - break normalization only occurs when parsing external parsed entities.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-069" - URI="valid/sa/069.xml" SECTIONS="4.7" - OUTPUT="valid/sa/out/069.xml"> - Verifies that an XML parser will parse a NOTATION - declaration; the output phase of this test ensures that - it's reported to the application. </TEST> -<TEST TYPE="valid" ENTITIES="parameter" ID="valid-sa-070" - URI="valid/sa/070.xml" SECTIONS="4.4.8" - OUTPUT="valid/sa/out/070.xml"> - Verifies that internal parameter entities are correctly - expanded within the internal subset.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-071" - URI="valid/sa/071.xml" SECTIONS="3.3 3.3.1 [52] [56]" - OUTPUT="valid/sa/out/071.xml"> - Test demonstrates that an AttlistDecl can use ID as the TokenizedType within the Attribute type. The test also shows that IMPLIED is a valid DefaultDecl. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-072" - URI="valid/sa/072.xml" SECTIONS="3.3 3.3.1 [52] [56]" - OUTPUT="valid/sa/out/072.xml"> - Test demonstrates that an AttlistDecl can use IDREF as the TokenizedType within the Attribute type. The test also shows that IMPLIED is a valid DefaultDecl. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-073" - URI="valid/sa/073.xml" SECTIONS="3.3 3.3.1 [52] [56]" - OUTPUT="valid/sa/out/073.xml"> - Test demonstrates that an AttlistDecl can use IDREFS as the TokenizedType within the Attribute type. The test also shows that IMPLIED is a valid DefaultDecl. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-074" - URI="valid/sa/074.xml" SECTIONS="3.3 3.3.1 [52] [56]" - OUTPUT="valid/sa/out/074.xml"> - Test demonstrates that an AttlistDecl can use ENTITY as the TokenizedType within the Attribute type. The test also shows that IMPLIED is a valid DefaultDecl. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-075" - URI="valid/sa/075.xml" SECTIONS="3.3 3.3.1 [52] [56]" - OUTPUT="valid/sa/out/075.xml"> - Test demonstrates that an AttlistDecl can use ENTITIES as the TokenizedType within the Attribute type. The test also shows that IMPLIED is a valid DefaultDecl. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-076" - URI="valid/sa/076.xml" SECTIONS="3.3.1" - OUTPUT="valid/sa/out/076.xml"> - Verifies that an XML parser will parse a NOTATION - attribute; the output phase of this test ensures that - both notations are reported to the application. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-077" - URI="valid/sa/077.xml" SECTIONS="3.3 3.3.1 [52] [54]" - OUTPUT="valid/sa/out/077.xml"> - Test demonstrates that an AttlistDecl can use an EnumeratedType within the Attribute type. The test also shows that IMPLIED is a valid DefaultDecl. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-078" - URI="valid/sa/078.xml" SECTIONS="3.3 3.3.1 [52] [54]" - OUTPUT="valid/sa/out/078.xml"> - Test demonstrates that an AttlistDecl can use an StringType of CDATA within the Attribute type. The test also shows that REQUIRED is a valid DefaultDecl. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-079" - URI="valid/sa/079.xml" SECTIONS="3.3 3.3.2 [52] [60]" - OUTPUT="valid/sa/out/079.xml"> - Test demonstrates that an AttlistDecl can use an StringType of CDATA within the Attribute type. The test also shows that FIXED is a valid DefaultDecl and that a value can be given to the attribute in the Start-tag as well as the AttListDecl. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-080" - URI="valid/sa/080.xml" SECTIONS="3.3 3.3.2 [52] [60]" - OUTPUT="valid/sa/out/080.xml"> - Test demonstrates that an AttlistDecl can use an StringType of CDATA within the Attribute type. The test also shows that FIXED is a valid DefaultDecl and that an value can be given to the attribute. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-081" - URI="valid/sa/081.xml" SECTIONS="3.2.1 [50]" - OUTPUT="valid/sa/out/081.xml"> - Test demonstrates the use of the optional character following a name or list to govern the number of times an element or content particles in the list occur. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-082" - URI="valid/sa/082.xml" SECTIONS="4.2 [72]" - OUTPUT="valid/sa/out/082.xml"> - Tests that an external PE may be defined (but not referenced).</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-083" - URI="valid/sa/083.xml" SECTIONS="4.2 [72]" - OUTPUT="valid/sa/out/083.xml"> - Tests that an external PE may be defined (but not referenced).</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-084" - URI="valid/sa/084.xml" SECTIONS="2.10" - OUTPUT="valid/sa/out/084.xml"> - Test demonstrates that although whitespace can be used to set apart markup for greater readability it is not necessary. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-085" - URI="valid/sa/085.xml" SECTIONS="4" - OUTPUT="valid/sa/out/085.xml"> - Parameter and General entities use different namespaces, - so there can be an entity of each type with a given name.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-086" - URI="valid/sa/086.xml" SECTIONS="4.2" - OUTPUT="valid/sa/out/086.xml"> - Tests whether entities may be declared more than once, - with the first declaration being the binding one. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-087" - URI="valid/sa/087.xml" SECTIONS="4.5" - OUTPUT="valid/sa/out/087.xml"> - Tests whether character references in internal entities are - expanded early enough, by relying on correct handling to - make the entity be well formed.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-088" - URI="valid/sa/088.xml" SECTIONS="4.5" - OUTPUT="valid/sa/out/088.xml"> - Tests whether entity references in internal entities are - expanded late enough, by relying on correct handling to - make the expanded text be valid. (If it's expanded too - early, the entity will parse as an element that's not - valid in that context.)</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-089" - URI="valid/sa/089.xml" SECTIONS="4.1 [66]" - OUTPUT="valid/sa/out/089.xml"> - Tests entity expansion of three legal character references, - which each expand to a Unicode surrogate pair.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-090" - URI="valid/sa/090.xml" SECTIONS="3.3.1" - OUTPUT="valid/sa/out/090.xml"> - Verifies that an XML parser will parse a NOTATION - attribute; the output phase of this test ensures that - the notation is reported to the application. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-091" - URI="valid/sa/091.xml" SECTIONS="3.3.1" - OUTPUT="valid/sa/out/091.xml"> - Verifies that an XML parser will parse an ENTITY - attribute; the output phase of this test ensures that - the notation is reported to the application, and for - validating parsers it further tests that the entity - is so reported.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-092" - URI="valid/sa/092.xml" SECTIONS="2.3 2.10" - OUTPUT="valid/sa/out/092.xml"> - Test demostrates that extra whitespace is normalized into a single space character. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-093" - URI="valid/sa/093.xml" SECTIONS="2.10" - OUTPUT="valid/sa/out/093.xml"> - Test demonstrates that extra whitespace is not intended for inclusion in the delivered version of the document. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-094" - OUTPUT="valid/sa/out/094.xml" - URI="valid/sa/094.xml" SECTIONS="2.8"> - Attribute defaults with a DTD have special parsing rules, different - from other strings. That means that characters found there may look - like an undefined parameter entity reference "within a markup - declaration", but they aren't ... so they can't be violating - the <EM>PEs in Internal Subset</EM> WFC. - </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-095" - URI="valid/sa/095.xml" SECTIONS="3.3.3" - OUTPUT="valid/sa/out/095.xml"> - Basically an output test, this requires extra whitespace - to be normalized into a single space character in an - attribute of type NMTOKENS.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-096" - URI="valid/sa/096.xml" SECTIONS="3.3.3" - OUTPUT="valid/sa/out/096.xml"> - Test demonstrates that extra whitespace is normalized into a single space character in an attribute of type NMTOKENS. </TEST> -<TEST TYPE="valid" ENTITIES="parameter" ID="valid-sa-097" - URI="valid/sa/097.xml" SECTIONS="3.3" - OUTPUT="valid/sa/out/097.xml"> - Basically an output test, this tests whether an externally - defined attribute declaration (with a default) takes proper - precedence over a subsequent internal declaration.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-098" - URI="valid/sa/098.xml" SECTIONS="2.6 2.10 [16]" - OUTPUT="valid/sa/out/098.xml"> - Test demonstrates that extra whitespace within a processing instruction is converted into a single space character.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-099" - URI="valid/sa/099.xml" SECTIONS="4.3.3 [81]" - OUTPUT="valid/sa/out/099.xml"> - Test demonstrates the name of the encoding can be composed of lowercase characters. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-100" - URI="valid/sa/100.xml" SECTIONS="2.3 [12]" - OUTPUT="valid/sa/out/100.xml"> - Makes sure that PUBLIC identifiers may have some strange - characters. <EM>NOTE: The XML editors have said that the XML - specification errata will specify that parameter entity expansion - does not occur in PUBLIC identifiers, so that the '%' character - will not flag a malformed parameter entity reference.</EM></TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-101" - URI="valid/sa/101.xml" SECTIONS="4.5" - OUTPUT="valid/sa/out/101.xml"> - This tests whether entity expansion is (incorrectly) done - while processing entity declarations; if it is, the entity - value literal will terminate prematurely.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-102" - URI="valid/sa/102.xml" SECTIONS="3.3.3" - OUTPUT="valid/sa/out/102.xml"> - Test demonstrates that a CDATA attribute can pass a double quote as its value. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-103" - URI="valid/sa/103.xml" SECTIONS="3.3.3" - OUTPUT="valid/sa/out/103.xml"> - Test demonstrates that an attribute can pass a less than sign as its value. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-104" - URI="valid/sa/104.xml" SECTIONS="3.1 [40]" - OUTPUT="valid/sa/out/104.xml"> - Test demonstrates that extra whitespace within an Attribute of a Start-tag is normalized to a single space character. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-105" - URI="valid/sa/105.xml" SECTIONS="3.3.3" - OUTPUT="valid/sa/out/105.xml"> - Basically an output test, this requires a CDATA attribute - with a tab character to be passed through as one space.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-106" - URI="valid/sa/106.xml" SECTIONS="3.3.3" - OUTPUT="valid/sa/out/106.xml"> - Basically an output test, this requires a CDATA attribute - with a newline character to be passed through as one space.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-107" - URI="valid/sa/107.xml" SECTIONS="3.3.3" - OUTPUT="valid/sa/out/107.xml"> - Basically an output test, this requires a CDATA attribute - with a return character to be passed through as one space.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-108" - URI="valid/sa/108.xml" SECTIONS="2.11, 3.3.3" - OUTPUT="valid/sa/out/108.xml"> - This tests normalization of end-of-line characters (CRLF) - within entities to LF, primarily as an output test. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-109" - URI="valid/sa/109.xml" SECTIONS="2.3 3.1 [10][40][41]" - OUTPUT="valid/sa/out/109.xml"> - Test demonstrates that an attribute can have a null value. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-110" - URI="valid/sa/110.xml" SECTIONS="3.3.3" - OUTPUT="valid/sa/out/110.xml"> - Basically an output test, this requires that a CDATA - attribute with a CRLF be normalized to one space.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-111" - URI="valid/sa/111.xml" SECTIONS="3.3.3" - OUTPUT="valid/sa/out/111.xml"> - Character references expanding to spaces doesn't affect - treatment of attributes. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-112" - URI="valid/sa/112.xml" SECTIONS="3.2.1 [48][49]" - OUTPUT="valid/sa/out/112.xml"> - Test demonstrates shows the use of content particles within the element content. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-113" - URI="valid/sa/113.xml" SECTIONS="3.3 [52][53]" - OUTPUT="valid/sa/out/113.xml"> - Test demonstrates that it is not an error to have attributes declared for an element not itself declared.</TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-114" - URI="valid/sa/114.xml" SECTIONS="2.7 [20]" - OUTPUT="valid/sa/out/114.xml"> - Test demonstrates that all text within a valid CDATA section is considered text and not recognized as markup. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-115" - URI="valid/sa/115.xml" SECTIONS="3.3.3" - OUTPUT="valid/sa/out/115.xml"> - Test demonstrates that an entity reference is processed by recursively processing the replacement text of the entity. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-116" - URI="valid/sa/116.xml" SECTIONS="2.11" - OUTPUT="valid/sa/out/116.xml"> - Test demonstrates that a line break within CDATA will be normalized. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-117" - URI="valid/sa/117.xml" SECTIONS="4.5" - OUTPUT="valid/sa/out/117.xml"> - Test demonstrates that entity expansion is done while processing entity declarations. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-118" - URI="valid/sa/118.xml" SECTIONS="4.5" - OUTPUT="valid/sa/out/118.xml"> - Test demonstrates that entity expansion is done while processing entity declarations. </TEST> -<TEST TYPE="valid" ENTITIES="none" ID="valid-sa-119" - URI="valid/sa/119.xml" SECTIONS="2.5" - OUTPUT="valid/sa/out/119.xml"> - Comments may contain any legal XML characters; - only the string "--" is disallowed.</TEST> - - -<!-- Start: valid/not-sa --> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-001" - URI="valid/not-sa/001.xml" SECTIONS="4.2.2 [75]" - OUTPUT="valid/not-sa/out/001.xml"> - Test demonstrates the use of an ExternalID within a document type definition. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-002" - URI="valid/not-sa/002.xml" SECTIONS="4.2.2 [75]" - OUTPUT="valid/not-sa/out/002.xml"> - Test demonstrates the use of an ExternalID within a document type definition. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-003" - URI="valid/not-sa/003.xml" SECTIONS="4.1 [69]" - OUTPUT="valid/not-sa/out/003.xml"> - Test demonstrates the expansion of an external parameter entity that declares an attribute. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-004" - URI="valid/not-sa/004.xml" SECTIONS="4.1 [69]" - OUTPUT="valid/not-sa/out/004.xml"> - Expands an external parameter entity in two different ways, - with one of them declaring an attribute.</TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-005" - URI="valid/not-sa/005.xml" SECTIONS="4.1 [69]" - OUTPUT="valid/not-sa/out/005.xml"> - Test demonstrates the expansion of an external parameter entity that declares an attribute. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-006" - URI="valid/not-sa/006.xml" SECTIONS="3.3 [52]" - OUTPUT="valid/not-sa/out/006.xml"> - Test demonstrates that when more than one definition is provided for the same attribute of a given element type only the first declaration is binding. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-007" - URI="valid/not-sa/007.xml" SECTIONS="3.3 [52]" - OUTPUT="valid/not-sa/out/007.xml"> - Test demonstrates the use of an Attribute list declaration within an external entity. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-008" - URI="valid/not-sa/008.xml" SECTIONS="4.2.2 [75]" - OUTPUT="valid/not-sa/out/008.xml"> - Test demonstrates that an external identifier may include a public identifier. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-009" - URI="valid/not-sa/009.xml" SECTIONS="4.2.2 [75]" - OUTPUT="valid/not-sa/out/009.xml"> - Test demonstrates that an external identifier may include a public identifier. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-010" - URI="valid/not-sa/010.xml" SECTIONS="3.3 [52]" - OUTPUT="valid/not-sa/out/010.xml"> - Test demonstrates that when more that one definition is provided for the same attribute of a given element type only the first declaration is binding. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-011" - URI="valid/not-sa/011.xml" SECTIONS="4.2 4.2.1 [72] [75]" - OUTPUT="valid/not-sa/out/011.xml"> - Test demonstrates a parameter entity declaration whose parameter entity definition is an ExternalID. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-012" - URI="valid/not-sa/012.xml" SECTIONS="4.3.1 [77]" - OUTPUT="valid/not-sa/out/012.xml"> - Test demonstrates an enternal parsed entity that begins with a text declaration. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-013" - URI="valid/not-sa/013.xml" SECTIONS="3.4 [62]" - OUTPUT="valid/not-sa/out/013.xml"> - Test demonstrates the use of the conditional section INCLUDE that will include its contents as part of the DTD. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-014" - URI="valid/not-sa/014.xml" SECTIONS="3.4 [62]" - OUTPUT="valid/not-sa/out/014.xml"> - Test demonstrates the use of the conditional section INCLUDE that will include its contents as part of the DTD. The keyword is a parameter-entity reference. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-015" - URI="valid/not-sa/015.xml" SECTIONS="3.4 [63]" - OUTPUT="valid/not-sa/out/015.xml"> - Test demonstrates the use of the conditonal section IGNORE the will ignore its content from being part of the DTD. The keyword is a parameter-entity reference. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-016" - URI="valid/not-sa/016.xml" SECTIONS="3.4 [62]" - OUTPUT="valid/not-sa/out/016.xml"> - Test demonstrates the use of the conditional section INCLUDE that will include its contents as part of the DTD. The keyword is a parameter-entity reference.</TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-017" - URI="valid/not-sa/017.xml" SECTIONS="4.2 [72]" - OUTPUT="valid/not-sa/out/017.xml"> - Test demonstrates a parameter entity declaration that contains an attribute list declaration. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-018" - URI="valid/not-sa/018.xml" SECTIONS="4.2.2 [75]" - OUTPUT="valid/not-sa/out/018.xml"> - Test demonstrates an EnternalID whose contents contain an parameter entity declaration and a attribute list definition. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-019" - URI="valid/not-sa/019.xml" SECTIONS="4.4.8" - OUTPUT="valid/not-sa/out/019.xml"> - Test demonstrates that a parameter entity will be expanded with spaces on either side. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-020" - URI="valid/not-sa/020.xml" SECTIONS="4.4.8" - OUTPUT="valid/not-sa/out/020.xml"> - Parameter entities expand with spaces on either side.</TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-021" - URI="valid/not-sa/021.xml" SECTIONS="4.2 [72]" - OUTPUT="valid/not-sa/out/021.xml"> - Test demonstrates a parameter entity declaration that contains a partial attribute list declaration. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-023" - URI="valid/not-sa/023.xml" SECTIONS="2.3 4.1 [10] [69]" - OUTPUT="valid/not-sa/out/023.xml"> - Test demonstrates the use of a parameter entity reference within an attribute list declaration. -</TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-024" - URI="valid/not-sa/024.xml" SECTIONS="2.8, 4.1 [69]" - OUTPUT="valid/not-sa/out/024.xml"> - Constructs an <!ATTLIST...> declaration from several PEs.</TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-025" - URI="valid/not-sa/025.xml" SECTIONS="4.2" - OUTPUT="valid/not-sa/out/025.xml"> - Test demonstrates that when more that one definition is provided for the same entity only the first declaration is binding. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-026" - URI="valid/not-sa/026.xml" SECTIONS="3.3 [52]" - OUTPUT="valid/not-sa/out/026.xml"> - Test demonstrates that when more that one definition is provided for the same attribute of a given element type only the first declaration is binding. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-027" - URI="valid/not-sa/027.xml" SECTIONS="4.1 [69]" - OUTPUT="valid/not-sa/out/027.xml"> - Test demonstrates a parameter entity reference whose value is NULL. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-028" - URI="valid/not-sa/028.xml" SECTIONS="3.4 [62]" - OUTPUT="valid/not-sa/out/028.xml"> - Test demonstrates the use of the conditional section INCLUDE that will include its contents. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-029" - URI="valid/not-sa/029.xml" SECTIONS="3.4 [62]" - OUTPUT="valid/not-sa/out/029.xml"> - Test demonstrates the use of the conditonal section IGNORE the will ignore its content from being used. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-030" - URI="valid/not-sa/030.xml" SECTIONS="3.4 [62]" - OUTPUT="valid/not-sa/out/030.xml"> - Test demonstrates the use of the conditonal section IGNORE the will ignore its content from being used. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-not-sa-031" - URI="valid/not-sa/031.xml" SECTIONS="2.7" - OUTPUT="valid/not-sa/out/031.xml"> - Expands a general entity which contains a CDATA section with - what looks like a markup declaration (but is just text since - it's in a CDATA section).</TEST> - - -<!-- Start: valid/ext-sa --> -<TEST TYPE="valid" ENTITIES="both" ID="valid-ext-sa-001" - URI="valid/ext-sa/001.xml" SECTIONS="2.11" - OUTPUT="valid/ext-sa/out/001.xml"> - A combination of carriage return line feed in an external entity must - be normalized to a single newline. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-ext-sa-002" - URI="valid/ext-sa/002.xml" SECTIONS="2.11" - OUTPUT="valid/ext-sa/out/002.xml"> - A carriage return (also CRLF) in an external entity must - be normalized to a single newline. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-ext-sa-003" - URI="valid/ext-sa/003.xml" SECTIONS="3.1 4.1 [43] [68]" - OUTPUT="valid/ext-sa/out/003.xml"> - Test demonstrates that the content of an element can be empty. In this case the external entity is an empty file. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-ext-sa-004" - URI="valid/ext-sa/004.xml" SECTIONS="2.11" - OUTPUT="valid/ext-sa/out/004.xml"> - A carriage return (also CRLF) in an external entity must - be normalized to a single newline. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-ext-sa-005" - URI="valid/ext-sa/005.xml" SECTIONS="3.2.1 4.2.2 [48] [75]" - OUTPUT="valid/ext-sa/out/005.xml"> - Test demonstrates the use of optional character and content particles within an element content. The test also show the use of external entity. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-ext-sa-006" - URI="valid/ext-sa/006.xml" SECTIONS="2.11 3.2.1 3.2.2 4.2.2 [48] [51] [75]" - OUTPUT="valid/ext-sa/out/006.xml"> - Test demonstrates the use of optional character and content particles within mixed element content. The test also shows the use of an external entity and that a carriage control line feed in an external entity must be normalized to a single newline. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-ext-sa-007" - URI="valid/ext-sa/007.xml" SECTIONS="4.2.2 4.4.3 [75]" - OUTPUT="valid/ext-sa/out/007.xml"> - Test demonstrates the use of external entity and how replacement -text is retrieved and processed. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-ext-sa-008" - URI="valid/ext-sa/008.xml" SECTIONS="4.2.2 4.3.3. 4.4.3 [75] [80]" - OUTPUT="valid/ext-sa/out/008.xml"> Test demonstrates the use of external -entity and how replacement text is retrieved and processed. Also tests the use of an -EncodingDecl of UTF-16.</TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-ext-sa-009" - URI="valid/ext-sa/009.xml" SECTIONS="2.11" - OUTPUT="valid/ext-sa/out/009.xml"> - A carriage return (also CRLF) in an external entity must - be normalized to a single newline. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-ext-sa-011" - URI="valid/ext-sa/011.xml" SECTIONS="2.11 4.2.2 [75]" - OUTPUT="valid/ext-sa/out/011.xml"> - Test demonstrates the use of a public identifier with and external entity. -The test also show that a carriage control line feed combination in an external -entity must be normalized to a single newline. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-ext-sa-012" - URI="valid/ext-sa/012.xml" SECTIONS="4.2.1 4.2.2" - OUTPUT="valid/ext-sa/out/012.xml"> - Test demonstrates both internal and external entities and that processing of entity references may be required to produce the correct replacement text.</TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-ext-sa-013" - URI="valid/ext-sa/013.xml" SECTIONS="3.3.3" - OUTPUT="valid/ext-sa/out/013.xml"> - Test demonstrates that whitespace is handled by adding a single whitespace to the normalized value in the attribute list. </TEST> -<TEST TYPE="valid" ENTITIES="both" ID="valid-ext-sa-014" - URI="valid/ext-sa/014.xml" SECTIONS="4.1 4.4.3 [68]" - OUTPUT="valid/ext-sa/out/014.xml"> - Test demonstrates use of characters outside of normal ASCII range.</TEST> -</TESTCASES> diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/069.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/069.xml index 41eed46727..41eed46727 100644 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/069.xml +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/069.xml diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/076.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/076.xml index b07019e90f..b07019e90f 100644 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/076.xml +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/076.xml diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/090.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/090.xml index 41eed46727..41eed46727 100644 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/090.xml +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/090.xml diff --git a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/091.xml b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/091.xml index c55a698bbb..c55a698bbb 100644 --- a/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest/valid/sa/out/091.xml +++ b/tests/auto/corelib/serialization/qxmlstream/XML-Test-Suite/xmlconf/xmltest_updates/091.xml diff --git a/tests/auto/corelib/serialization/qxmlstream/qc14n.h b/tests/auto/corelib/serialization/qxmlstream/qc14n.h index 7fb27382aa..5ae87f1a7a 100644 --- a/tests/auto/corelib/serialization/qxmlstream/qc14n.h +++ b/tests/auto/corelib/serialization/qxmlstream/qc14n.h @@ -1,35 +1,11 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -QT_FORWARD_DECLARE_CLASS(QIODevice) -QT_FORWARD_DECLARE_CLASS(QString) +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#include <QtCore/QDebug> #include <QtCore/QFlags> +#include <QtCore/QXmlStreamReader> + +#include <algorithm> class QC14N { @@ -118,18 +94,11 @@ bool QC14N::isAttributesEqual(const QXmlStreamReader &r1, const QXmlStreamAttributes &attrs1 = r1.attributes(); const QXmlStreamAttributes &attrs2 = r2.attributes(); - const int len = attrs1.size(); - - if(len != attrs2.size()) + if (attrs1.size() != attrs2.size()) return false; - for(int i = 0; i < len; ++i) - { - if(!attrs2.contains(attrs1.at(i))) - return false; - } - - return true; + auto existsInOtherList = [&attrs2](const auto &attr) { return attrs2.contains(attr); }; + return std::all_of(attrs1.cbegin(), attrs1.cend(), existsInOtherList); } bool QC14N::isDifferent(const QXmlStreamReader &r1, diff --git a/tests/auto/corelib/serialization/qxmlstream/setupSuite.sh b/tests/auto/corelib/serialization/qxmlstream/setupSuite.sh index 2bf5c5e020..3cf842c32a 100755 --- a/tests/auto/corelib/serialization/qxmlstream/setupSuite.sh +++ b/tests/auto/corelib/serialization/qxmlstream/setupSuite.sh @@ -1,31 +1,6 @@ #!/bin/sh -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is the build configuration utility of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:GPL-EXCEPT$ -## 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 General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 as published by the Free Software -## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -## 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-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2016 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 # # Hello! diff --git a/tests/auto/corelib/serialization/qxmlstream/tokenError/dtdInBody.xml b/tests/auto/corelib/serialization/qxmlstream/tokenError/dtdInBody.xml new file mode 100644 index 0000000000..1c3ca4e271 --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/tokenError/dtdInBody.xml @@ -0,0 +1,20 @@ +<!DOCTYPE TEST [ + <!ELEMENT TESTATTRIBUTE (CASE+)> + <!ELEMENT CASE (CLASS, FUNCTION)> + <!ELEMENT CLASS (#PCDATA)> + + <!-- adding random ENTITY statement, as this is typical DTD content --> + <!ENTITY unite "∪"> + + <!ATTLIST CASE CLASS CDATA #REQUIRED> +]> +<TEST> + <CASE> + <CLASS>tst_QXmlStream</CLASS> + </CASE> + <!-- invalid DTD in XML body follows --> + <!DOCTYPE DTDTEST [ + <!ELEMENT RESULT (CASE+)> + <!ATTLIST RESULT OUTPUT CDATA #REQUIRED> + ]> +</TEST> diff --git a/tests/auto/corelib/serialization/qxmlstream/tokenError/multipleDtd.xml b/tests/auto/corelib/serialization/qxmlstream/tokenError/multipleDtd.xml new file mode 100644 index 0000000000..cd398c0f9f --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/tokenError/multipleDtd.xml @@ -0,0 +1,20 @@ +<!DOCTYPE TEST [ + <!ELEMENT TESTATTRIBUTE (CASE+)> + <!ELEMENT CASE (CLASS, FUNCTION, DATASET, COMMENTS)> + <!ELEMENT CLASS (#PCDATA)> + + <!-- adding random ENTITY statements, as this is typical DTD content --> + <!ENTITY iff "⇔"> + + <!ATTLIST CASE CLASS CDATA #REQUIRED> +]> +<!-- invalid second DTD follows --> +<!DOCTYPE SECOND [ + <!ELEMENT SECONDATTRIBUTE (#PCDATA)> + <!ENTITY on "∘"> +]> +<TEST> + <CASE> + <CLASS>tst_QXmlStream</CLASS> + </CASE> +</TEST> diff --git a/tests/auto/corelib/serialization/qxmlstream/tokenError/wellFormed.xml b/tests/auto/corelib/serialization/qxmlstream/tokenError/wellFormed.xml new file mode 100644 index 0000000000..1b61a3f062 --- /dev/null +++ b/tests/auto/corelib/serialization/qxmlstream/tokenError/wellFormed.xml @@ -0,0 +1,15 @@ +<!DOCTYPE TEST [ + <!ELEMENT TESTATTRIBUTE (CASE+)> + <!ELEMENT CASE (CLASS, FUNCTION, DATASET, COMMENTS)> + <!ELEMENT CLASS (#PCDATA)> + + <!-- adding random ENTITY statements, as this is typical DTD content --> + <!ENTITY unite "∪"> + + <!ATTLIST CASE CLASS CDATA #REQUIRED> +]> +<TEST> + <CASE> + <CLASS>tst_QXmlStream</CLASS> + </CASE> +</TEST> diff --git a/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp b/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp index fa0728f020..b90d05b0fa 100644 --- a/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp +++ b/tests/auto/corelib/serialization/qxmlstream/tst_qxmlstream.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QDirIterator> @@ -33,18 +8,27 @@ #include <QNetworkReply> #include <QNetworkRequest> #include <QTest> +#include <QtTest/private/qcomparisontesthelper_p.h> #include <QUrl> #include <QXmlStreamReader> #include <QBuffer> #include <QStack> +#include <private/qzipreader_p.h> #include "qc14n.h" +using namespace Qt::StringLiterals; + Q_DECLARE_METATYPE(QXmlStreamReader::ReadElementTextBehaviour) static const char *const catalogFile = "XML-Test-Suite/xmlconf/finalCatalog.xml"; static const int expectedRunCount = 1646; static const int expectedSkipCount = 532; +static const char *const xmlTestsuiteDir = "XML-Test-Suite"; +static const char *const xmlconfDir = "XML-Test-Suite/xmlconf/"; +static const char *const xmlDatasetName = "xmltest"; +static const char *const updateFilesDir = "xmltest_updates"; +static const char *const destinationFolder = "/valid/sa/out/"; static inline int best(int a, int b) { @@ -66,6 +50,28 @@ static inline int best(int a, int b, int c) return qMin(qMin(a, b), c); } +// copied from tst_qmake.cpp +static void copyDir(const QString &sourceDirPath, const QString &targetDirPath) +{ + QDir currentDir; + QDirIterator dit(sourceDirPath, QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden); + while (dit.hasNext()) { + dit.next(); + const QString targetPath = targetDirPath + QLatin1Char('/') + dit.fileName(); + currentDir.mkpath(targetPath); + copyDir(dit.filePath(), targetPath); + } + + QDirIterator fit(sourceDirPath, QDir::Files | QDir::Hidden); + while (fit.hasNext()) { + fit.next(); + const QString targetPath = targetDirPath + QLatin1Char('/') + fit.fileName(); + QFile::remove(targetPath); // allowed to fail + QFile src(fit.filePath()); + QVERIFY2(src.copy(targetPath), qPrintable(src.errorString())); + } +} + template <typename C> const C sorted_by_name(C c) { // return by const value so we can feed directly into range-for loops below using T = typename C::value_type; @@ -89,8 +95,8 @@ static QByteArray makeCanonical(const QString &filename, bool testIncremental = false) { QFile file(filename); - file.open(QIODevice::ReadOnly); - + if (!file.open(QIODevice::ReadOnly)) + qFatal("Could not open file %s", qPrintable(filename)); QXmlStreamReader reader; QByteArray buffer; @@ -530,13 +536,15 @@ class tst_QXmlStream: public QObject { Q_OBJECT public: - tst_QXmlStream() : m_handler(QUrl::fromLocalFile(QFINDTESTDATA(catalogFile))) + tst_QXmlStream() : m_handler(QUrl::fromLocalFile(m_tempDir.filePath(catalogFile))) { } private slots: void initTestCase(); void cleanupTestCase(); + void compareCompiles(); + void runTestSuite(); void reportFailures() const; void reportFailures_data(); void checkBaseline() const; @@ -555,6 +563,7 @@ private slots: void setEntityResolver(); void readFromQBuffer() const; void readFromQBufferInvalid() const; + void readFromLatin1String() const; void readNextStartElement() const; void readElementText() const; void readElementText_data() const; @@ -563,6 +572,14 @@ private slots: void hasAttribute() const; void writeWithUtf8Codec() const; void writeWithStandalone() const; + void writeCharacters_data() const; + void writeCharacters() const; + void writeAttribute_data() const; + void writeAttribute() const; + void writeBadCharactersUtf8_data() const; + void writeBadCharactersUtf8() const; + void writeBadCharactersUtf16_data() const; + void writeBadCharactersUtf16() const; void entitiesAndWhitespace_1() const; void entitiesAndWhitespace_2() const; void testFalsePrematureError() const; @@ -575,30 +592,77 @@ private slots: void invalidStringCharacters_data() const; void invalidStringCharacters() const; void hasError() const; + void readBack_data() const; void readBack() const; void roundTrip() const; void roundTrip_data() const; + void test_fastScanName_data() const; + void test_fastScanName() const; void entityExpansionLimit() const; + void tokenErrorHandling_data() const; + void tokenErrorHandling() const; + void checkStreamNotationDeclarations() const; + void checkStreamEntityDeclarations() const; + private: static QByteArray readFile(const QString &filename); + QTemporaryDir m_tempDir; TestSuiteHandler m_handler; }; void tst_QXmlStream::initTestCase() { - QFile file(QFINDTESTDATA(catalogFile)); - QVERIFY2(file.open(QIODevice::ReadOnly), - qPrintable(QString::fromLatin1("Failed to open the test suite catalog; %1").arg(file.fileName()))); - - QVERIFY(m_handler.runTests(&file)); + // Due to license restrictions, we need to distribute part of the test + // suit as a zip archive. So we need to unzip it before running the tests, + // and also update some files there. + // We also need to remove the unzipped data during cleanup. + + // On Android, we cannot unzip at the resource location, so we copy + // everything to a temporary directory first. + const QString XML_Test_Suite_dir = QFINDTESTDATA(xmlTestsuiteDir); + const QString XML_Test_Suite_destDir = m_tempDir.filePath(xmlTestsuiteDir); + copyDir(XML_Test_Suite_dir, XML_Test_Suite_destDir); + + + const QString filesDir(m_tempDir.filePath(xmlconfDir)); + const QString fileName = filesDir + xmlDatasetName + ".zip"; + QVERIFY(QFile::exists(fileName)); + QZipReader reader(fileName); + QVERIFY(reader.isReadable()); + QVERIFY(reader.extractAll(filesDir)); + // update files + const auto files = + QDir(filesDir + updateFilesDir).entryInfoList(QDir::Files | QDir::NoDotAndDotDot); + for (const auto &fileInfo : files) { + const QString destinationPath = + filesDir + xmlDatasetName + destinationFolder + fileInfo.fileName(); + QFile::remove(destinationPath); // copy will fail if file exists + QVERIFY(QFile::copy(fileInfo.filePath(), destinationPath)); + } } void tst_QXmlStream::cleanupTestCase() { - QFile::remove(QLatin1String("test.xml")); +} + +void tst_QXmlStream::compareCompiles() +{ + QTestPrivate::testEqualityOperatorsCompile<QXmlStreamAttribute>(); + QTestPrivate::testEqualityOperatorsCompile<QXmlStreamNamespaceDeclaration>(); + QTestPrivate::testEqualityOperatorsCompile<QXmlStreamNotationDeclaration>(); + QTestPrivate::testEqualityOperatorsCompile<QXmlStreamEntityDeclaration>(); +} + +void tst_QXmlStream::runTestSuite() +{ + QFile file(m_tempDir.filePath(catalogFile)); + QVERIFY2(file.open(QIODevice::ReadOnly), + qPrintable(QString::fromLatin1("Failed to open the test suite catalog; %1").arg(file.fileName()))); + + QVERIFY(m_handler.runTests(&file)); } void tst_QXmlStream::reportFailures() const @@ -611,7 +675,7 @@ void tst_QXmlStream::reportFailures() const void tst_QXmlStream::reportFailures_data() { - const int len = m_handler.failures.count(); + const int len = m_handler.failures.size(); QTest::addColumn<bool>("isError"); QTest::addColumn<QString>("description"); @@ -648,7 +712,7 @@ void tst_QXmlStream::checkBaseline_data() const QTest::addColumn<QString>("expected"); QTest::addColumn<QString>("output"); - const int len = m_handler.missedBaselines.count(); + const int len = m_handler.missedBaselines.size(); for(int i = 0; i < len; ++i) { @@ -677,7 +741,7 @@ void tst_QXmlStream::reportSuccess_data() const { QTest::addColumn<bool>("isError"); - const int len = m_handler.successes.count(); + const int len = m_handler.successes.size(); for (int i = 0; i < len; ++i) { const QByteArray testName = QByteArray::number(i) + ". " + m_handler.successes.at(i).toLatin1(); @@ -691,7 +755,8 @@ void tst_QXmlStream::reportSuccess_data() const QByteArray tst_QXmlStream::readFile(const QString &filename) { QFile file(filename); - file.open(QIODevice::ReadOnly); + if (!file.open(QIODevice::ReadOnly)) + qFatal("Could not open file %s", qPrintable(filename)); QXmlStreamReader reader; @@ -842,12 +907,17 @@ void tst_QXmlStream::addExtraNamespaceDeclarations() } { QXmlStreamReader xml(data); - xml.addExtraNamespaceDeclaration(QXmlStreamNamespaceDeclaration("undeclared", "blabla")); - xml.addExtraNamespaceDeclaration(QXmlStreamNamespaceDeclaration("undeclared_too", "foofoo")); + QXmlStreamNamespaceDeclaration undeclared("undeclared", "blabla"); + QXmlStreamNamespaceDeclaration undeclared_too("undeclared_too", "blabla"); + xml.addExtraNamespaceDeclaration(undeclared); + xml.addExtraNamespaceDeclaration(undeclared_too); while (!xml.atEnd()) { xml.readNext(); } QVERIFY2(!xml.hasError(), xml.errorString().toLatin1().constData()); + QT_TEST_EQUALITY_OPS(undeclared, undeclared_too, false); + undeclared = undeclared_too; + QT_TEST_EQUALITY_OPS(undeclared, undeclared_too, true); } } @@ -1068,6 +1138,25 @@ void tst_QXmlStream::readFromQBufferInvalid() const QVERIFY(reader.hasError()); } +void tst_QXmlStream::readFromLatin1String() const +{ + const auto in = "<a>M\xE5rten</a>"_L1; + { + QXmlStreamReader reader(in); + QVERIFY(reader.readNextStartElement()); + QString text = reader.readElementText(); + QCOMPARE(text, "M\xE5rten"_L1); + } + // Same as above, but with addData() + { + QXmlStreamReader reader; + reader.addData(in); + QVERIFY(reader.readNextStartElement()); + QString text = reader.readElementText(); + QCOMPARE(text, "M\xE5rten"_L1); + } +} + void tst_QXmlStream::readNextStartElement() const { QLatin1String in("<?xml version=\"1.0\"?><A><!-- blah --><B><C/></B><B attr=\"value\"/>text</A>"); @@ -1084,6 +1173,10 @@ void tst_QXmlStream::readNextStartElement() const } QCOMPARE(amountOfB, 2); + + // well-formed document end follows + QVERIFY(!reader.readNextStartElement()); + QCOMPARE(reader.error(), QXmlStreamReader::NoError); } void tst_QXmlStream::readElementText() const @@ -1201,8 +1294,20 @@ void tst_QXmlStream::hasAttributeSignature() const void tst_QXmlStream::hasAttribute() const { - QXmlStreamReader reader(QLatin1String("<e xmlns:p='http://example.com/2' xmlns='http://example.com/' " - "attr1='value' attr2='value2' p:attr3='value3' emptyAttr=''><noAttributes/></e>")); + auto xml = QStringLiteral("<e" + " xmlns:p='http://example.com/2'" + " xmlns='http://example.com/'" + " attr1='value'" + " attr2='value2'" + " p:attr3='value3'" + " emptyAttr=''" + " atträbute='meep'" + " α='β'" + " >" + " <noAttributes/>" + "</e>"); + + QXmlStreamReader reader(xml); QCOMPARE(reader.readNext(), QXmlStreamReader::StartDocument); QCOMPARE(reader.readNext(), QXmlStreamReader::StartElement); @@ -1213,8 +1318,18 @@ void tst_QXmlStream::hasAttribute() const QVERIFY(atts.hasAttribute(QLatin1String("attr2"))); QVERIFY(atts.hasAttribute(QLatin1String("p:attr3"))); QVERIFY(atts.hasAttribute(QLatin1String("emptyAttr"))); + QVERIFY(atts.hasAttribute(QLatin1String("attr\xE4""bute"))); + // α is not representable in L1... QVERIFY(!atts.hasAttribute(QLatin1String("DOESNOTEXIST"))); + /* string literals (UTF-8/16) */ + QVERIFY(atts.hasAttribute(u8"atträbute")); + QVERIFY(atts.hasAttribute( u"atträbute")); + QVERIFY(atts.hasAttribute(u8"α")); + QVERIFY(atts.hasAttribute( u"α")); + QVERIFY(!atts.hasAttribute(u8"β")); + QVERIFY(!atts.hasAttribute( u"β")); + /* Test with an empty & null namespaces. */ QVERIFY(atts.hasAttribute(QString(), QLatin1String("attr2"))); /* A null string. */ QVERIFY(atts.hasAttribute(QLatin1String(""), QLatin1String("attr2"))); /* An empty string. */ @@ -1223,6 +1338,8 @@ void tst_QXmlStream::hasAttribute() const QVERIFY(atts.hasAttribute(QString::fromLatin1("attr1"))); QVERIFY(atts.hasAttribute(QString::fromLatin1("attr2"))); QVERIFY(atts.hasAttribute(QString::fromLatin1("p:attr3"))); + QVERIFY(atts.hasAttribute(QStringLiteral("atträbute"))); + QVERIFY(atts.hasAttribute(QStringLiteral("α"))); QVERIFY(atts.hasAttribute(QString::fromLatin1("emptyAttr"))); QVERIFY(!atts.hasAttribute(QString::fromLatin1("DOESNOTEXIST"))); @@ -1236,6 +1353,7 @@ void tst_QXmlStream::hasAttribute() const QVERIFY(!atts.hasAttribute(QLatin1String("WRONG_NAMESPACE"), QString::fromLatin1("attr3"))); /* Invoke on an QXmlStreamAttributes that has no attributes at all. */ + QCOMPARE(reader.readNext(), QXmlStreamReader::Characters); QCOMPARE(reader.readNext(), QXmlStreamReader::StartElement); const QXmlStreamAttributes &atts2 = reader.attributes(); @@ -1254,6 +1372,15 @@ void tst_QXmlStream::hasAttribute() const reader.readNext(); QVERIFY(!reader.hasError()); + + QXmlStreamAttribute attrValue1(QLatin1String("http://example.com/"), QString::fromLatin1("attr1")); + QXmlStreamAttribute attrValue2 = atts.at(0); + QT_TEST_EQUALITY_OPS(atts.at(0), QXmlStreamAttribute(), false); + QT_TEST_EQUALITY_OPS(atts.at(0), attrValue1, false); + QT_TEST_EQUALITY_OPS(atts.at(0), attrValue2, true); + QT_TEST_EQUALITY_OPS(attrValue1, attrValue2, false); + attrValue1 = attrValue2; + QT_TEST_EQUALITY_OPS(attrValue1, attrValue2, true); } void tst_QXmlStream::writeWithUtf8Codec() const @@ -1288,6 +1415,143 @@ void tst_QXmlStream::writeWithStandalone() const } } +static void writeCharacters_data_common() +{ + QTest::addColumn<QString>("input"); + QTest::addColumn<QString>("output"); + + QTest::newRow("empty") << QString() << QString(); + + // invalid content + QTest::newRow("null-character") << u"\0"_s << QString(); + QTest::newRow("vertical-tab") << "\v" << QString(); + QTest::newRow("form-feed") << "\f" << QString(); + QTest::newRow("esc") << "\x1f" << QString(); + QTest::newRow("U+FFFE") << u"\xfffe"_s << QString(); + QTest::newRow("U+FFFF") << u"\xffff"_s << QString(); + + // simple strings + QTest::newRow("us-ascii") << "Hello, world" << "Hello, world"; + QTest::newRow("latin1") << "Bokmål" << "Bokmål"; + QTest::newRow("nonlatin1") << "Ελληνικά" << "Ελληνικά"; + QTest::newRow("nonbmp") << u"\U00010000"_s << u"\U00010000"_s; + + // escaped content + QTest::newRow("less-than") << "<" << "<"; + QTest::newRow("greater-than") << ">" << ">"; + QTest::newRow("ampersand") << "&" << "&"; + QTest::newRow("quote") << "\"" << """; +} + +template <typename Execute, typename Transform> +static void writeCharacters_common(Execute &&exec, Transform &&transform) +{ + QFETCH(QString, input); + QFETCH(QString, output); + QStringView utf16 = input; + QByteArray utf8ba = input.toUtf8(); + QUtf8StringView utf8(utf8ba); + + // may be invalid if input is not Latin1 + QByteArray l1ba = input.toLatin1(); + QLatin1StringView l1(l1ba); + if (l1 != input) + l1 = {}; + + auto write = [&](auto input) -> std::optional<QString> { + QString result; + QXmlStreamWriter writer(&result); + writer.writeStartElement("a"); + exec(writer, input); + writer.writeEndElement(); + if (writer.hasError()) + return std::nullopt; + return result; + }; + + if (input.isNull() != output.isNull()) { + // error + QCOMPARE(write(utf16), std::nullopt); + QCOMPARE(write(utf8), std::nullopt); + if (!l1.isEmpty()) + QCOMPARE(write(l1), std::nullopt); + } else { + output = transform(output); + QCOMPARE(write(utf16), output); + QCOMPARE(write(utf8), output); + if (!l1.isEmpty()) + QCOMPARE(write(l1), output); + } +} + +void tst_QXmlStream::writeCharacters_data() const +{ + writeCharacters_data_common(); + QTest::newRow("tab") << "\t" << "\t"; + QTest::newRow("newline") << "\n" << "\n"; + QTest::newRow("carriage-return") << "\r" << "\r"; +} + +void tst_QXmlStream::writeCharacters() const +{ + auto exec = [](QXmlStreamWriter &writer, auto input) { + writer.writeCharacters(input); + }; + auto transform = [](auto output) { return "<a>" + output + "</a>"; }; + writeCharacters_common(exec, transform); +} + +void tst_QXmlStream::writeAttribute_data() const +{ + writeCharacters_data_common(); + QTest::newRow("tab") << "\t" << "	"; + QTest::newRow("newline") << "\n" << " "; + QTest::newRow("carriage-return") << "\r" << " "; +} + +void tst_QXmlStream::writeAttribute() const +{ + auto exec = [](QXmlStreamWriter &writer, auto input) { + writer.writeAttribute("b", input); + }; + auto transform = [](auto output) { return "<a b=\"" + output + "\"/>"; }; + writeCharacters_common(exec, transform); +} + +#include "../../io/qurlinternal/utf8data.cpp" +void tst_QXmlStream::writeBadCharactersUtf8_data() const +{ + QTest::addColumn<QByteArray>("input"); + loadInvalidUtf8Rows(); +} + +void tst_QXmlStream::writeBadCharactersUtf8() const +{ + QFETCH(QByteArray, input); + QString target; + QXmlStreamWriter writer(&target); + writer.writeTextElement("a", QUtf8StringView(input)); + QVERIFY(writer.hasError()); +} + +void tst_QXmlStream::writeBadCharactersUtf16_data() const +{ + QTest::addColumn<QString>("input"); + QTest::addRow("low-surrogate") << u"\xdc00"_s; + QTest::addRow("high-surrogate") << u"\xd800"_s; + QTest::addRow("inverted-surrogate-pair") << u"\xdc00\xd800"_s; + QTest::addRow("high-surrogate+non-surrogate") << u"\xd800z"_s; +} + +void tst_QXmlStream::writeBadCharactersUtf16() const +{ + QFETCH(QString, input); + QString target; + QXmlStreamWriter writer(&target); + writer.writeTextElement("a", input); + QVERIFY(writer.hasError()); +} + void tst_QXmlStream::entitiesAndWhitespace_1() const { QXmlStreamReader reader(QLatin1String("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\"><test>&extEnt;</test>")); @@ -1607,41 +1871,64 @@ void tst_QXmlStream::invalidStringCharacters_data() const // } -static bool isValidSingleTextChar(const ushort c) +static bool isValidSingleTextChar(char32_t c) { - // Conforms to https://www.w3.org/TR/REC-xml/#NT-Char - except for the high range, which is done - // with surrogates. + // Conforms to https://www.w3.org/TR/REC-xml/#NT-Char // Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF] - static const QPair<ushort, ushort> validRanges[] = { - QPair<ushort, ushort>(0x9, 0xb), - QPair<ushort, ushort>(0xd, 0xe), - QPair<ushort, ushort>(0x20, 0xd800), - QPair<ushort, ushort>(0xe000, 0xfffe) + constexpr struct { char32_t lo, hi; } validRanges[] = { + {0x9, 0xA}, + {0xD, 0xD}, + {0x20, 0xD7ff}, + {0xE000, 0xFFFD}, + {0x1'0000, 0x10'FFFF}, }; - for (const QPair<ushort, ushort> &range : validRanges) { - if (c >= range.first && c < range.second) + for (const auto range : validRanges) { + if (c >= range.lo && c <= range.hi) return true; } return false; } +void tst_QXmlStream::readBack_data() const +{ + QTest::addColumn<int>("plane"); + + // Check all 17 Unicode planes. Split into separate executions lest the + // test function times out in asan builds. + + for (int i = 0; i < 17; ++i) + QTest::addRow("plane-%02d", i) << i; +} + void tst_QXmlStream::readBack() const { - for (ushort c = 0; c < std::numeric_limits<ushort>::max(); ++c) { - QBuffer buffer; + QFETCH(const int, plane); + + constexpr qsizetype MaxChunkSizeWhenEncoding = 512; // from qxmlstream.cpp + QBuffer buffer; + QString text = QString(513, 'a'); // one longer than the internal conversion buffer - QVERIFY(buffer.open(QIODevice::WriteOnly)); + for (char16_t i = 0; i < (std::numeric_limits<char16_t>::max)(); ++i) { + + const char32_t c = (plane << 16) + i; + + // end chunk in invalid character, split surrogates: + const auto pair = QChar::fromUcs4(c); + text.resize(MaxChunkSizeWhenEncoding + 1 - pair.size()); + text += pair; + + QVERIFY(buffer.open(QIODevice::WriteOnly|QIODevice::Truncate)); QXmlStreamWriter writer(&buffer); writer.writeStartDocument(); - writer.writeTextElement("a", QString(QChar(c))); + writer.writeTextElement("a", text); writer.writeEndDocument(); buffer.close(); - if (writer.hasError()) { - QVERIFY2(!isValidSingleTextChar(c), QByteArray::number(c)); + if (!isValidSingleTextChar(c)) { + QVERIFY2(writer.hasError(), QByteArray::number(c)); } else { - QVERIFY2(isValidSingleTextChar(c), QByteArray::number(c)); + QVERIFY2(!writer.hasError(), QByteArray::number(c)); QVERIFY(buffer.open(QIODevice::ReadOnly)); QXmlStreamReader reader(&buffer); do { @@ -1663,6 +1950,22 @@ void tst_QXmlStream::roundTrip_data() const "<child xmlns:unknown=\"http://mydomain\">Text</child>" "</father>" "</root>\n"; + + // When a namespace is introduced by an attribute of an element, + // that element can exercise the namespace in its tag. + // This used (QTBUG-75456) to lead to the namespace definition + // being wrongly duplicated, with a new name. + QTest::newRow("QTBUG-75456") << + "<?xml version=\"1.0\"?>" + "<abc:root xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:abc=\"ns1\">" + "<abc:parent>" + "<abc:child xmlns:unknown=\"http://mydomain\">Text</abc:child>" + "</abc:parent>" + "<def:parent xmlns:def=\"ns2\" id=\"test\">" + "<def:child id=\"Timmy\">More text</def:child>" + "<def:child id=\"Jimmy\">Even more text</def:child>" + "</def:parent>" + "</abc:root>\n"; } void tst_QXmlStream::entityExpansionLimit() const @@ -1722,5 +2025,126 @@ void tst_QXmlStream::roundTrip() const QCOMPARE(out, in); } +void tst_QXmlStream::test_fastScanName_data() const +{ + QTest::addColumn<QByteArray>("data"); + QTest::addColumn<QXmlStreamReader::Error>("errorType"); + + // 4096 is the limit in QXmlStreamReaderPrivate::fastScanName() + + QByteArray arr = "<a:" + QByteArray("b").repeated(4096 - 1); + QTest::newRow("data1") << arr << QXmlStreamReader::PrematureEndOfDocumentError; + + arr = "<a:" + QByteArray("b").repeated(4096); + QTest::newRow("data2") << arr << QXmlStreamReader::NotWellFormedError; + + arr = "<" + QByteArray("a").repeated(4000) + ":" + QByteArray("b").repeated(96); + QTest::newRow("data3") << arr << QXmlStreamReader::PrematureEndOfDocumentError; + + arr = "<" + QByteArray("a").repeated(4000) + ":" + QByteArray("b").repeated(96 + 1); + QTest::newRow("data4") << arr << QXmlStreamReader::NotWellFormedError; + + arr = "<" + QByteArray("a").repeated(4000 + 1) + ":" + QByteArray("b").repeated(96); + QTest::newRow("data5") << arr << QXmlStreamReader::NotWellFormedError; +} + +void tst_QXmlStream::test_fastScanName() const +{ + QFETCH(QByteArray, data); + QFETCH(QXmlStreamReader::Error, errorType); + + QXmlStreamReader reader(data); + QXmlStreamReader::TokenType tokenType; + while (!reader.atEnd()) + tokenType = reader.readNext(); + + QCOMPARE(tokenType, QXmlStreamReader::Invalid); + QCOMPARE(reader.error(), errorType); +} + +void tst_QXmlStream::tokenErrorHandling_data() const +{ + QTest::addColumn<QString>("fileName"); + QTest::addColumn<QXmlStreamReader::Error>("expectedError"); + QTest::addColumn<QString>("errorKeyWord"); + + constexpr auto invalid = QXmlStreamReader::Error::UnexpectedElementError; + constexpr auto valid = QXmlStreamReader::Error::NoError; + QTest::newRow("DtdInBody") << "dtdInBody.xml" << invalid << "DTD"; + QTest::newRow("multipleDTD") << "multipleDtd.xml" << invalid << "second DTD"; + QTest::newRow("wellFormed") << "wellFormed.xml" << valid << ""; +} + +void tst_QXmlStream::tokenErrorHandling() const +{ + QFETCH(const QString, fileName); + QFETCH(const QXmlStreamReader::Error, expectedError); + QFETCH(const QString, errorKeyWord); + + const QDir dir(QFINDTESTDATA("tokenError")); + QFile file(dir.absoluteFilePath(fileName)); + + // Cross-compiling: Files may not be found when running test standalone + // QSKIP in that case, because the tested functionality is platform independent. + if (!file.exists()) + QSKIP(QObject::tr("Testfile %1 not found.").arg(fileName).toUtf8().constData()); + + QVERIFY(file.open(QIODevice::ReadOnly)); + QXmlStreamReader reader(&file); + while (!reader.atEnd()) + reader.readNext(); + + QCOMPARE(reader.error(), expectedError); + if (expectedError != QXmlStreamReader::Error::NoError) + QVERIFY(reader.errorString().contains(errorKeyWord)); +} + +void tst_QXmlStream::checkStreamNotationDeclarations() const +{ + QString fileName("12.xml"); + const QDir dir(QFINDTESTDATA("data")); + QFile file(dir.absoluteFilePath(fileName)); + if (!file.exists()) + QSKIP(QObject::tr("Testfile %1 not found.").arg(fileName).toUtf8().constData()); + QVERIFY(file.open(QIODevice::ReadOnly)); + QXmlStreamReader reader(&file); + while (!reader.atEnd()) + reader.readNext(); + + QVERIFY(!reader.hasError()); + QXmlStreamNotationDeclaration notation1, notation2, notation3; + QT_TEST_EQUALITY_OPS(notation1, notation2, true); + const auto notationDeclarations = reader.notationDeclarations(); + if (notationDeclarations.count() >= 2) { + notation1 = notationDeclarations.at(0); + notation2 = notationDeclarations.at(1); + notation3 = notationDeclarations.at(1); + } + QT_TEST_EQUALITY_OPS(notation1, notation2, false); + QT_TEST_EQUALITY_OPS(notation3, notation2, true); +} + +void tst_QXmlStream::checkStreamEntityDeclarations() const +{ + QString fileName("5.xml"); + const QDir dir(QFINDTESTDATA("data")); + QFile file(dir.absoluteFilePath(fileName)); + if (!file.exists()) + QSKIP(QObject::tr("Testfile %1 not found.").arg(fileName).toUtf8().constData()); + QVERIFY(file.open(QIODevice::ReadOnly)); + QXmlStreamReader reader(&file); + while (!reader.atEnd()) + reader.readNext(); + + QVERIFY(!reader.hasError()); + QXmlStreamEntityDeclaration entity; + QT_TEST_EQUALITY_OPS(entity, QXmlStreamEntityDeclaration(), true); + + const auto entityDeclarations = reader.entityDeclarations(); + if (entityDeclarations.count() >= 2) { + entity = entityDeclarations.at(1); + QT_TEST_EQUALITY_OPS(entityDeclarations.at(0), entityDeclarations.at(1), false); + QT_TEST_EQUALITY_OPS(entity, entityDeclarations.at(1), true); + } +} #include "tst_qxmlstream.moc" -// vim: et:ts=4:sw=4:sts=4 |