From dad270be0b9b1d10b2aeb8960603a06677b75b2b Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Thu, 13 Apr 2017 02:57:18 +0200 Subject: remove the qt test runner that depends on ancient qt --- include/cppunit/ui/Makefile.am | 2 +- include/cppunit/ui/qt/Config.h | 21 --------- include/cppunit/ui/qt/Makefile.am | 6 --- include/cppunit/ui/qt/QtTestRunner.h | 85 ------------------------------------ include/cppunit/ui/qt/TestRunner.h | 11 ----- 5 files changed, 1 insertion(+), 124 deletions(-) delete mode 100644 include/cppunit/ui/qt/Config.h delete mode 100644 include/cppunit/ui/qt/Makefile.am delete mode 100644 include/cppunit/ui/qt/QtTestRunner.h delete mode 100644 include/cppunit/ui/qt/TestRunner.h (limited to 'include') diff --git a/include/cppunit/ui/Makefile.am b/include/cppunit/ui/Makefile.am index 1b9f08e..24cd2a5 100644 --- a/include/cppunit/ui/Makefile.am +++ b/include/cppunit/ui/Makefile.am @@ -1 +1 @@ -SUBDIRS = text mfc qt +SUBDIRS = text mfc diff --git a/include/cppunit/ui/qt/Config.h b/include/cppunit/ui/qt/Config.h deleted file mode 100644 index beaf9ad..0000000 --- a/include/cppunit/ui/qt/Config.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef CPPUNIT_QTUI_CONFIG_H -#define CPPUNIT_QTUI_CONFIG_H - -/*! Macro to export symbol to DLL with VC++. - * - * - QTTESTRUNNER_DLL_BUILD must be defined when building the DLL. - * - QTTESTRUNNER_DLL must be defined if linking against the DLL. - * - If none of the above are defined then you are building or linking against - * the static library. - */ - -#if defined( QTTESTRUNNER_DLL_BUILD ) -# define QTTESTRUNNER_API __declspec(dllexport) -#elif defined ( QTTESTRUNNER_DLL ) -# define QTTESTRUNNER_API __declspec(dllimport) -#else -# define QTTESTRUNNER_API -#endif - - -#endif // CPPUNIT_QTUI_CONFIG_H diff --git a/include/cppunit/ui/qt/Makefile.am b/include/cppunit/ui/qt/Makefile.am deleted file mode 100644 index 7d4fb46..0000000 --- a/include/cppunit/ui/qt/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -libcppunitincludedir = $(includedir)/cppunit/ui/qt - -libcppunitinclude_HEADERS = \ - TestRunner.h \ - QtTestRunner.h \ - Config.h diff --git a/include/cppunit/ui/qt/QtTestRunner.h b/include/cppunit/ui/qt/QtTestRunner.h deleted file mode 100644 index 3ae602f..0000000 --- a/include/cppunit/ui/qt/QtTestRunner.h +++ /dev/null @@ -1,85 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestRunner.h for class TestRunner -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/19 -// ////////////////////////////////////////////////////////////////////////// -#ifndef CPPUNIT_QTUI_QTTESTRUNNER_H -#define CPPUNIT_QTUI_QTTESTRUNNER_H - -#include -#include "Config.h" - -CPPUNIT_NS_BEGIN - - - class Test; - class TestSuite; - - -/*! - * \brief QT test runner. - * \ingroup ExecutingTest - * - * Here is an example of usage: - * \code - * #include - * #include - * - * [...] - * - * void - * QDepWindow::runTests() - * { - * CppUnit::QtUi::TestRunner runner; - * runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() ); - * runner.run( true ); - * } - * \endcode - * - */ -class QTTESTRUNNER_API QtTestRunner -{ -public: - /*! Constructs a TestRunner object. - */ - QtTestRunner(); - - /*! Destructor. - */ - virtual ~QtTestRunner(); - - void run( bool autoRun =false ); - - void addTest( Test *test ); - -private: - /// Prevents the use of the copy constructor. - QtTestRunner( const QtTestRunner © ); - - /// Prevents the use of the copy operator. - void operator =( const QtTestRunner © ); - - Test *getRootTest(); - -private: - typedef std::vector Tests; - Tests *_tests; - - TestSuite *_suite; -}; - - -#if CPPUNIT_HAVE_NAMESPACES - namespace QtUi - { - /*! Qt TestRunner (DEPRECATED). - * \deprecated Use CppUnit::QtTestRunner instead. - */ - typedef CPPUNIT_NS::QtTestRunner TestRunner; - } -#endif - - -CPPUNIT_NS_END - -#endif // CPPUNIT_QTUI_QTTESTRUNNER_H diff --git a/include/cppunit/ui/qt/TestRunner.h b/include/cppunit/ui/qt/TestRunner.h deleted file mode 100644 index 9c53e4b..0000000 --- a/include/cppunit/ui/qt/TestRunner.h +++ /dev/null @@ -1,11 +0,0 @@ -// ////////////////////////////////////////////////////////////////////////// -// Header file TestRunner.h for class TestRunner -// (c)Copyright 2000, Baptiste Lepilleur. -// Created: 2001/09/19 -// ////////////////////////////////////////////////////////////////////////// -#ifndef CPPUNIT_QTUI_TESTRUNNER_H -#define CPPUNIT_QTUI_TESTRUNNER_H - -#include - -#endif // CPPUNIT_QTUI_TESTRUNNER_H -- cgit v1.2.1