diff options
Diffstat (limited to 'tests/auto/qmlls/qmlls')
| -rw-r--r-- | tests/auto/qmlls/qmlls/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | tests/auto/qmlls/qmlls/tst_qmlls.cpp | 13 |
2 files changed, 18 insertions, 7 deletions
diff --git a/tests/auto/qmlls/qmlls/CMakeLists.txt b/tests/auto/qmlls/qmlls/CMakeLists.txt index e5f4bf822c..b3580c74e7 100644 --- a/tests/auto/qmlls/qmlls/CMakeLists.txt +++ b/tests/auto/qmlls/qmlls/CMakeLists.txt @@ -1,6 +1,12 @@ # 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_qmlls LANGUAGES CXX) + find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) +endif() + file(GLOB_RECURSE test_data_glob RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} data) @@ -25,3 +31,9 @@ qt_internal_extend_target(tst_qmlls CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=":/domdata" ) + +if (TARGET qmlls) + # in a standalone build, the qmlls target won't exist + # but we assume that it is available if you manually set up the test + add_dependencies(tst_qmlls qmlls) +endif() diff --git a/tests/auto/qmlls/qmlls/tst_qmlls.cpp b/tests/auto/qmlls/qmlls/tst_qmlls.cpp index 49d2de0583..9e057992c4 100644 --- a/tests/auto/qmlls/qmlls/tst_qmlls.cpp +++ b/tests/auto/qmlls/qmlls/tst_qmlls.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2018 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtJsonRpc/private/qjsonrpcprotocol_p.h> #include <QtLanguageServer/private/qlanguageserverprotocol_p.h> #include <QtQuickTestUtils/private/qmlutils_p.h> @@ -214,18 +214,17 @@ void tst_Qmlls::didOpenTextDocument() QString title = QString::fromUtf8(action.title); QVERIFY(action.kind.has_value()); - QCOMPARE(QString::fromUtf8(action.kind.value()), - QLatin1StringView("refactor.rewrite")); + QCOMPARE(QString::fromUtf8(action.kind.value()), QLatin1StringView("quickfix")); QVERIFY(action.edit.has_value()); WorkspaceEdit edit = action.edit.value(); QVERIFY(edit.documentChanges.has_value()); - auto docChangeVariant = edit.documentChanges.value(); - QVERIFY(std::holds_alternative<QList<TextDocumentEdit>>(docChangeVariant)); - auto documentChanges = std::get<QList<TextDocumentEdit>>(docChangeVariant); + auto documentChanges = edit.documentChanges.value(); QCOMPARE(documentChanges.size(), 1); - TextDocumentEdit textDocEdit = documentChanges.first(); + QVERIFY(std::holds_alternative<TextDocumentEdit>(documentChanges.first())); + TextDocumentEdit textDocEdit + = std::get<TextDocumentEdit>(documentChanges.first()); QCOMPARE(textDocEdit.textDocument.uri, textDocument.uri); QVERIFY(std::holds_alternative<int>(textDocEdit.textDocument.version)); |