From 08caae78f9e12a3c7eb3c79ca5377d35cbc84380 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 30 Nov 2014 10:34:51 -0800 Subject: [PATCH] Remove unused code This was leftover from a problem I was having with virtual slots --- src/qgcunittest/FlightGearTest.h | 5 ----- src/qgcunittest/LinkManagerTest.h | 3 --- src/qgcunittest/MainWindowTest.h | 2 -- src/qgcunittest/MessageBoxTest.h | 3 --- src/qgcunittest/PX4RCCalibrationTest.h | 1 - src/qgcunittest/QGCUASFileManagerTest.h | 1 - src/qgcunittest/TCPLinkTest.h | 2 -- src/qgcunittest/UASUnitTest.h | 2 -- src/qgcunittest/UnitTest.h | 13 ------------- 9 files changed, 32 deletions(-) diff --git a/src/qgcunittest/FlightGearTest.h b/src/qgcunittest/FlightGearTest.h index a78aa4c4a..a7625f4cb 100644 --- a/src/qgcunittest/FlightGearTest.h +++ b/src/qgcunittest/FlightGearTest.h @@ -41,11 +41,6 @@ public: FlightGearUnitTest(void); private slots: - UT_DECLARE_DEFAULT_initTestCase - UT_DECLARE_DEFAULT_cleanupTestCase - UT_DECLARE_DEFAULT_init - UT_DECLARE_DEFAULT_cleanup - void _parseUIArguments_test(void); }; diff --git a/src/qgcunittest/LinkManagerTest.h b/src/qgcunittest/LinkManagerTest.h index 220be0050..566c4885b 100644 --- a/src/qgcunittest/LinkManagerTest.h +++ b/src/qgcunittest/LinkManagerTest.h @@ -41,9 +41,6 @@ public: LinkManagerTest(void); private slots: - UT_DECLARE_DEFAULT_initTestCase - UT_DECLARE_DEFAULT_cleanupTestCase - void init(void); void cleanup(void); diff --git a/src/qgcunittest/MainWindowTest.h b/src/qgcunittest/MainWindowTest.h index 083938d73..107a9fda6 100644 --- a/src/qgcunittest/MainWindowTest.h +++ b/src/qgcunittest/MainWindowTest.h @@ -39,8 +39,6 @@ public: MainWindowTest(void); private slots: - UT_DECLARE_DEFAULT_initTestCase - UT_DECLARE_DEFAULT_cleanupTestCase void init(void); void cleanup(void); diff --git a/src/qgcunittest/MessageBoxTest.h b/src/qgcunittest/MessageBoxTest.h index 3ab50381e..388c4c0bb 100644 --- a/src/qgcunittest/MessageBoxTest.h +++ b/src/qgcunittest/MessageBoxTest.h @@ -39,9 +39,6 @@ public: MessageBoxTest(void); private slots: - UT_DECLARE_DEFAULT_initTestCase - UT_DECLARE_DEFAULT_cleanupTestCase - UT_DECLARE_DEFAULT_init void cleanup(void); void _messageBoxExpected_test(void); diff --git a/src/qgcunittest/PX4RCCalibrationTest.h b/src/qgcunittest/PX4RCCalibrationTest.h index 7a0d91b4c..51429f3cb 100644 --- a/src/qgcunittest/PX4RCCalibrationTest.h +++ b/src/qgcunittest/PX4RCCalibrationTest.h @@ -45,7 +45,6 @@ public: private slots: void initTestCase(void); - UT_DECLARE_DEFAULT_cleanupTestCase void init(void); void cleanup(void); diff --git a/src/qgcunittest/QGCUASFileManagerTest.h b/src/qgcunittest/QGCUASFileManagerTest.h index 282ea56d3..cf29decd4 100644 --- a/src/qgcunittest/QGCUASFileManagerTest.h +++ b/src/qgcunittest/QGCUASFileManagerTest.h @@ -48,7 +48,6 @@ public: private slots: // Test case initialization void initTestCase(void); - UT_DECLARE_DEFAULT_cleanupTestCase void init(void); void cleanup(void); diff --git a/src/qgcunittest/TCPLinkTest.h b/src/qgcunittest/TCPLinkTest.h index a4c21588a..5680abf57 100644 --- a/src/qgcunittest/TCPLinkTest.h +++ b/src/qgcunittest/TCPLinkTest.h @@ -45,8 +45,6 @@ signals: void waitForReadyRead(int msecs); private slots: - UT_DECLARE_DEFAULT_initTestCase - UT_DECLARE_DEFAULT_cleanupTestCase void init(void); void cleanup(void); diff --git a/src/qgcunittest/UASUnitTest.h b/src/qgcunittest/UASUnitTest.h index d84e3fb09..2a6665887 100644 --- a/src/qgcunittest/UASUnitTest.h +++ b/src/qgcunittest/UASUnitTest.h @@ -21,8 +21,6 @@ public: UASUnitTest(void); private slots: - UT_DECLARE_DEFAULT_initTestCase - UT_DECLARE_DEFAULT_cleanupTestCase void init(void); void cleanup(void); diff --git a/src/qgcunittest/UnitTest.h b/src/qgcunittest/UnitTest.h index ad978ecd2..531a9423d 100644 --- a/src/qgcunittest/UnitTest.h +++ b/src/qgcunittest/UnitTest.h @@ -35,19 +35,6 @@ #define UT_REGISTER_TEST(className) static UnitTestWrapper t(#className); -/// @brief If you don't need you own specific implemenation of the test case setup methods -/// you can use these macros to declare the default implementation which just calls -/// the base class. - -#define UT_DECLARE_DEFAULT_initTestCase -//virtual void initTestCase(void) { UnitTest::_initTestCase(); } -#define UT_DECLARE_DEFAULT_cleanupTestCase -// virtual void cleanupTestCase(void) { UnitTest::_cleanupTestCase(); } -#define UT_DECLARE_DEFAULT_init -//virtual void init(void) { UnitTest::_init(); } -#define UT_DECLARE_DEFAULT_cleanup -//virtual void cleanup(void) { UnitTest::_cleanup(); } - class QGCMessageBox; class UnitTest; -- 2.22.0