diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 594b2a9a0..2a48239a9 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -25,10 +25,6 @@ message(". PROJECT_SOURCE_DIR :" ${PROJECT_SOURCE_DIR}) # Add sub directories message(". Add sub directory catch") add_subdirectory(catch) -message(". Add sub directory googletest") -add_subdirectory(googletest) -message(". Add sub directory googlemock") -add_subdirectory(googlemock) message(". Add sub directory modal-quit-regression") add_subdirectory(modal-quit-regression) message(". Add sub directory qttest") diff --git a/tests/googlemock/.clang-format b/tests/googlemock/.clang-format deleted file mode 100644 index 3f1da8525..000000000 --- a/tests/googlemock/.clang-format +++ /dev/null @@ -1,67 +0,0 @@ ---- -BasedOnStyle: LLVM -AlignAfterOpenBracket: AlwaysBreak -AlignConsecutiveMacros: 'true' -AlignConsecutiveAssignments: 'true' -AlignConsecutiveDeclarations: 'true' -AlignEscapedNewlines: Right -AlignOperands: 'true' -AlignTrailingComments: 'true' -AllowAllArgumentsOnNextLine: 'false' -AllowAllConstructorInitializersOnNextLine: 'true' -AllowAllParametersOfDeclarationOnNextLine: 'true' -AllowShortBlocksOnASingleLine: 'true' -AllowShortCaseLabelsOnASingleLine: 'true' -AllowShortFunctionsOnASingleLine: All -AllowShortIfStatementsOnASingleLine: Always -AllowShortLambdasOnASingleLine: All -AllowShortLoopsOnASingleLine: 'true' -AlwaysBreakAfterReturnType: None -AlwaysBreakBeforeMultilineStrings: 'true' -AlwaysBreakTemplateDeclarations: 'Yes' -BinPackArguments: 'false' -BinPackParameters: 'false' -BreakAfterJavaFieldAnnotations: 'true' -BreakBeforeBinaryOperators: NonAssignment -BreakBeforeBraces: Allman -BreakBeforeTernaryOperators: 'false' -BreakConstructorInitializers: AfterColon -BreakInheritanceList: AfterColon -BreakStringLiterals: 'true' -ColumnLimit: '80' -CompactNamespaces: 'false' -ConstructorInitializerAllOnOneLineOrOnePerLine: 'true' -Cpp11BracedListStyle: 'true' -FixNamespaceComments: 'true' -IncludeBlocks: Regroup -IndentCaseLabels: 'false' -IndentPPDirectives: AfterHash -IndentWidth: '4' -JavaScriptWrapImports: 'true' -Language: Cpp -MaxEmptyLinesToKeep: '1' -NamespaceIndentation: All -PointerAlignment: Left -ReflowComments: 'true' -SortIncludes: 'true' -SortUsingDeclarations: 'true' -SpaceAfterCStyleCast: 'true' -SpaceAfterLogicalNot: 'true' -SpaceAfterTemplateKeyword: 'true' -SpaceBeforeAssignmentOperators: 'true' -SpaceBeforeCpp11BracedList: 'true' -SpaceBeforeCtorInitializerColon: 'true' -SpaceBeforeInheritanceColon: 'true' -SpaceBeforeParens: ControlStatements -SpaceBeforeRangeBasedForLoopColon: 'true' -SpaceInEmptyParentheses: 'false' -SpacesInAngles: 'false' -SpacesInCStyleCastParentheses: 'false' -SpacesInContainerLiterals: 'false' -SpacesInParentheses: 'false' -SpacesInSquareBrackets: 'false' -Standard: Cpp11 -TabWidth: '4' -UseTab: Always - -... diff --git a/tests/googlemock/.gitignore b/tests/googlemock/.gitignore deleted file mode 100644 index fab7372d7..000000000 --- a/tests/googlemock/.gitignore +++ /dev/null @@ -1,73 +0,0 @@ -# This file is used to ignore files which are generated -# ---------------------------------------------------------------------------- - -*~ -*.autosave -*.a -*.core -*.moc -*.o -*.obj -*.orig -*.rej -*.so -*.so.* -*_pch.h.cpp -*_resource.rc -*.qm -.#* -*.*# -core -!core/ -tags -.DS_Store -.directory -*.debug -Makefile* -*.prl -*.app -moc_*.cpp -ui_*.h -qrc_*.cpp -Thumbs.db -*.res -*.rc -/.qmake.cache -/.qmake.stash - -# qtcreator generated files -*.pro.user* - -# xemacs temporary files -*.flc - -# Vim temporary files -.*.swp - -# Visual Studio generated files -*.ib_pdb_index -*.idb -*.ilk -*.pdb -*.sln -*.suo -*.vcproj -*vcproj.*.*.user -*.ncb -*.sdf -*.opensdf -*.vcxproj -*vcxproj.* - -# MinGW generated files -*.Debug -*.Release - -# Python byte code -*.pyc - -# Binaries -# -------- -*.dll -*.exe - diff --git a/tests/googlemock/CMakeLists.txt b/tests/googlemock/CMakeLists.txt deleted file mode 100644 index 0a56c34d1..000000000 --- a/tests/googlemock/CMakeLists.txt +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 2006 The QElectroTech Team -# This file is part of QElectroTech. -# -# QElectroTech is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# QElectroTech is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with QElectroTech. If not, see . - -cmake_minimum_required(VERSION 3.5) - -message("..___________________________________________________________________") - -project(G_unitmocktests LANGUAGES CXX) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -SET(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -message(".. PROJECT_NAME :" ${PROJECT_NAME}) -message(".. PROJECT_SOURCE_DIR :" ${PROJECT_SOURCE_DIR}) -if(NOT DEFINED QET_DIR) - set(QET_DIR "../..") - message(".. QET_DIR is not set, assuming QET is ../..") -endif() -message(".. QET_DIR :" ${QET_DIR}) -if(NOT DEFINED QET_COMPONENTS) - message(".. QET_COMPONENTS is not set !!! I set them up !!!") - include(../../cmake/qet_compilation_vars.cmake) -endif() - -find_package( - Qt6 - COMPONENTS - ${QET_COMPONENTS} - REQUIRED) - -Include(FetchContent) - -FetchContent_Declare( - GTest - GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.10.0) -set(INSTALL_GTEST OFF CACHE INTERNAL "") -FetchContent_MakeAvailable(GTest) - -include(../../cmake/fetch_kdeaddons.cmake) -include(../../cmake/fetch_singleapplication.cmake) -include(../../cmake/fetch_pugixml.cmake) - -enable_testing() - -add_executable( - ${PROJECT_NAME} - tst_My_test.cpp - main.cpp - ) - -target_link_libraries( - ${PROJECT_NAME} - PUBLIC - gmock gmock_main - PRIVATE - ${KF_PRIVATE_LIBRARIES} - ${QET_PRIVATE_LIBRARIES}) - diff --git a/tests/googlemock/main.cpp b/tests/googlemock/main.cpp deleted file mode 100644 index b378aa5fa..000000000 --- a/tests/googlemock/main.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include -#include - -int main(int argc, char** argv) -{ - QGuiApplication app(argc, argv); - - // disable the whole debug output (we want only the output from gtest) - // Debug::instance()->setDebugLevelLogFile(Debug::DebugLevel_t::Nothing); - // Debug::instance()->setDebugLevelStderr(Debug::DebugLevel_t::Nothing); - - // init gtest and run all tests - ::testing::InitGoogleMock(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/googlemock/tst_My_test.cpp b/tests/googlemock/tst_My_test.cpp deleted file mode 100644 index a69cafe0f..000000000 --- a/tests/googlemock/tst_My_test.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "../../sources/borderproperties.h" - -#include - -TEST(googlemocktest, sample_mock) { EXPECT_EQ(1, 1); } diff --git a/tests/googletest/.clang-format b/tests/googletest/.clang-format deleted file mode 100644 index 3f1da8525..000000000 --- a/tests/googletest/.clang-format +++ /dev/null @@ -1,67 +0,0 @@ ---- -BasedOnStyle: LLVM -AlignAfterOpenBracket: AlwaysBreak -AlignConsecutiveMacros: 'true' -AlignConsecutiveAssignments: 'true' -AlignConsecutiveDeclarations: 'true' -AlignEscapedNewlines: Right -AlignOperands: 'true' -AlignTrailingComments: 'true' -AllowAllArgumentsOnNextLine: 'false' -AllowAllConstructorInitializersOnNextLine: 'true' -AllowAllParametersOfDeclarationOnNextLine: 'true' -AllowShortBlocksOnASingleLine: 'true' -AllowShortCaseLabelsOnASingleLine: 'true' -AllowShortFunctionsOnASingleLine: All -AllowShortIfStatementsOnASingleLine: Always -AllowShortLambdasOnASingleLine: All -AllowShortLoopsOnASingleLine: 'true' -AlwaysBreakAfterReturnType: None -AlwaysBreakBeforeMultilineStrings: 'true' -AlwaysBreakTemplateDeclarations: 'Yes' -BinPackArguments: 'false' -BinPackParameters: 'false' -BreakAfterJavaFieldAnnotations: 'true' -BreakBeforeBinaryOperators: NonAssignment -BreakBeforeBraces: Allman -BreakBeforeTernaryOperators: 'false' -BreakConstructorInitializers: AfterColon -BreakInheritanceList: AfterColon -BreakStringLiterals: 'true' -ColumnLimit: '80' -CompactNamespaces: 'false' -ConstructorInitializerAllOnOneLineOrOnePerLine: 'true' -Cpp11BracedListStyle: 'true' -FixNamespaceComments: 'true' -IncludeBlocks: Regroup -IndentCaseLabels: 'false' -IndentPPDirectives: AfterHash -IndentWidth: '4' -JavaScriptWrapImports: 'true' -Language: Cpp -MaxEmptyLinesToKeep: '1' -NamespaceIndentation: All -PointerAlignment: Left -ReflowComments: 'true' -SortIncludes: 'true' -SortUsingDeclarations: 'true' -SpaceAfterCStyleCast: 'true' -SpaceAfterLogicalNot: 'true' -SpaceAfterTemplateKeyword: 'true' -SpaceBeforeAssignmentOperators: 'true' -SpaceBeforeCpp11BracedList: 'true' -SpaceBeforeCtorInitializerColon: 'true' -SpaceBeforeInheritanceColon: 'true' -SpaceBeforeParens: ControlStatements -SpaceBeforeRangeBasedForLoopColon: 'true' -SpaceInEmptyParentheses: 'false' -SpacesInAngles: 'false' -SpacesInCStyleCastParentheses: 'false' -SpacesInContainerLiterals: 'false' -SpacesInParentheses: 'false' -SpacesInSquareBrackets: 'false' -Standard: Cpp11 -TabWidth: '4' -UseTab: Always - -... diff --git a/tests/googletest/.gitignore b/tests/googletest/.gitignore deleted file mode 100644 index fab7372d7..000000000 --- a/tests/googletest/.gitignore +++ /dev/null @@ -1,73 +0,0 @@ -# This file is used to ignore files which are generated -# ---------------------------------------------------------------------------- - -*~ -*.autosave -*.a -*.core -*.moc -*.o -*.obj -*.orig -*.rej -*.so -*.so.* -*_pch.h.cpp -*_resource.rc -*.qm -.#* -*.*# -core -!core/ -tags -.DS_Store -.directory -*.debug -Makefile* -*.prl -*.app -moc_*.cpp -ui_*.h -qrc_*.cpp -Thumbs.db -*.res -*.rc -/.qmake.cache -/.qmake.stash - -# qtcreator generated files -*.pro.user* - -# xemacs temporary files -*.flc - -# Vim temporary files -.*.swp - -# Visual Studio generated files -*.ib_pdb_index -*.idb -*.ilk -*.pdb -*.sln -*.suo -*.vcproj -*vcproj.*.*.user -*.ncb -*.sdf -*.opensdf -*.vcxproj -*vcxproj.* - -# MinGW generated files -*.Debug -*.Release - -# Python byte code -*.pyc - -# Binaries -# -------- -*.dll -*.exe - diff --git a/tests/googletest/CMakeLists.txt b/tests/googletest/CMakeLists.txt deleted file mode 100644 index 9ea13c94e..000000000 --- a/tests/googletest/CMakeLists.txt +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 2006 The QElectroTech Team -# This file is part of QElectroTech. -# -# QElectroTech is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# QElectroTech is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with QElectroTech. If not, see . - -cmake_minimum_required(VERSION 3.5) - -message("..___________________________________________________________________") - -project(G_unittests LANGUAGES CXX) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -SET(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - -message(".. PROJECT_NAME :" ${PROJECT_NAME}) -message(".. PROJECT_SOURCE_DIR :" ${PROJECT_SOURCE_DIR}) -if(NOT DEFINED QET_DIR) - set(QET_DIR "../..") - message(".. QET_DIR is not set, assuming QET is ../..") -endif() -message(".. QET_DIR :" ${QET_DIR}) -if(NOT DEFINED QET_COMPONENTS) - message(".. QET_COMPONENTS is not set !!! I set them up !!!") - include(../../cmake/qet_compilation_vars.cmake) -endif() - -find_package( - Qt6 - COMPONENTS - ${QET_COMPONENTS} - REQUIRED) - -Include(FetchContent) - -FetchContent_Declare( - GTest - GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG v1.17.0) -set(INSTALL_GTEST OFF CACHE INTERNAL "") -FetchContent_MakeAvailable(GTest) - -include(../../cmake/fetch_kdeaddons.cmake) -include(../../cmake/fetch_singleapplication.cmake) -include(../../cmake/fetch_pugixml.cmake) - -enable_testing() - -add_executable( - ${PROJECT_NAME} - tst_My_test.cpp - main.cpp - ) -target_link_libraries( - ${PROJECT_NAME} - PUBLIC - gtest gtest_main - PRIVATE - ${KF_PRIVATE_LIBRARIES} - ${QET_PRIVATE_LIBRARIES}) - diff --git a/tests/googletest/main.cpp b/tests/googletest/main.cpp deleted file mode 100644 index 218f98008..000000000 --- a/tests/googletest/main.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include -#include - -int main(int argc, char** argv) -{ - QGuiApplication app(argc, argv); - - // disable the whole debug output (we want only the output from gtest) - // Debug::instance()->setDebugLevelLogFile(Debug::DebugLevel_t::Nothing); - // Debug::instance()->setDebugLevelStderr(Debug::DebugLevel_t::Nothing); - - // init gtest and run all tests - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/googletest/tst_My_test.cpp b/tests/googletest/tst_My_test.cpp deleted file mode 100644 index a420bb618..000000000 --- a/tests/googletest/tst_My_test.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "../../sources/borderproperties.h" - -#include - -TEST(googletest, sample_test) { EXPECT_EQ(1, 1); }