From 6b444140f6fc053e777ed5c5d3d82d51e6c1d4c8 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 11 Jun 2015 23:12:23 +0300 Subject: [PATCH] CmbIpc: Remove outdated unit tests Superseded by tests/unit/codemodelbackend Change-Id: I9b0fd62aa93090e39d87bddeb9fd07f6c954fe19 Reviewed-by: Marco Bubke --- .../unittests/clang/clang.pro | 26 ----- .../codemodelbackend/unittests/clang/foo.h | 40 ------- .../unittests/clang/tst_clang.cpp | 78 ------------- .../codemodelbackendipc.pro | 5 - .../codemodelbackendipc_dependencies.pri | 2 - .../codemodelbackendprocess.pro | 1 - .../clientdummy.cpp | 51 --------- .../codemodelbackendprocesstest/clientdummy.h | 63 ----------- .../codemodelbackendprocesstest.pro | 22 ---- .../codemodelbackendprocesstest/foo.h | 40 ------- .../tst_codemodelbackendprocess.cpp | 104 ------------------ .../codemodelbackendprocesstestcommon.pri | 23 ---- .../codemodelbackendprocessunittests.pro | 8 -- 13 files changed, 463 deletions(-) delete mode 100644 src/tools/codemodelbackend/unittests/clang/clang.pro delete mode 100644 src/tools/codemodelbackend/unittests/clang/foo.h delete mode 100644 src/tools/codemodelbackend/unittests/clang/tst_clang.cpp delete mode 100644 src/tools/codemodelbackend/unittests/codemodelbackendipc/codemodelbackendipc.pro delete mode 100644 src/tools/codemodelbackend/unittests/codemodelbackendipc/codemodelbackendipc_dependencies.pri delete mode 100644 src/tools/codemodelbackend/unittests/codemodelbackendprocess/codemodelbackendprocess.pro delete mode 100644 src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/clientdummy.cpp delete mode 100644 src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/clientdummy.h delete mode 100644 src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/codemodelbackendprocesstest.pro delete mode 100644 src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/foo.h delete mode 100644 src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/tst_codemodelbackendprocess.cpp delete mode 100644 src/tools/codemodelbackend/unittests/codemodelbackendprocesstestcommon.pri delete mode 100644 src/tools/codemodelbackend/unittests/codemodelbackendprocessunittests.pro diff --git a/src/tools/codemodelbackend/unittests/clang/clang.pro b/src/tools/codemodelbackend/unittests/clang/clang.pro deleted file mode 100644 index e682dbb8c9b..00000000000 --- a/src/tools/codemodelbackend/unittests/clang/clang.pro +++ /dev/null @@ -1,26 +0,0 @@ -QT += core network testlib -QT -= gui - -TEMPLATE = app - -CONFIG += console c++14 testcase -CONFIG -= app_bundle - -TARGET = testlib - -include(../../clang.pri) -include(../../clangsource/codemodelbackendclang-source.pri) - - -LIBS += -L$$OUT_PWD/../codemodelbackendipc/lib/qtcreator -lCodemodelbackendipc - - -SOURCES += tst_clang.cpp -DEFINES += SRCDIR=\\\"$$PWD/\\\" - -INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/codemodelbackendipc/source - -HEADERS += \ - foo.h - -DEFINES += TEST_BASE_DIRECTORY=\\\"$$PWD\\\" diff --git a/src/tools/codemodelbackend/unittests/clang/foo.h b/src/tools/codemodelbackend/unittests/clang/foo.h deleted file mode 100644 index ae52108bf11..00000000000 --- a/src/tools/codemodelbackend/unittests/clang/foo.h +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator. -** -** 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 Digia. For licensing terms and -** conditions see http://www.qt.io/licensing. For further information -** use the contact form at http://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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#ifndef FOO_H -#define FOO_H - -void foo(int newValue) -{ - new -} - -#endif // FOO_H - diff --git a/src/tools/codemodelbackend/unittests/clang/tst_clang.cpp b/src/tools/codemodelbackend/unittests/clang/tst_clang.cpp deleted file mode 100644 index 387a06cd523..00000000000 --- a/src/tools/codemodelbackend/unittests/clang/tst_clang.cpp +++ /dev/null @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator. -** -** 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 Digia. For licensing terms and -** conditions see http://www.qt.io/licensing. For further information -** use the contact form at http://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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#include -#include - -#include - -static const char fooHeaderFile[] = TEST_BASE_DIRECTORY "/foo.h"; - -class ClangTest : public QObject -{ - Q_OBJECT - -public: - ClangTest(); - -private Q_SLOTS: - void init(); - void completeCode(); - -private: - CodeModelBackEnd::TranslationUnit unit; - -}; - -ClangTest::ClangTest() -{ - -} - -void ClangTest::init() -{ - unit = CodeModelBackEnd::TranslationUnit(fooHeaderFile); - unit.parse(); - - QVERIFY(unit.isLoaded()); -} - -void ClangTest::completeCode() -{ - CodeModelBackEnd::ScopedCXCodeCompleteResults results; - - unit.completeCodeAt(36, 7, results); - - QCOMPARE(results.size(), unsigned(361)); -} - -QTEST_APPLESS_MAIN(ClangTest) - -#include "tst_clang.moc" diff --git a/src/tools/codemodelbackend/unittests/codemodelbackendipc/codemodelbackendipc.pro b/src/tools/codemodelbackend/unittests/codemodelbackendipc/codemodelbackendipc.pro deleted file mode 100644 index 2f09b335965..00000000000 --- a/src/tools/codemodelbackend/unittests/codemodelbackendipc/codemodelbackendipc.pro +++ /dev/null @@ -1,5 +0,0 @@ -unix:QMAKE_CXXFLAGS_DEBUG += -O2 -win32:QMAKE_CXXFLAGS_DEBUG += -O2 - -include(../../../../qtcreatorlibrary.pri) -include(../../../../libs/codemodelbackendipc/codemodelbackendipc-lib.pri) diff --git a/src/tools/codemodelbackend/unittests/codemodelbackendipc/codemodelbackendipc_dependencies.pri b/src/tools/codemodelbackend/unittests/codemodelbackendipc/codemodelbackendipc_dependencies.pri deleted file mode 100644 index 295fcc7e354..00000000000 --- a/src/tools/codemodelbackend/unittests/codemodelbackendipc/codemodelbackendipc_dependencies.pri +++ /dev/null @@ -1,2 +0,0 @@ -QTC_LIB_NAME = Codemodelbackendipc -INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/codemodelbackendipc/source diff --git a/src/tools/codemodelbackend/unittests/codemodelbackendprocess/codemodelbackendprocess.pro b/src/tools/codemodelbackend/unittests/codemodelbackendprocess/codemodelbackendprocess.pro deleted file mode 100644 index a57e08eafc7..00000000000 --- a/src/tools/codemodelbackend/unittests/codemodelbackendprocess/codemodelbackendprocess.pro +++ /dev/null @@ -1 +0,0 @@ -include(../../codemodelbackend.pri) diff --git a/src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/clientdummy.cpp b/src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/clientdummy.cpp deleted file mode 100644 index f7b58fe5f09..00000000000 --- a/src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/clientdummy.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator. -** -** 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 Digia. For licensing terms and -** conditions see http://www.qt.io/licensing. For further information -** use the contact form at http://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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#include "clientdummy.h" - -void ClientDummy::clear() -{ - codeCompletedCommand = CodeModelBackEnd::CodeCompletedCommand (); -} - -void ClientDummy::alive() -{ -} - -void ClientDummy::echo(const CodeModelBackEnd::EchoCommand &command) -{ -} - -void ClientDummy::codeCompleted(const CodeModelBackEnd::CodeCompletedCommand &command) -{ - codeCompletedCommand = command; - - emit newCodeCompleted(); -} diff --git a/src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/clientdummy.h b/src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/clientdummy.h deleted file mode 100644 index 5571a8c46b3..00000000000 --- a/src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/clientdummy.h +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator. -** -** 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 Digia. For licensing terms and -** conditions see http://www.qt.io/licensing. For further information -** use the contact form at http://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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - - -#ifndef CLIENTDUMMY_H -#define CLIENTDUMMY_H - -#include "ipcclientinterface.h" - - -#include -#include - -#include - -#include -#include - -class ClientDummy : public QObject, public CodeModelBackEnd::IpcClientInterface -{ - Q_OBJECT - -public: - void clear(); - - void alive() override; - void echo(const CodeModelBackEnd::EchoCommand &command) override; - void codeCompleted(const CodeModelBackEnd::CodeCompletedCommand &command) override; - - CodeModelBackEnd::CodeCompletedCommand codeCompletedCommand; - -signals: - void newCodeCompleted(); -}; - -#endif // CLIENTDUMMY_H diff --git a/src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/codemodelbackendprocesstest.pro b/src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/codemodelbackendprocesstest.pro deleted file mode 100644 index 0d625c6f50c..00000000000 --- a/src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/codemodelbackendprocesstest.pro +++ /dev/null @@ -1,22 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2015-01-14T17:00:27 -# -#------------------------------------------------- - - -TARGET = tst_codemodelbackendprocess - -include(../codemodelbackendprocesstestcommon.pri) - -SOURCES += tst_codemodelbackendprocess.cpp \ - clientdummy.cpp -DEFINES += SRCDIR=\\\"$$PWD/\\\" - -INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/codemodelbackendipc/source - -HEADERS += \ - clientdummy.h \ - foo.h - -DEFINES += TEST_BASE_DIRECTORY=\\\"$$PWD\\\" diff --git a/src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/foo.h b/src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/foo.h deleted file mode 100644 index 6851b929b33..00000000000 --- a/src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/foo.h +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator. -** -** 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 Digia. For licensing terms and -** conditions see http://www.qt.io/licensing. For further information -** use the contact form at http://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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#ifndef FOO_H -#define FOO_H - -void foo(int newValue) -{ - -} - -#endif // FOO_H - diff --git a/src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/tst_codemodelbackendprocess.cpp b/src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/tst_codemodelbackendprocess.cpp deleted file mode 100644 index 09757c48b73..00000000000 --- a/src/tools/codemodelbackend/unittests/codemodelbackendprocesstest/tst_codemodelbackendprocess.cpp +++ /dev/null @@ -1,104 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator. -** -** 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 Digia. For licensing terms and -** conditions see http://www.qt.io/licensing. For further information -** use the contact form at http://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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#include -#include - -#include -#include -#include -#include - -#include -#include - -static const char fooHeaderFile[] = TEST_BASE_DIRECTORY "/foo.h"; - -class CodeModelBackendProcessTest : public QObject -{ - Q_OBJECT - -public: - CodeModelBackendProcessTest(); - -private Q_SLOTS: - void init(); - void cleanup(); - void completeCode(); - -private: - void registerFiles(); - -private: - ClientDummy clientDummy; - CodeModelBackEnd::ConnectionClient client; -}; - -CodeModelBackendProcessTest::CodeModelBackendProcessTest() - : client(&clientDummy) -{ - CodeModelBackEnd::Commands::registerCommands(); - client.setProcessPath(QLatin1String(CODEMODELBACKENDPROCESSPATH)); -} - -void CodeModelBackendProcessTest::init() -{ - client.startProcess(); - client.connectToServer(); - -} - -void CodeModelBackendProcessTest::cleanup() -{ - client.disconnectFromServer(); - client.sendEndCommand(); -} - -void CodeModelBackendProcessTest::completeCode() -{ - QSignalSpy clientSpy(&clientDummy, &ClientDummy::newCodeCompleted); - registerFiles(); - - client.sendCompleteCodeCommand(fooHeaderFile, 36, 0, ""); - - QVERIFY(clientSpy.wait(3000)); -} - -void CodeModelBackendProcessTest::registerFiles() -{ - CodeModelBackEnd::FileContainer fileContainer(fooHeaderFile); - QVector fileContainers({fileContainer}); - - client.sendRegisterFilesForCodeCompletionCommand(fileContainers); -} - -QTEST_MAIN(CodeModelBackendProcessTest) - -#include "tst_codemodelbackendprocess.moc" diff --git a/src/tools/codemodelbackend/unittests/codemodelbackendprocesstestcommon.pri b/src/tools/codemodelbackend/unittests/codemodelbackendprocesstestcommon.pri deleted file mode 100644 index a971689a1c0..00000000000 --- a/src/tools/codemodelbackend/unittests/codemodelbackendprocesstestcommon.pri +++ /dev/null @@ -1,23 +0,0 @@ -QT += core network testlib -QT -= gui - -TEMPLATE = app - -CONFIG += console c++14 testcase -CONFIG -= app_bundle - -include(../../../../qtcreator.pri) - -LIBS += -L$$OUT_PWD/../codemodelbackendipc/lib/qtcreator -lCodemodelbackendipc -unix:LIBS += -ldl - -INCLUDEPATH += $$PWD/../source - -QMAKE_CXXFLAGS -= -O2 -#unix:QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage -O0 -#unix:QMAKE_LDFLAGS += -fprofile-arcs -ftest-coverage -#unix:LIBS += -lgcov - -DEFINES += QT_NO_CAST_FROM_ASCII -DEFINES += CODEMODELBACKENDPROCESS_TESTS -DEFINES += CODEMODELBACKENDPROCESSPATH=\\\"$$OUT_PWD/../codemodelbackendprocess/codemodelbackend\\\" diff --git a/src/tools/codemodelbackend/unittests/codemodelbackendprocessunittests.pro b/src/tools/codemodelbackend/unittests/codemodelbackendprocessunittests.pro deleted file mode 100644 index ccba078fccb..00000000000 --- a/src/tools/codemodelbackend/unittests/codemodelbackendprocessunittests.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = codemodelbackendipc \ - codemodelbackendprocess \ - codemodelbackendprocesstest \ - clang - -codemodelbackendprocess.depends = codemodelbackendipc -codemodelbackendprocesstest.depends = codemodelbackendprocess codemodelbackendipc clang