From 6b6143cb65bdd910c714832b59a6b9988a901525 Mon Sep 17 00:00:00 2001 From: Tatiana Borisova Date: Mon, 5 Feb 2024 20:23:49 +0100 Subject: [PATCH] Rename options test to channeloptions - Rename options test to channeloptions, since the test is testing QQmlGrpcChannelOptions class. Pick-to: 6.7 Change-Id: I5b1643dd346fd71e5cecaf417cbb65b3587210a2 Reviewed-by: Qt CI Bot Reviewed-by: Alexey Edelev --- tests/auto/grpcquick/CMakeLists.txt | 2 +- .../{options => channeloptions}/CMakeLists.txt | 12 ++++++------ .../qml/tst_channeloptions.qml} | 0 .../tst_channeloptions_qml.cpp} | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename tests/auto/grpcquick/{options => channeloptions}/CMakeLists.txt (60%) rename tests/auto/grpcquick/{options/qml/tst_options.qml => channeloptions/qml/tst_channeloptions.qml} (100%) rename tests/auto/grpcquick/{options/tst_options_qml.cpp => channeloptions/tst_channeloptions_qml.cpp} (78%) diff --git a/tests/auto/grpcquick/CMakeLists.txt b/tests/auto/grpcquick/CMakeLists.txt index 52795e23..056e1efb 100644 --- a/tests/auto/grpcquick/CMakeLists.txt +++ b/tests/auto/grpcquick/CMakeLists.txt @@ -6,6 +6,6 @@ add_compile_definitions(QT_GRPC_TEST_MESSAGE_LATENCY=${QT_INTERNAL_GRPC_TEST_MES add_subdirectory(client) add_subdirectory(metadata) -add_subdirectory(options) +add_subdirectory(channeloptions) add_subdirectory(http2channel) add_subdirectory(calloptions) diff --git a/tests/auto/grpcquick/options/CMakeLists.txt b/tests/auto/grpcquick/channeloptions/CMakeLists.txt similarity index 60% rename from tests/auto/grpcquick/options/CMakeLists.txt rename to tests/auto/grpcquick/channeloptions/CMakeLists.txt index 26f43622..91b0af43 100644 --- a/tests/auto/grpcquick/options/CMakeLists.txt +++ b/tests/auto/grpcquick/channeloptions/CMakeLists.txt @@ -3,14 +3,14 @@ if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) cmake_minimum_required(VERSION 3.16) - project(tst_grpc_options_qml LANGUAGES CXX) + project(tst_grpc_channel_options_qml LANGUAGES CXX) find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) endif() -qt_internal_add_test(tst_grpc_options_qml +qt_internal_add_test(tst_grpc_channel_options_qml QMLTEST SOURCES - tst_options_qml.cpp + tst_channeloptions_qml.cpp LIBRARIES Qt::Qml Qt::GrpcQuick @@ -19,11 +19,11 @@ qt_internal_add_test(tst_grpc_options_qml qt_policy(SET QTP0001 NEW) -qt_add_qml_module(tst_grpc_options_qml +qt_add_qml_module(tst_grpc_channel_options_qml URI QmlTestUri VERSION 1.0 QML_FILES - qml/tst_options.qml + qml/tst_channeloptions.qml ) -qt_autogen_tools_initial_setup(tst_grpc_options_qml) +qt_autogen_tools_initial_setup(tst_grpc_channel_options_qml) diff --git a/tests/auto/grpcquick/options/qml/tst_options.qml b/tests/auto/grpcquick/channeloptions/qml/tst_channeloptions.qml similarity index 100% rename from tests/auto/grpcquick/options/qml/tst_options.qml rename to tests/auto/grpcquick/channeloptions/qml/tst_channeloptions.qml diff --git a/tests/auto/grpcquick/options/tst_options_qml.cpp b/tests/auto/grpcquick/channeloptions/tst_channeloptions_qml.cpp similarity index 78% rename from tests/auto/grpcquick/options/tst_options_qml.cpp rename to tests/auto/grpcquick/channeloptions/tst_channeloptions_qml.cpp index 9ef74c73..bb4e2bb4 100644 --- a/tests/auto/grpcquick/options/tst_options_qml.cpp +++ b/tests/auto/grpcquick/channeloptions/tst_channeloptions_qml.cpp @@ -3,4 +3,4 @@ #include -QUICK_TEST_MAIN(tst_grpc_options_qml) +QUICK_TEST_MAIN(tst_grpc_channeloptions_qml)