diff --git a/src/qgcunittest/FlightGearTest.h b/src/qgcunittest/FlightGearTest.h index a78aa4c4a09fea94a587ef5853b3c49a02313bcc..a7625f4cb3a562672fa9dbfc57d7092b0e80b748 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 220be0050b1af6337d61763780d2682f8173eccb..566c4885b1e431df8adcb48d605d3b61794c76b1 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 083938d73aa1beac5d892a4fb284b53f21d2c4fe..107a9fda6a4dcc0fda879006f42868ae7b5ed0d8 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 3ab50381ee556c11de8b58732b9b330c028452e2..388c4c0bb1d22a8bca5dd2d99d5d94e993aa068e 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 7a0d91b4cec127158429f1e3f4f7c25ba8318d8c..51429f3cbbd2c2ad976b471fe066bac4680db8da 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 282ea56d3d10e68109ed5cfc55d43dbb94f14943..cf29decd4226e1ef6888503557687f419a04f474 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 a4c21588a5d27302c1b6a3a5257503d1ffc1badf..5680abf572d44b71055582eac14ab064ddb794d8 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 d84e3fb09bcf8bed509d26836c0c52116519b833..2a66658871b1d2e1749ed9fa70eb1c78eed9e54b 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 ad978ecd2b56f9e30385514a96a6d50b979ac5d5..531a9423d559312e2c1de97253c8b898301067e6 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;