diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20001TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20001TestSuite.cpp index be64e7e13697e74e15359fe395edd518b21052c5..5e5e9bd528c24fefecddb986064a39b9a13026be 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20001TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20001TestSuite.cpp @@ -22,39 +22,7 @@ namespace OHOS { using namespace std; using namespace testing::ext; - time_t ActsDeqpgles20001TestSuite::startTime; time_t ActsDeqpgles20001TestSuite::endTime; FuncRunResult ActsDeqpgles20001TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20001TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20001TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20001TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20001TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20001TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20001TestSuite.h index 4217efd6d39ab1e9b593a2e5cec894d843b5fc47..24952d07690e9bca922e02a2016827f630f1a7fa 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20001TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20001TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20001TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20001TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20002TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20002TestSuite.cpp index ccac76a731fff0c662e62d96c403049c9f2ead19..8aa8d453ff1bf1e9413fc600014d13d377ae4af6 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20002TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20002TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles20002TestSuite::startTime; time_t ActsDeqpgles20002TestSuite::endTime; FuncRunResult ActsDeqpgles20002TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20002TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20002TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20002TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20002TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20002TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20002TestSuite.h index fd4887ae82e4764a4b85dc1afa712c6e15d9b73f..7589765b256db2bbd3704fbae9ba1a164d08211b 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20002TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20002TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20002TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20002TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20003TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20003TestSuite.cpp index f6b3ece2e221d4bc569bf0ffeeb29719bdca7150..9905e3d8dd7c8dce0567fe183eb257fba0b45722 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20003TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20003TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles20003TestSuite::startTime; time_t ActsDeqpgles20003TestSuite::endTime; FuncRunResult ActsDeqpgles20003TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20003TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20003TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20003TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20003TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20003TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20003TestSuite.h index 7936227ae5a1e9f2867436d189a4e5714bacf253..11a17815fb04c077b69ec54c1826a2fbd64a586f 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20003TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20003TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20003TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20003TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20004TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20004TestSuite.cpp index 5f73019b8bb2cf71c483158162a3c2a352f208f1..797e162a4d2a65fea2f0d2e39f8f825d6e8694cf 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20004TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20004TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles20004TestSuite::startTime; time_t ActsDeqpgles20004TestSuite::endTime; FuncRunResult ActsDeqpgles20004TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20004TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20004TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20004TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20004TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20004TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20004TestSuite.h index ce3391b8eefbade98fdacd1ea524d11c34ff4b1c..0ef251a234de334363078d0ccf3463213a5f8286 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20004TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20004TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20004TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20004TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20005TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20005TestSuite.cpp index 154ee803939de766e11ffb397976abbb5bfd319f..82c849fee9ffb0f395e3bc57c6c222c3d00054de 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20005TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20005TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles20005TestSuite::startTime; time_t ActsDeqpgles20005TestSuite::endTime; FuncRunResult ActsDeqpgles20005TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20005TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20005TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20005TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20005TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20005TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20005TestSuite.h index 1ef6fd0240d2f2c554c701f4da6d726f0e94ca52..f3239a9c606c1b51748000bbfe8588f213c12908 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20005TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20005TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20005TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20005TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20006TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20006TestSuite.cpp index 2c19c6660deb2c6443ccd6ed761cfb6e1f1a2466..05b61a86b57612ccc6779b97129f860849b79b6e 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20006TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20006TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles20006TestSuite::startTime; time_t ActsDeqpgles20006TestSuite::endTime; FuncRunResult ActsDeqpgles20006TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20006TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20006TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20006TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20006TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20006TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20006TestSuite.h index 9760c307d72de2888ecf6a7eca077e2eb1867864..cb330d0ad8d9ad7b61d1230b185c1025b1300913 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20006TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20006TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20006TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20006TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20007TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20007TestSuite.cpp index 49f50825b462de733ef1a9450b465367523490b9..e16a8e8979958fbc3fb360b8859692d62cfefb7c 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20007TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20007TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles20007TestSuite::startTime; time_t ActsDeqpgles20007TestSuite::endTime; FuncRunResult ActsDeqpgles20007TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20007TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20007TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20007TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20007TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20007TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20007TestSuite.h index 1543347d837853e7b859a287d6d8dad8020a2d5b..662b5e79c4ca990530a24f847b12611697aabeb1 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20007TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20007TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20007TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20007TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20008TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20008TestSuite.cpp index 071a5d1b41b564b27a62f04aa1a2c219dadd0d16..3137f91c200586e0155b6c4299bb86c15fa60694 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20008TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20008TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles20008TestSuite::startTime; time_t ActsDeqpgles20008TestSuite::endTime; FuncRunResult ActsDeqpgles20008TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20008TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20008TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20008TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20008TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20008TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20008TestSuite.h index 413e19f0da8e6b8dd7bc0d6f7c4158a1aad8de4f..c8dca4561a2c610d296e4177f1a5787c644d40c6 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20008TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20008TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20008TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20008TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20009TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20009TestSuite.cpp index e64763531aeed0ca07035d31d86fa417ee4882d3..61af0155d91b33ed3147f73f8ed83b5e397a9e3b 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20009TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20009TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles20009TestSuite::startTime; time_t ActsDeqpgles20009TestSuite::endTime; FuncRunResult ActsDeqpgles20009TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20009TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20009TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20009TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20009TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20009TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20009TestSuite.h index 75fd4e73476d8a97dc9c015b2bee35f1350ef242..9a6aaeb741787c1de52886b24dc80203c9d900e0 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20009TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20009TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20009TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20009TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20010TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20010TestSuite.cpp index 4ef38d2810854a7313000069630a6914d9f76cf4..f4b52d4b1a978f1ca405bc97a4c2a370d1c68b61 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20010TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20010TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles20010TestSuite::startTime; time_t ActsDeqpgles20010TestSuite::endTime; FuncRunResult ActsDeqpgles20010TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20010TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20010TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20010TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20010TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20010TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20010TestSuite.h index 22903a2a7955a7eb916ea0aae544796dd07b22b3..6b031f76d32e4124a3bf97474cef98851cbc40f4 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20010TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20010TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20010TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20010TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20011TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20011TestSuite.cpp index 667670a93e6396ce31c30db0f0ac59326e295d64..7948a743f17fbedf9b50830bd42ddd5e1f58a26c 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20011TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20011TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles20011TestSuite::startTime; time_t ActsDeqpgles20011TestSuite::endTime; FuncRunResult ActsDeqpgles20011TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20011TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20011TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20011TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20011TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20011TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20011TestSuite.h index 5e6cde4090eec63ad70fbcec59e2087088b1e80d..45a9e4d931f521d1f04a8c5b2cec5c8a8dc6d3a3 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20011TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20011TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20011TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20011TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20012TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20012TestSuite.cpp index 8c400467f541bc22e964ab756976b224b68c4a72..ccb0f5654a4ddb46d515a1f587ae574b6849a020 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20012TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20012TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles20012TestSuite::startTime; time_t ActsDeqpgles20012TestSuite::endTime; FuncRunResult ActsDeqpgles20012TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20012TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20012TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20012TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20012TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20012TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20012TestSuite.h index 5707fcb5a7d4601e9773092a18edf86aa1e644aa..69d4214e0a9d0514508473df563d6b74c09908ed 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20012TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20012TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20012TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20012TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20013TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20013TestSuite.cpp index 2974a68fcaf86015131e420c8850660c76c440f7..16694bf1fb259cb31f8e1dc96b59bc5881de1f6f 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20013TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20013TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles20013TestSuite::startTime; time_t ActsDeqpgles20013TestSuite::endTime; FuncRunResult ActsDeqpgles20013TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20013TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20013TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20013TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20013TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20013TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20013TestSuite.h index cbe47b25b4e94dc667e5c4a77372f6265030231a..5ecf61a924c786bb37eb52dbadf7ef93c41ee0b8 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20013TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20013TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20013TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20013TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20014TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20014TestSuite.cpp index 3d2121caa112583e9bb274812079d29b0102897c..40e5bdac2f0e8c9afd388b6df24268da6e7a7a3d 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20014TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20014TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles20014TestSuite::startTime; time_t ActsDeqpgles20014TestSuite::endTime; FuncRunResult ActsDeqpgles20014TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20014TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20014TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20014TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20014TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20014TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20014TestSuite.h index 260d584506548b0150053aeba90b5a24502081f1..fbd74787784f53b7c0eb5fa7e0f246fea970da27 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20014TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20014TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20014TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20014TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20015TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20015TestSuite.cpp index 646f1ff27586da673c2207ab55d9901f7420238c..ec930e99573984c3954c0424b686b9f20002cd4d 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20015TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20015TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles20015TestSuite::startTime; time_t ActsDeqpgles20015TestSuite::endTime; FuncRunResult ActsDeqpgles20015TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20015TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20015TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20015TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20015TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20015TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20015TestSuite.h index bf58609d511934c2983b67c9d813332ad4b01d6b..6f9ad571af0f6b9c12261c2e9f63e2e95982789e 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20015TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20015TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20015TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20015TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20016TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20016TestSuite.cpp index b89dda7c41f0287ff8d692fd3df28f1911fbb790..fc6e80384e1e580bfcb113fdde1fef95bd71f950 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20016TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20016TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles20016TestSuite::startTime; time_t ActsDeqpgles20016TestSuite::endTime; FuncRunResult ActsDeqpgles20016TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20016TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20016TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20016TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20016TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20016TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20016TestSuite.h index df2c6ed96c76072d7b6bcaaf33d63ccf527e7705..534e36e23d800d4b8007c3516c44cdae1fbb1595 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20016TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20016TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20016TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20016TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20017TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20017TestSuite.cpp index 8c561b77e820145651cf9a3497e196822493ccf9..de782b99c68c8784b7e885213757184396de9e6c 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20017TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20017TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles20017TestSuite::startTime; time_t ActsDeqpgles20017TestSuite::endTime; FuncRunResult ActsDeqpgles20017TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles20017TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles20017TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles20017TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles20017TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20017TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20017TestSuite.h index 21b84f2c819e897b456f1b35af90a4279bb5bfa0..ac692c5cb80de8d83b7a7e44fec344f82cfa9ef2 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles20017TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles20017TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles20017TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles20017TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles2TestSuite.cpp b/graphic/vkgl/src/deqpgles2/ActsDeqpgles2TestSuite.cpp index e048613bbdf4b19affa85f10bca4d9efd6d60f93..1a5ace53cdf41d099c14b9db8fb54769f2ef80a1 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles2TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles2TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles2TestSuite::startTime; time_t ActsDeqpgles2TestSuite::endTime; FuncRunResult ActsDeqpgles2TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles2TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles2TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles2TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles2TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles2/ActsDeqpgles2TestSuite.h b/graphic/vkgl/src/deqpgles2/ActsDeqpgles2TestSuite.h index b4cb8494718189f0e1430f87e0955a5428e6d9dc..410961595a57656b5db7d9d26d74dcf292578130 100644 --- a/graphic/vkgl/src/deqpgles2/ActsDeqpgles2TestSuite.h +++ b/graphic/vkgl/src/deqpgles2/ActsDeqpgles2TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles2TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles20001TestSuite) #endif // DEQPGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30001TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30001TestSuite.cpp index 3f6b9343a20ddff4b3ca8091ff7ddd8522128003..eef7c0123c588a132a3358fa2a19e9ccd4d1edbb 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30001TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30001TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30001TestSuite::endTime; FuncRunResult ActsDeqpgles30001TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30001TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30001TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30001TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30001TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30001TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30001TestSuite.h index 601bce7346e6e63730b5980c8a1397ac92a73a53..e8e16b9efc3a079251d0ce83d0991832a1c86ed7 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30001TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30001TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30001TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30001TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30002TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30002TestSuite.cpp index 28a9c191ee731a9b86cac3e1968e51abd260508e..5b092270f45339b5a0847e601fedc9b9658689c5 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30002TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30002TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30002TestSuite::endTime; FuncRunResult ActsDeqpgles30002TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30002TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30002TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30002TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30002TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30002TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30002TestSuite.h index e4e5d7871fb74da28f3b896bca556c18934b7e06..8dfe0bd6ddf5eb21c4061474524a95d3847fc915 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30002TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30002TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30002TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30002TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30003TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30003TestSuite.cpp index 75625154b3f4e7424ba01a2b08a2b0a5a4770786..584b0fa588be4eabc917892e248c00aef9cdfb44 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30003TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30003TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30003TestSuite::endTime; FuncRunResult ActsDeqpgles30003TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30003TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30003TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30003TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30003TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30003TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30003TestSuite.h index 1b8b22435b9968a3d71e4a7702e933c6348c7f15..95f7c677e6e26ab445a91f3d55cda396c356c85e 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30003TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30003TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30003TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30003TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30004TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30004TestSuite.cpp index 073b67adbe1c29380f3e80907008ee82c8d87405..d262123818938b85feafe11f36857559747f0fd0 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30004TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30004TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30004TestSuite::endTime; FuncRunResult ActsDeqpgles30004TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30004TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30004TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30004TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30004TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30004TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30004TestSuite.h index b20bb215d413faa95b44cfa2f5010772f22bca91..68d2f1cc62f0a076c614f037f2e61a00c73908a7 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30004TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30004TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30004TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30004TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30005TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30005TestSuite.cpp index 49bb569c78815f21ad6e68961fae23ac5fcfdfb9..63f70c51f8f0c5c814e588756e172f61ed08ad16 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30005TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30005TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30005TestSuite::endTime; FuncRunResult ActsDeqpgles30005TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30005TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30005TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30005TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30005TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30005TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30005TestSuite.h index 03209550ce876299d3a9a28300748f353d4f4f0d..4afb50de0e59df4783794842dc984ee0864670ff 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30005TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30005TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30005TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30005TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30006TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30006TestSuite.cpp index 28b4ca14e34561fc938841e48ab7218366f3ea3e..554e7e85826047264c8e2e54e7d60ce68ea0d961 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30006TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30006TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30006TestSuite::endTime; FuncRunResult ActsDeqpgles30006TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30006TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30006TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30006TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30006TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30006TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30006TestSuite.h index 093f26743ada3c4feaa45f2951bc47075f744321..7c4cf0c49b3b2ccba9c82b5cd911db93d4a14a19 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30006TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30006TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30006TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30006TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30007TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30007TestSuite.cpp index bb62c3c3b06ec9b15c539a86345e438b6a9be379..4136365d53e75031b5833638de66a3e96374092b 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30007TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30007TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30007TestSuite::endTime; FuncRunResult ActsDeqpgles30007TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30007TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30007TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30007TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30007TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30007TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30007TestSuite.h index d461ae731398d42e989b788a8f701bbfb2c5253d..fee796c06cf680c2b82055d9a3308ec8711ab112 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30007TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30007TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30007TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30007TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30008TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30008TestSuite.cpp index 41ab790f71a394938f5f021fbbf24f37c7c99eea..7bdd55dbafbfb34e2a2d21ce893c32227781b606 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30008TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30008TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30008TestSuite::endTime; FuncRunResult ActsDeqpgles30008TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30008TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30008TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30008TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30008TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30008TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30008TestSuite.h index 29a58cf217251b466a40a16149c612b0a0e9c797..8dffc94de745d13472514a828120fcc1466a0e1c 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30008TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30008TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30008TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30008TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30009TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30009TestSuite.cpp index c1511cf4b9c2e9b10e449791c49c4a3747dcb496..d91aad1f8429424b9a8cda9f8b59285f4d5e754a 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30009TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30009TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30009TestSuite::endTime; FuncRunResult ActsDeqpgles30009TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30009TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30009TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30009TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30009TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30009TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30009TestSuite.h index 28a0eb198dfaefd9e91953b0838cf701d1c6d1d4..2728bba76ddeec5d1d3e011ed7e28b487dc08746 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30009TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30009TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30009TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30009TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30010TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30010TestSuite.cpp index ffd09ebaf9f001c42b5734c91759ca6401781b3e..142b5f0de1bc8fdc920302d80b34437b217fbaa6 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30010TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30010TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30010TestSuite::endTime; FuncRunResult ActsDeqpgles30010TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30010TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30010TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30010TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30010TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30010TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30010TestSuite.h index a10467deb3aac3e6a24b70e462afe2f1276baa9a..b08d583638a9dec1a6ab4edeee2fe272b9ee5000 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30010TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30010TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30010TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30010TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30011TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30011TestSuite.cpp index 4f02313dcdb2f4d52cfdcd3fd3ddcc2d3e783064..5fbb430082fc810ce51a8948145523c24958c93f 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30011TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30011TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30011TestSuite::endTime; FuncRunResult ActsDeqpgles30011TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30011TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30011TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30011TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30011TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30011TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30011TestSuite.h index 1a4ad6dbcded73b1f07f747fb0500ea7e3509fbe..b52bdf1bbfdfdb29f26486535407537c1a2fd1ff 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30011TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30011TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30011TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30011TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30012TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30012TestSuite.cpp index 7b1a3004e0f0c2db9ae795633e9e1d3c82f8f636..1beeb54490c4d26a237ddc2e7f87c0ff311321f0 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30012TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30012TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30012TestSuite::endTime; FuncRunResult ActsDeqpgles30012TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30012TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30012TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30012TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30012TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30012TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30012TestSuite.h index 54b9c69914aefa831ce5d8a9406a46c77f5aaa5c..ef7ded927ffd7efdabd60bb86de4d8d82af25266 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30012TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30012TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30012TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30012TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30013TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30013TestSuite.cpp index fcf1704beca3a74d85a7f3e50c585e74b73e7c2f..62df18792a720af294363947465a3e9338b24400 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30013TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30013TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30013TestSuite::endTime; FuncRunResult ActsDeqpgles30013TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30013TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30013TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30013TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30013TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30013TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30013TestSuite.h index 5ce5c88673334e2bc6500dd0da010c3ccfaff0e8..5fefcef8f8ca65c679dc1570955ff1572c2a4ae1 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30013TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30013TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30013TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30013TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30014TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30014TestSuite.cpp index 8aa6a121a8e2f839fba8c1e7105489df7399037b..a033396345bce2824abc57d98e0ea4372daf9678 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30014TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30014TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30014TestSuite::endTime; FuncRunResult ActsDeqpgles30014TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30014TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30014TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30014TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30014TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30014TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30014TestSuite.h index 0b1876d6f7121fe971a3f3e0511b7555d3e5eba2..1d67a2b6669a4232712cb4f9a917609959aa361c 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30014TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30014TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30014TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30014TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30015TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30015TestSuite.cpp index 922a8275e41b8cf254d7ed6b04fb4a8ffcbfcec7..1dea5aeae069fb1261ab69381cb7f0b9219fce3a 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30015TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30015TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30015TestSuite::endTime; FuncRunResult ActsDeqpgles30015TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30015TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30015TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30015TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30015TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30015TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30015TestSuite.h index e064f64aa21015a6fb7ab2e6dc7751b03aaf9dd5..cdb584a96552ff5c7a520c78d29b85d54b149a6e 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30015TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30015TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30015TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30015TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30016TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30016TestSuite.cpp index 7944da7a2ef368d874a07aff5fd528c781f3ef3b..21423754019199c14b2f1534af4291b31a57cacd 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30016TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30016TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30016TestSuite::endTime; FuncRunResult ActsDeqpgles30016TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30016TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30016TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30016TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30016TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30016TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30016TestSuite.h index b50107e43d47c00049d1ce0c332f3c8defa4128d..155d7de01a735c428858b678f5d0bf9c5aaf541b 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30016TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30016TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30016TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30016TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30017TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30017TestSuite.cpp index fb507bd44898e368a6f9150ce753138c26a68519..7150cfc450cd9dfbb9c1bcb8760346faeb1792aa 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30017TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30017TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30017TestSuite::endTime; FuncRunResult ActsDeqpgles30017TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30017TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30017TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30017TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30017TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30017TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30017TestSuite.h index 46eb46d4e65cf748662906111071b6674d149b87..becd7b6b26e993d330d5b6f7b6e0666ccf79a2da 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30017TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30017TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30017TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30017TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30018TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30018TestSuite.cpp index 8978337071dbe85eba3e85b4a3ec0bfca15419e6..875716b73509d1a08d8c4078a05a71da599b3141 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30018TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30018TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30018TestSuite::endTime; FuncRunResult ActsDeqpgles30018TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30018TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30018TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30018TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30018TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30018TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30018TestSuite.h index 77cafbfa027a571d0a2f30bad9d6d2fb0ba96832..2e9bad71408c37ae4373ef000cc077526202867f 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30018TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30018TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30018TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30018TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30019TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30019TestSuite.cpp index 07a3a8b15060ebb7c0417eae1e3e5f345f8bc573..e2c271feb2f8f30497846bb77a4696c8e1666dd7 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30019TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30019TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30019TestSuite::endTime; FuncRunResult ActsDeqpgles30019TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30019TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30019TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30019TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30019TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30019TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30019TestSuite.h index 2f315f8578e37faf1cbf1672320c7f8d42d0e315..cbf309cbd8fde60d8a48f627aa7baa8e0703e41f 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30019TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30019TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30019TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30019TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30020TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30020TestSuite.cpp index a74a3a8bccaae4d54d6f07c865dcec55bcc5917d..32987d23c64a98a72bb1adc62289e8cbbfec69ed 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30020TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30020TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30020TestSuite::endTime; FuncRunResult ActsDeqpgles30020TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30020TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30020TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30020TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30020TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30020TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30020TestSuite.h index 8a88e648ec7a0e06d0a7841495d0155c99d57d7e..330242da12546b5de915b0c97401c8e38f9dcace 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30020TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30020TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30020TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30020TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30021TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30021TestSuite.cpp index 0d21e93104d67073377c6dac5098257bb056a703..663a11d1a2b6d30104f4c07fe2964d01633d3ab2 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30021TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30021TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30021TestSuite::endTime; FuncRunResult ActsDeqpgles30021TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30021TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30021TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30021TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30021TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30021TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30021TestSuite.h index 4c31374f2fa9fc9e3b53438cf49c98530380d2b2..05df3220dadfa39fd20ad48e77202550868b1b89 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30021TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30021TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30021TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30021TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30022TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30022TestSuite.cpp index 666eff6d7612c3cd36fdd952858fde029497e8c8..9c00309a86d8c388d944f0aafe1b5e6d183c036a 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30022TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30022TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30022TestSuite::endTime; FuncRunResult ActsDeqpgles30022TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30022TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30022TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30022TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30022TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30022TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30022TestSuite.h index 3cb4613a361d90cdd39d2e114db71f0b9fb78d4f..b3d1238cb4a4b180277c79d4c3db996fd1455eb3 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30022TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30022TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30022TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30022TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30023TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30023TestSuite.cpp index 8b695bb837fe4426677c4fca75fce2e2105c082e..f46d671534457549f9feacdf3ac8ef23c897c9a5 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30023TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30023TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30023TestSuite::endTime; FuncRunResult ActsDeqpgles30023TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30023TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30023TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30023TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30023TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30023TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30023TestSuite.h index 6d9a765f40efff2f5bf133ef03402322f8c4ee78..9299f0b52801fa0db4467092c9572d38c0979606 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30023TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30023TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30023TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30023TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30024TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30024TestSuite.cpp index 4135bc9e2f7eeafe2ef059b19f477f4138c3ba4d..1139ddc680015fced205aae8f3cc936026eb8944 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30024TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30024TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30024TestSuite::endTime; FuncRunResult ActsDeqpgles30024TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30024TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30024TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30024TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30024TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30024TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30024TestSuite.h index 2c11a0ef72f806a54892acadd103aaf3a3cdbcbd..971e507490698c3a663064ee28bca6ebf9a19e67 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30024TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30024TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30024TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30024TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30025TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30025TestSuite.cpp index c88556c13a7180bbf73a786b817ccce5df09afa6..db666dde413e0228b11f4d8129f324cd41886692 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30025TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30025TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30025TestSuite::endTime; FuncRunResult ActsDeqpgles30025TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30025TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30025TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30025TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30025TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30025TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30025TestSuite.h index b5dea0f84d1c833aa38e5fb3c7dd14c020c42b32..83f1e4f66ef0b2111fa78bc2dfdf9314b6f00a07 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30025TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30025TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30025TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30025TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30026TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30026TestSuite.cpp index 73c36dac39219ee492f03d0fa596e2c276729bfb..2eef1f38e07080d2ecf331b5169b5f3b03a0851b 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30026TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30026TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30026TestSuite::endTime; FuncRunResult ActsDeqpgles30026TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30026TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30026TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30026TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30026TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30026TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30026TestSuite.h index e124cd0baac9caf9bef3a0822aa47daa879ea2b3..9ed57fa433b33bbcee4463f4069093fa066d1cf1 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30026TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30026TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30026TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30026TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30027TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30027TestSuite.cpp index 5917d994e3890fe37713560dc6e270f80a01254d..5287f3f46f9acbd1410b7b8445486ece52b94dcb 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30027TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30027TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles30027TestSuite::endTime; FuncRunResult ActsDeqpgles30027TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30027TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30027TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30027TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30027TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30027TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30027TestSuite.h index c15d74454b6ad5edb3aa748ca7bb087c8d513d0b..d190191caf4d9c62f4f9cf1d2ff60eabc33380b7 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30027TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30027TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30027TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30027TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30028TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30028TestSuite.cpp index 8aa0332404916ee1c58be3f67473ebee4a44d57c..c0ecfd4ae2f709b399d8104c86611f57599cf558 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30028TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30028TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30028TestSuite::startTime; time_t ActsDeqpgles30028TestSuite::endTime; FuncRunResult ActsDeqpgles30028TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30028TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30028TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30028TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30028TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30028TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30028TestSuite.h index 113518ce1f24c5a4726f9c83d702def0e98b8040..71f00fbfc9836845e4dd18837b12c00a800a4ad3 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30028TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30028TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30028TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30028TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30029TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30029TestSuite.cpp index 5f2118245bc7c38c9565d8b5ec01e1faf5b05f00..708f0b8f404d56181673be49ba1faab2bb2bf255 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30029TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30029TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30029TestSuite::startTime; time_t ActsDeqpgles30029TestSuite::endTime; FuncRunResult ActsDeqpgles30029TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30029TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30029TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30029TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30029TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30029TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30029TestSuite.h index c97a3b376b5d9761e7064551851edf54a8f2cc8f..85b7c6c722bf3fb800112aa858eb8a7abda095ea 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30029TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30029TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30029TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30029TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30030TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30030TestSuite.cpp index 879edf14f13ab1d7c39831099acac27c64f2e308..f5bcd0134043ff68a4ddc0b0010c8a9ea7538a33 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30030TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30030TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30030TestSuite::startTime; time_t ActsDeqpgles30030TestSuite::endTime; FuncRunResult ActsDeqpgles30030TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30030TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30030TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30030TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30030TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30030TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30030TestSuite.h index c46688d9fd9716ce507a86b2e3c21cb66e54fb07..cd05b0f9cf4fac3704f6dd4d6a7d0f3a6d698e99 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30030TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30030TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30030TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30030TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30031TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30031TestSuite.cpp index de62b1657354417de8bb0bd937db4889dd6da1a0..7d0941f6766518edf2798adfce7ec0c83a81ffdb 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30031TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30031TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30031TestSuite::startTime; time_t ActsDeqpgles30031TestSuite::endTime; FuncRunResult ActsDeqpgles30031TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30031TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30031TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30031TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30031TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30031TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30031TestSuite.h index 0c3ce75ff76e973c87beff10d405235dd18d6ac1..8389c74544e7e116b8d65f8382b5e5109bd00d67 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30031TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30031TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30031TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30031TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30032TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30032TestSuite.cpp index 590b05b13adb683964263201a88d003d59892e98..3a8ed0a5adc456f956bad5700c1f09edbaa757a0 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30032TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30032TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30032TestSuite::startTime; time_t ActsDeqpgles30032TestSuite::endTime; FuncRunResult ActsDeqpgles30032TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30032TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30032TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30032TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30032TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30032TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30032TestSuite.h index ced7cb5e85986cee0f37269aa7c43c30d6c97b7c..501f7d231c7c8363ca9e1d0d9d08dd5de34645c5 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30032TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30032TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30032TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30032TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30033TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30033TestSuite.cpp index 03c52f274cbeae67d51cefff40e56d8106a13a38..12e23dd8dbb986c51cb6ebad94e2f45f2e354593 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30033TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30033TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30033TestSuite::startTime; time_t ActsDeqpgles30033TestSuite::endTime; FuncRunResult ActsDeqpgles30033TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30033TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30033TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30033TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30033TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30033TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30033TestSuite.h index 0686f457d0df14a02f483f69d14943b3805ecf53..9d576fa434898471fbbb495bc87d4c0815206cfe 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30033TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30033TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30033TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30033TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30034TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30034TestSuite.cpp index 7571296bb2267daa69632e14f27414f69e0f68f3..a386ed3862b1cb26570c9c81f905dab959756c87 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30034TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30034TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30034TestSuite::startTime; time_t ActsDeqpgles30034TestSuite::endTime; FuncRunResult ActsDeqpgles30034TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30034TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30034TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30034TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30034TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30034TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30034TestSuite.h index 85db337109de3f709dbf5f11d95828adb2c8f5ce..9e1cafe19fb0fce75c417e49cd0d14b38201ada6 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30034TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30034TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30034TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30034TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30035TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30035TestSuite.cpp index dfe8c3518911d86319636a917d976278f8069cce..dcf63ab35356e0bcc2708fe94069b43ba5b992f3 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30035TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30035TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30035TestSuite::startTime; time_t ActsDeqpgles30035TestSuite::endTime; FuncRunResult ActsDeqpgles30035TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30035TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30035TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30035TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30035TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30035TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30035TestSuite.h index 8a1f2ab1a5124df2087cfaea50f44d64b08b2047..f6e1a81f993088cb83d0a909545d395ab6799b40 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30035TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30035TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30035TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30035TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30036TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30036TestSuite.cpp index abc06ef8ac7c153ec432bd6a244a4ef6d01d4ff1..ffb5fb9d47f9ae5f03c5b5aa115fccdfb65322b1 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30036TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30036TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30036TestSuite::startTime; time_t ActsDeqpgles30036TestSuite::endTime; FuncRunResult ActsDeqpgles30036TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30036TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30036TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30036TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30036TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30036TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30036TestSuite.h index 386edc3cda1c6df420a4353c7104b903ef303fc6..c8ab9533460fd0922eb24477c2896f1cad4a4a93 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30036TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30036TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30036TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles30036TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30037TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30037TestSuite.cpp index 28c5b152023191ef37bd78355e96c08692cae81d..0e5a1e37ed91ea62947920a2c73b21f03bca1cee 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30037TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30037TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30037TestSuite::startTime; time_t ActsDeqpgles30037TestSuite::endTime; FuncRunResult ActsDeqpgles30037TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30037TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30037TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30037TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30037TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30037TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30037TestSuite.h index 80c785db6ebe2033b6bd846fe588e35cce14f141..97287e87d8a762980349e8890723b881d6588025 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30037TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30037TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30037TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30037TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30038TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30038TestSuite.cpp index 437c34b66bb14c091b41ad28f273812dd2f41b44..a88b94aed9bcd6352ea9fd4e8c2604874c9b2a70 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30038TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30038TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30038TestSuite::startTime; time_t ActsDeqpgles30038TestSuite::endTime; FuncRunResult ActsDeqpgles30038TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30038TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30038TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30038TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30038TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30038TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30038TestSuite.h index 29be3c63c92b9e1e6ebed4e171a41f99a2d955ce..74a997186ce2e238b1de34c966f6baa1da6f524c 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30038TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30038TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30038TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles30038TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30039TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30039TestSuite.cpp index 2350e7d654bf318cd0402ca9ab252770830f24ff..9b0f6e7449afa42e6e2e9fb76e318e1d90332fe5 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30039TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30039TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30039TestSuite::startTime; time_t ActsDeqpgles30039TestSuite::endTime; FuncRunResult ActsDeqpgles30039TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30039TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30039TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30039TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30039TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30039TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30039TestSuite.h index 21a1de1ba709e8fb87aefa2e3daea546d5af5e41..0baf2fcb05b8aadc14af3fc8e87669f5bb87c907 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30039TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30039TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30039TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles30039TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30040TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30040TestSuite.cpp index 29db5a12c594890d1f97c2f1a15df7781696edc9..fcdedebe7945ac0596c4b9cee6742c30eb682f4d 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30040TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30040TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30040TestSuite::startTime; time_t ActsDeqpgles30040TestSuite::endTime; FuncRunResult ActsDeqpgles30040TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30040TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30040TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30040TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30040TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30040TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30040TestSuite.h index 7e9ff1c1c8ea827258e3e9b80a6583f5a1e17ee2..9d7d71e41029cdb75559c593339056ca22b18258 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30040TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30040TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30040TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles30040TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30041TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30041TestSuite.cpp index 5ece307fe65a6b5cf04c3b41aa1b1f450926b4e3..63a69d7f1b73a71c1ca24f309d6e4283e655b9ca 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30041TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30041TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30041TestSuite::startTime; time_t ActsDeqpgles30041TestSuite::endTime; FuncRunResult ActsDeqpgles30041TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30041TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30041TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30041TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30041TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30041TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30041TestSuite.h index 70a6d1ce325dc0eee96f381775b5c8e6e3c042c6..acdd76e59a832691ab569ed15e3b372fbc145afe 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30041TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30041TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30041TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles30041TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30042TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30042TestSuite.cpp index ea83f9fb65cb02a94057a49451129f8e49980e33..c7ee88cbde94128406acffe9261cf2f589a2e199 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30042TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30042TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30042TestSuite::startTime; time_t ActsDeqpgles30042TestSuite::endTime; FuncRunResult ActsDeqpgles30042TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30042TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30042TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30042TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30042TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30042TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30042TestSuite.h index 8067b1a20db9881903afb1d6aba5867d979bad87..ea5199f46e5f3ccccd665c6426ff421317ed59f7 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30042TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30042TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30042TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles30042TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30043TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30043TestSuite.cpp index 8a7d929204bd55d145b10c346e4aff076fcb2141..e0b0f4d8cbf9c29fd1156ce3813385f96d97c2b7 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30043TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30043TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30043TestSuite::startTime; time_t ActsDeqpgles30043TestSuite::endTime; FuncRunResult ActsDeqpgles30043TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30043TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30043TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30043TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30043TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30043TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30043TestSuite.h index 4e22d21ed9f0922fd9d35a52b3e4bbe4973963f9..fcb0da582562db6d583aebedd790da1e6f5d21d6 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30043TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30043TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30043TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles30043TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30044TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30044TestSuite.cpp index 94d09fe535e591de30ff92d7b90aef22613ad1fc..83d26ba9d9d4b3517ef5484143e900a2488f8620 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30044TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30044TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30044TestSuite::startTime; time_t ActsDeqpgles30044TestSuite::endTime; FuncRunResult ActsDeqpgles30044TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30044TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30044TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30044TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30044TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30044TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30044TestSuite.h index b20a08f53fa1cf89a4ccd319481d0be5b958bbc9..c71f4af4c842f29133fd8ae5ee598e5e92e204ca 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30044TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30044TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30044TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles30044TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30045TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30045TestSuite.cpp index 642bca40e5759ae36917c96c180a4b9b28634dd4..eb347e8c0df6f9b5fe9bd5201a9f49451eb039e4 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30045TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30045TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsDeqpgles30045TestSuite::startTime; time_t ActsDeqpgles30045TestSuite::endTime; FuncRunResult ActsDeqpgles30045TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles30045TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles30045TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles30045TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles30045TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30045TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30045TestSuite.h index 1d519392a00307094f4932422747cc349ca9a1f0..c1636a1ede34a4878275cf3e305f25ad6289b2be 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles30045TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles30045TestSuite.h @@ -18,23 +18,7 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles30045TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsDeqpgles30045TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles3TestSuite.cpp b/graphic/vkgl/src/deqpgles3/ActsDeqpgles3TestSuite.cpp index 81fc58436dd2408390deb077241f5e85bc5ab28c..a7f7e538ca8e350ca229423f56bcec8c8fbde10f 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles3TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles3TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles3TestSuite::endTime; FuncRunResult ActsDeqpgles3TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles3TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles3TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles3TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles3TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles3/ActsDeqpgles3TestSuite.h b/graphic/vkgl/src/deqpgles3/ActsDeqpgles3TestSuite.h index be5d049cf80c9d5815572889b85518fcf8fa97c9..8abfeaa4241391c6724bc2b961adc52c36bb7cc7 100644 --- a/graphic/vkgl/src/deqpgles3/ActsDeqpgles3TestSuite.h +++ b/graphic/vkgl/src/deqpgles3/ActsDeqpgles3TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles3TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles3TestSuite) #endif // DEQPGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310001TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310001TestSuite.cpp index a27f58f57332d31a46211cec99de5616089969ce..8afa820eeca91108e59b0bd8146bee9d4d220979 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310001TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310001TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310001TestSuite::endTime; FuncRunResult ActsDeqpgles310001TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310001TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310001TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310001TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310001TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310001TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310001TestSuite.h index 14ed40f9853716a1765edf4cd0607018e9d6b400..927b9dda385de2fd82998056668a9f9533b0297c 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310001TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310001TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310001TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310001TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310002TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310002TestSuite.cpp index 0f6133be5d430ce79fc2a133da667f258c4f7493..5eea48149c62249d6eeaf38ba0f1e8064e0a4461 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310002TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310002TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310002TestSuite::endTime; FuncRunResult ActsDeqpgles310002TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310002TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310002TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310002TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310002TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310002TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310002TestSuite.h index f1e0e9e01c1e8cad712bd35810b90d1e573bd397..b689daf89df4de5c3476e02c44dd9a7c2b714ddc 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310002TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310002TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310002TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310002TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310003TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310003TestSuite.cpp index 96f875feca03da2bfd3f0739137100c8e09c1731..b1cd65a95d531cc2fef07a876a5b4a3cb9fad923 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310003TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310003TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310003TestSuite::endTime; FuncRunResult ActsDeqpgles310003TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310003TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310003TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310003TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310003TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310003TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310003TestSuite.h index 6bdea8a92c9d741b44ff399bd7f77ad846c40642..78a3ed4f81fb2a56fe7f0fab3c5f4dcd76e25cb6 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310003TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310003TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310003TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310003TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310004TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310004TestSuite.cpp index c94f18f7ccdb39eb9b2a506f0334b256d910b6bf..b8877d21b26cc0b384ecfe8a87a1549b60435eb5 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310004TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310004TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310004TestSuite::endTime; FuncRunResult ActsDeqpgles310004TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310004TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310004TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310004TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310004TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310004TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310004TestSuite.h index 42b3313a02243c35721fc54f2a05dc8e58c6cf2e..94957d0c525deb4b506a5cdc89bb478b279c4a82 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310004TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310004TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310004TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310004TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310005TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310005TestSuite.cpp index 84ec795348b10638d28f1b7666d4d63c05fcb436..900039bcb247302074f8d92066c466f180c7eacf 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310005TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310005TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310005TestSuite::endTime; FuncRunResult ActsDeqpgles310005TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310005TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310005TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310005TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310005TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310005TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310005TestSuite.h index 295db85701c7a2cc4c9a8c791faa4c9320e773aa..bd547deb3f73ad33ad08285de990fbd9530f0895 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310005TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310005TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310005TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310005TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310006TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310006TestSuite.cpp index d6c3fa1d5094ea26fedcabaccbedba5707321a17..f4290af468c3504bcd79a684b40f5f29fb875b54 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310006TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310006TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310006TestSuite::endTime; FuncRunResult ActsDeqpgles310006TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310006TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310006TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310006TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310006TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310006TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310006TestSuite.h index 4133df803e9c14f54832b74a492fa3f16ec59081..d38f2e478f459ef6f70c4af686af58258dd257f0 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310006TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310006TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310006TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310006TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310007TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310007TestSuite.cpp index 01b8c9fe31b8933aaa038c178adad3aba727b60d..37e844b1cfaa066d9f4cc2cbfd4bd61dadb3f43c 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310007TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310007TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310007TestSuite::endTime; FuncRunResult ActsDeqpgles310007TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310007TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310007TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310007TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310007TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310007TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310007TestSuite.h index 0cc8495a92f84ad5be48fed2f79d00435a971714..2f12cab7220a12f2e2b3416343e3b8e04ea502dd 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310007TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310007TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310007TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310007TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310008TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310008TestSuite.cpp index 3a8ef64230405ce081c14af12d78fe5e2136dd68..8cb216985637486a52ba3a9ce75e4809cef636d6 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310008TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310008TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310008TestSuite::endTime; FuncRunResult ActsDeqpgles310008TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310008TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310008TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310008TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310008TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310008TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310008TestSuite.h index e986c52cf0910394e57597ac5abf658054676525..30b8e7fc394445d20f31016116050f3de64911c6 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310008TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310008TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310008TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310008TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310009TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310009TestSuite.cpp index b170c17d2bf3a91a52c48af89ffbaf7138f5389a..5352eba34e7623e93a0b0c516a4e1ae997e0aced 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310009TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310009TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310009TestSuite::endTime; FuncRunResult ActsDeqpgles310009TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310009TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310009TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310009TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310009TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310009TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310009TestSuite.h index 5949b43b5fb784a7487647f77546ea6c8b968eaa..23bf62ff228f3d04e5fe018ebbde063fef81ab55 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310009TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310009TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310009TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310009TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310010TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310010TestSuite.cpp index 526bc5b4e6860120ade5b517c5a8aba57ed290f2..2e0f2558e5206d7d894a7ce895f33efb3af178bc 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310010TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310010TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310010TestSuite::endTime; FuncRunResult ActsDeqpgles310010TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310010TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310010TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310010TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310010TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310010TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310010TestSuite.h index ebd65a1415b3c207b8fc5d8d7ab66e6394d60d0d..9207cda157683d39bf6e8d3ea5b4694ba2a9767b 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310010TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310010TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310010TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310010TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310011TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310011TestSuite.cpp index b727f7f38500c7ecf5cdb6a1e1deb871f6e6ef0c..ec07d95f658c745de0e40033ee1b3df3143feaa4 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310011TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310011TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310011TestSuite::endTime; FuncRunResult ActsDeqpgles310011TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310011TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310011TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310011TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310011TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310011TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310011TestSuite.h index 96a5a02214f8072083b9f81111bbe4be27a8378b..3376a13cae970d1a99abdda627621fee52b96cc5 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310011TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310011TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310011TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310011TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310012TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310012TestSuite.cpp index 57132ce5ef7941501588253ff323e7e879aa5a35..35d5bebfe3a74e1ce21a991d1aaf8927dd57ae57 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310012TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310012TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310012TestSuite::endTime; FuncRunResult ActsDeqpgles310012TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310012TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310012TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310012TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310012TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310012TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310012TestSuite.h index 99e968d5173a01724e74ec17b4b9138a8a962197..34ada24b746e5d29e45be79f2d95bf1920b7236e 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310012TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310012TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310012TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310012TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310013TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310013TestSuite.cpp index fb30416ad97285e45bc6845a85968df5a5028759..c3afd879f2dcfceadb1edb4d9b0bc1ea58afeaa5 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310013TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310013TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310013TestSuite::endTime; FuncRunResult ActsDeqpgles310013TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310013TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310013TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310013TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310013TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310013TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310013TestSuite.h index 35cca48d7177df67d7a46020bce6c2c4cf45ccc9..4d5ba0b4da62119fdd5cd26dc5e276a68232c065 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310013TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310013TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310013TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310013TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310014TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310014TestSuite.cpp index 92b306f776103e9a73076fcdc1d84a74f55828b8..5c2dc60e7afb053def67722e3fe22f0da0c7d9ff 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310014TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310014TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310014TestSuite::endTime; FuncRunResult ActsDeqpgles310014TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310014TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310014TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310014TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310014TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310014TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310014TestSuite.h index 708c3faa694ece42952b10b65986b22df1564231..ea73fd2a09e71b5d83b9fb49386b24ce01a6a4d8 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310014TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310014TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310014TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310014TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310015TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310015TestSuite.cpp index 792953c620498582af5db68b815c3da8729bf153..3c7ab8c1169b490cad0957a8004b46493fae4876 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310015TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310015TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310015TestSuite::endTime; FuncRunResult ActsDeqpgles310015TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310015TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310015TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310015TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310015TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310015TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310015TestSuite.h index b7ce0d7be51b8923a4e82a04421cd381583d752d..3de515ac25881404517f093b40a85d584a516584 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310015TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310015TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310015TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310015TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310016TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310016TestSuite.cpp index 5f267f37fdb881327413c6fa1b828436e7f3a65e..5bede1f45a8a1629a8112ed05df900aa21b7d162 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310016TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310016TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310016TestSuite::endTime; FuncRunResult ActsDeqpgles310016TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310016TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310016TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310016TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310016TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310016TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310016TestSuite.h index b955913d1d7a112b3d70ccad11d78f1256daacfa..dae6934ad1cb40f9a2e1587b165e87c08a864db7 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310016TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310016TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310016TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310016TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310017TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310017TestSuite.cpp index 9fbdbd5a87237dafdfdce1394dbdcff749220e8d..f8a4dd2b7d8b5e59f6532606a8ce7459edf9b9c3 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310017TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310017TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310017TestSuite::endTime; FuncRunResult ActsDeqpgles310017TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310017TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310017TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310017TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310017TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310017TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310017TestSuite.h index 96e60b7c199466bca895da793ccb3522bc97b88c..3212a5eb802b0e978924dba77d42b709d6647a68 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310017TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310017TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310017TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310017TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310018TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310018TestSuite.cpp index 0cf38acde1d7d172da37f8828e5eb9446e8082fc..bda75091fd6130ab3b9f8b627e1d9f46385259cc 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310018TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310018TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310018TestSuite::endTime; FuncRunResult ActsDeqpgles310018TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310018TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310018TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310018TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310018TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310018TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310018TestSuite.h index 118ce6e369ffb512c6d94246aeaba3b06d2809e5..126f5d881a76ea570ee80ca8baae8d602261af4f 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310018TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310018TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310018TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310018TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310019TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310019TestSuite.cpp index bdaf955640519026b704a18182c578f884103836..fce9c6772b6389e3c85f6d35ef184328020867b7 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310019TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310019TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310019TestSuite::endTime; FuncRunResult ActsDeqpgles310019TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310019TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310019TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310019TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310019TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310019TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310019TestSuite.h index 5ccf5958cabdc780450fa73d9e5aa8344c54b6f9..527c54c9672b0c1d11a417a6f29893c37395cc8d 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310019TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310019TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310019TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310019TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310020TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310020TestSuite.cpp index 31b1b0edc40042418c87dad0ff2f1b20472a7a00..fede676341b6602ea92830d34f43577877fae342 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310020TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310020TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310020TestSuite::endTime; FuncRunResult ActsDeqpgles310020TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310020TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310020TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310020TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310020TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310020TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310020TestSuite.h index 3a670bf51334bff643b113b7a3181657c9574d62..67042677ba996e28ab72203317ecd278f9ffd34b 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310020TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310020TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310020TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310020TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310021TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310021TestSuite.cpp index c4ba3ad0248671b9e5bfbd42f714ec12770d937a..45af5f19d2495641fac8804af3b4be49d3ed789a 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310021TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310021TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310021TestSuite::endTime; FuncRunResult ActsDeqpgles310021TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310021TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310021TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310021TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310021TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310021TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310021TestSuite.h index 97ae803d7a6beff74f9fffcba6a37c610ba00dc5..9c5185ca172eba37160740be28e59b9bf1176f96 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310021TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310021TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310021TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310021TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310022TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310022TestSuite.cpp index db690ea12803b4207af5aabcf53cf3d30e723149..17b26d8bfaf520f53a540a1c48b961f45de1d68d 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310022TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310022TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310022TestSuite::endTime; FuncRunResult ActsDeqpgles310022TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310022TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310022TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310022TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310022TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310022TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310022TestSuite.h index 193ef1e9a98b4ffa03cffcab6013f5054c1e388c..be19d586b491a03b6ad775681b8c65f85d9ff7f1 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310022TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310022TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310022TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310022TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310023TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310023TestSuite.cpp index a439857bed1f8d2f1aa210f80f7f38a45cd25a96..87b225a1aaf2753e8298a6717bd7c29ef805797d 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310023TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310023TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310023TestSuite::endTime; FuncRunResult ActsDeqpgles310023TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310023TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310023TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310023TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310023TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310023TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310023TestSuite.h index 7988874b782e770e92fd7ccb1f4ca4ab7d086e33..ed13b580fadd4d9e423069caa47dad953aa2ac73 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310023TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310023TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310023TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310023TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310024TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310024TestSuite.cpp index 0666bef72b735d9b69c8345d6ecf2afcee567041..44cf18c93f3ac17cb0e13fa785e78342e5a897b5 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310024TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310024TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310024TestSuite::endTime; FuncRunResult ActsDeqpgles310024TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310024TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310024TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310024TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310024TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310024TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310024TestSuite.h index 522fe8bf8b57ef8d1e48b5c331954e1d962359cc..7782a689287244a5857afca6f4b784f3a78dce66 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310024TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310024TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310024TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310024TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310025TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310025TestSuite.cpp index 5eae68520261a626adef3e51afa14af7caddb3dc..85dcfe63a0b171065752ad8e6a51ba8db6296210 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310025TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310025TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310025TestSuite::endTime; FuncRunResult ActsDeqpgles310025TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310025TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310025TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310025TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310025TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310025TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310025TestSuite.h index 5037b854176aa7a629f2332c7d6d9153dae92006..85f892f7f83c225526664e724feecdfb923cbcf8 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310025TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310025TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310025TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310025TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310026TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310026TestSuite.cpp index 6d30d0aaea5cdd6ccde418d2aa85a669976366dc..97f0f623d27198058240f75ee533c18cb57aa82c 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310026TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310026TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310026TestSuite::endTime; FuncRunResult ActsDeqpgles310026TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310026TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310026TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310026TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310026TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310026TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310026TestSuite.h index f489defbc7954a230021b9779dcdf9c1b089d568..b4fea6a696b1594fcb828cd24f305e9f9d0e7ba2 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310026TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310026TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310026TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310026TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310027TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310027TestSuite.cpp index 44cf815328be20283f824546bfbd10877c7deb18..1395faee81785898b39df638940164ce97451541 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310027TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310027TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310027TestSuite::endTime; FuncRunResult ActsDeqpgles310027TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310027TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310027TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310027TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310027TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310027TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310027TestSuite.h index bc716f9e182ffa428c6db2a0f9c47f9172406359..49a219d7beeb81c4b2e161fdb39162bed559fcca 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310027TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310027TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310027TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310027TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310028TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310028TestSuite.cpp index bbd7559be9ff48e4b5ad9b39d63257e8647e0eb4..7119f26b0aa4678f0818e75dd7930694449215d1 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310028TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310028TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310028TestSuite::endTime; FuncRunResult ActsDeqpgles310028TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310028TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310028TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310028TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310028TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310028TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310028TestSuite.h index a5f9a09f924fd6ebbd9e49ff365c7f2778596a49..26b6081f46434bdd030f1b207192b55f5413a638 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310028TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310028TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310028TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310028TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310029TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310029TestSuite.cpp index c27a718f194cb78d864f0b1a9fcdf286834af749..88f236c78e61a4ed993f6d6e0ff3b03ed139bdfb 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310029TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310029TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310029TestSuite::endTime; FuncRunResult ActsDeqpgles310029TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310029TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310029TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310029TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310029TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310029TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310029TestSuite.h index e99b69301b8590244b34d67bf0d62140c0a407b3..4f4407c5af8c3b8356660433e46b6739bea38f64 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310029TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310029TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310029TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310029TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310030TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310030TestSuite.cpp index 3d516d1850026baeab5ec819802b5302c8955069..c4ae8eb8275fdef5079684fd2ef9f306c90bcd85 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310030TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310030TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310030TestSuite::endTime; FuncRunResult ActsDeqpgles310030TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310030TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310030TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310030TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310030TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310030TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310030TestSuite.h index 1f2c93a2df1956f5e1075dd57e8bf82b5e06ce20..7f4d30cafed3c49940d37290df52aa2c9f87d667 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310030TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310030TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310030TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310030TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310031TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310031TestSuite.cpp index f44a532097ca81c07f69c9ccf4413d896fa8a9e9..4a765fd9937557374cd847c316687f4e7ff73011 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310031TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310031TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310031TestSuite::endTime; FuncRunResult ActsDeqpgles310031TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310031TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310031TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310031TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310031TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310031TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310031TestSuite.h index b1783f7a9f1253530969051e5628d9678deafc18..1877f53de7b8ee09064b995e7e0fe65feec06142 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310031TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310031TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310031TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310031TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310032TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310032TestSuite.cpp index d313ef2bfd29a247baf2e4e6331d0bb56a028194..5c8f46ddc72b16f694ac4b1e6c930f6829f9e008 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310032TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310032TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310032TestSuite::endTime; FuncRunResult ActsDeqpgles310032TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310032TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310032TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310032TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310032TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310032TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310032TestSuite.h index 7f139d4a41dadf87b32612911358b1d57d4d4524..70f72151c5607b95ef69999154ef9736f0e29e04 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310032TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310032TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310032TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310032TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310033TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310033TestSuite.cpp index 6cd4ce0dc8244be3ae96c4d6947d4df87847c1f1..9f88abe313807a491deb098f55d5457bfde8ddd3 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310033TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310033TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310033TestSuite::endTime; FuncRunResult ActsDeqpgles310033TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310033TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310033TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310033TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310033TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310033TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310033TestSuite.h index 0ff916ef20d12bb3c47b775e612909b7993c0902..5eae51401df301afa04a2aec8f87596a3c0dba93 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310033TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310033TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310033TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310033TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310034TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310034TestSuite.cpp index 57e88879f69eb22caca63cd7eea22f957f023003..5ac018d0c5bfdd42c7ade5a4f24d45522a3c566c 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310034TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310034TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310034TestSuite::endTime; FuncRunResult ActsDeqpgles310034TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310034TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310034TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310034TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310034TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310034TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310034TestSuite.h index 3a20a8283298bf5e37f6771bb7247a0f3cae3e74..db01acfc829d867a294067ef4ad078085ed9824d 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310034TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310034TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310034TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310034TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310035TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310035TestSuite.cpp index 639fc3798bae46ccc22ee2242ec03bf722b1060f..fa742845f499cb077e124d7d32d18234ac8f1c7d 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310035TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310035TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310035TestSuite::endTime; FuncRunResult ActsDeqpgles310035TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310035TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310035TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310035TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310035TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310035TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310035TestSuite.h index 8d1e56946578f4be7e6a00e22401deda643c443c..b7e49656f2a7459cc4855064e3640ec01d3ebdb8 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310035TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310035TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310035TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310035TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310036TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310036TestSuite.cpp index f518c166322d024ae12b706132baad8cc65fc0bb..324a7dcddb23daeb03ba409c94cee90b96aeee84 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310036TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310036TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310036TestSuite::endTime; FuncRunResult ActsDeqpgles310036TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310036TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310036TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310036TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310036TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310036TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310036TestSuite.h index f1d2a43bef8a8636b02d3ac3052781fae4fd2e8d..a77f12b8ce2d0b35e3c0563364be01f2a9a59c22 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310036TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310036TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310036TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310036TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310037TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310037TestSuite.cpp index b4dde2a3526d31d55fc87ff2fa5edeecac42293f..07e0803fc134bce7a19fb37e6fcccee7b91cbc0c 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310037TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310037TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310037TestSuite::endTime; FuncRunResult ActsDeqpgles310037TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310037TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310037TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310037TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310037TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310037TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310037TestSuite.h index 20470ed2869719e27c87f7b6350f828883d7ce4e..ebd9dd381b2fcbe98d93eb17603181979df49ab7 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310037TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310037TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310037TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310037TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310038TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310038TestSuite.cpp index f7434e9a30cf62525edc22339c885239275c4070..b36c5d3c20967c575769fa2d9b364e5fc6bbba3b 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310038TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310038TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles310038TestSuite::endTime; FuncRunResult ActsDeqpgles310038TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles310038TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles310038TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles310038TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles310038TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310038TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310038TestSuite.h index ad6f143b1d49525cdd5470298a8f7f9d85c7875c..1c50ec949d1e49e9f104341798200b39396d84b8 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles310038TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles310038TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles310038TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles310038TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles31TestSuite.cpp b/graphic/vkgl/src/deqpgles31/ActsDeqpgles31TestSuite.cpp index 88c649150d653d45545a83affffcedccf426806c..9994b4a8727b34e842c82d5c94caa855b5987913 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles31TestSuite.cpp +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles31TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsDeqpgles31TestSuite::endTime; FuncRunResult ActsDeqpgles31TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsDeqpgles31TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsDeqpgles31TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsDeqpgles31TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsDeqpgles31TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/deqpgles31/ActsDeqpgles31TestSuite.h b/graphic/vkgl/src/deqpgles31/ActsDeqpgles31TestSuite.h index 166fff29364ebc7487878a89b8f94eb5e6410e63..1af0aba179cba21f4b545f685dc6910c596d84ba 100644 --- a/graphic/vkgl/src/deqpgles31/ActsDeqpgles31TestSuite.h +++ b/graphic/vkgl/src/deqpgles31/ActsDeqpgles31TestSuite.h @@ -18,23 +18,8 @@ #include #include "Deqpgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsDeqpgles31TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsDeqpgles31TestSuite) #endif // DEQPGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles2/ActsKhrgles20001TestSuite.cpp b/graphic/vkgl/src/khrgles2/ActsKhrgles20001TestSuite.cpp index 6e7eb7bf80bef1d12dce4f8350d71e6ae433e3b9..8b2fe5909eb3f3a805d3f9e7dced4fe8131d1445 100644 --- a/graphic/vkgl/src/khrgles2/ActsKhrgles20001TestSuite.cpp +++ b/graphic/vkgl/src/khrgles2/ActsKhrgles20001TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsKhrgles20001TestSuite::endTime; FuncRunResult ActsKhrgles20001TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsKhrgles20001TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrgles20001TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrgles20001TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrgles20001TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles2/ActsKhrgles20001TestSuite.h b/graphic/vkgl/src/khrgles2/ActsKhrgles20001TestSuite.h index 44d52c93207f3fd17460a77c80bb53c9a3619669..7d2a5b78855270f3b757b0f6de52c9c843c7c5e1 100644 --- a/graphic/vkgl/src/khrgles2/ActsKhrgles20001TestSuite.h +++ b/graphic/vkgl/src/khrgles2/ActsKhrgles20001TestSuite.h @@ -18,23 +18,8 @@ #include #include "Khrgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrgles20001TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsKhrgles20001TestSuite) #endif // KHRGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles2/ActsKhrgles2TestSuite.cpp b/graphic/vkgl/src/khrgles2/ActsKhrgles2TestSuite.cpp index f011877d30b1a5ad1acebb2ee2cd6ef605b0ebd9..98351f8f6a2a59aab4f96dc640079fd30dd1c9ba 100644 --- a/graphic/vkgl/src/khrgles2/ActsKhrgles2TestSuite.cpp +++ b/graphic/vkgl/src/khrgles2/ActsKhrgles2TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsKhrgles2TestSuite::endTime; FuncRunResult ActsKhrgles2TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsKhrgles2TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrgles2TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrgles2TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrgles2TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles2/ActsKhrgles2TestSuite.h b/graphic/vkgl/src/khrgles2/ActsKhrgles2TestSuite.h index 6c12f781793bdd912dc6f8ab4a0546d02392476d..2fc78f2ccea33b97d2d048707712c98e44721472 100644 --- a/graphic/vkgl/src/khrgles2/ActsKhrgles2TestSuite.h +++ b/graphic/vkgl/src/khrgles2/ActsKhrgles2TestSuite.h @@ -18,23 +18,8 @@ #include #include "Khrgles2BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrgles2TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsKhrgles2TestSuite) #endif // KHRGLES2_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles30001TestSuite.cpp b/graphic/vkgl/src/khrgles3/ActsKhrgles30001TestSuite.cpp index 4b09765e8af5eb98e0ca6eb3ea635434e49f13c3..dc06d6b75707dbacc5d1685c8f3e67f4ef8a3892 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles30001TestSuite.cpp +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles30001TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsKhrgles30001TestSuite::endTime; FuncRunResult ActsKhrgles30001TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsKhrgles30001TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrgles30001TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrgles30001TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrgles30001TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles30001TestSuite.h b/graphic/vkgl/src/khrgles3/ActsKhrgles30001TestSuite.h index 375b4278918dc6aa7d74939416d42e3eecf36cc3..75d37b4308a8e1761c277667c6d45a438bc89fd5 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles30001TestSuite.h +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles30001TestSuite.h @@ -18,23 +18,7 @@ #include #include "Khrgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrgles30001TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsKhrgles30001TestSuite) #endif // KHRGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles30002TestSuite.cpp b/graphic/vkgl/src/khrgles3/ActsKhrgles30002TestSuite.cpp index 3da127210087410f66e05d968b1cf1889be854b0..164e9b2ffd27927d8d3ca1ba7a2044f1b0572a94 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles30002TestSuite.cpp +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles30002TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsKhrgles30002TestSuite::endTime; FuncRunResult ActsKhrgles30002TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsKhrgles30002TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrgles30002TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrgles30002TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrgles30002TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles30002TestSuite.h b/graphic/vkgl/src/khrgles3/ActsKhrgles30002TestSuite.h index 80c54a8cf2443e57ffb14888aed9562d02dbd924..443845685614014461a33f73a094e23a49108bc5 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles30002TestSuite.h +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles30002TestSuite.h @@ -18,23 +18,7 @@ #include #include "Khrgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrgles30002TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsKhrgles30002TestSuite) #endif // KHRGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles30003TestSuite.cpp b/graphic/vkgl/src/khrgles3/ActsKhrgles30003TestSuite.cpp index 49e909eafa1cb0fadfa43849956c63b4401620b2..1faa4d15849b855cf3dbf80d88d402074ef76d4a 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles30003TestSuite.cpp +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles30003TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsKhrgles30003TestSuite::endTime; FuncRunResult ActsKhrgles30003TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsKhrgles30003TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrgles30003TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrgles30003TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrgles30003TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles30003TestSuite.h b/graphic/vkgl/src/khrgles3/ActsKhrgles30003TestSuite.h index 29fe24c2765344fe17c74c9d8ad5bd143a5cf48e..68f370b5ff3853e5fca5e2fdec21ae653de4a1dc 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles30003TestSuite.h +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles30003TestSuite.h @@ -18,23 +18,7 @@ #include #include "Khrgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrgles30003TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsKhrgles30003TestSuite) #endif // KHRGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles30004TestSuite.cpp b/graphic/vkgl/src/khrgles3/ActsKhrgles30004TestSuite.cpp index c1a73502293e0ab6c35cc66f214f3b0c8c85c979..f2c68e31f30aa7ad885052a994e1d826aefbad65 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles30004TestSuite.cpp +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles30004TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsKhrgles30004TestSuite::endTime; FuncRunResult ActsKhrgles30004TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsKhrgles30004TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrgles30004TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrgles30004TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrgles30004TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles30004TestSuite.h b/graphic/vkgl/src/khrgles3/ActsKhrgles30004TestSuite.h index 962941ffda6b7ac975b709ea7e6c86291e892c67..14f9e486dde3034d01627ee9c90be2d9037469de 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles30004TestSuite.h +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles30004TestSuite.h @@ -18,23 +18,7 @@ #include #include "Khrgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrgles30004TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsKhrgles30004TestSuite) #endif // KHRGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles30005TestSuite.cpp b/graphic/vkgl/src/khrgles3/ActsKhrgles30005TestSuite.cpp index dc71f81d632505f908c1947451467cedd741f9e9..7f07fed50be4ddf6d4b974066228df9aaa37c46c 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles30005TestSuite.cpp +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles30005TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsKhrgles30005TestSuite::endTime; FuncRunResult ActsKhrgles30005TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsKhrgles30005TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrgles30005TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrgles30005TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrgles30005TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles30005TestSuite.h b/graphic/vkgl/src/khrgles3/ActsKhrgles30005TestSuite.h index f56a5f9c9bc66428f2144aa44f255c14f4e7a5c6..21f0856fa4762ed78df12417c4863aa7307ef714 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles30005TestSuite.h +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles30005TestSuite.h @@ -18,23 +18,7 @@ #include #include "Khrgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrgles30005TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsKhrgles30005TestSuite) #endif // KHRGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles3TestSuite.cpp b/graphic/vkgl/src/khrgles3/ActsKhrgles3TestSuite.cpp index 7cbe24f42da5b4c529dcef7693e2434744285337..fbca5a0904f33b9a7229eb56eb5a0b5c3d8e12ba 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles3TestSuite.cpp +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles3TestSuite.cpp @@ -18,7 +18,9 @@ #include #include "Khrgles3BaseFunc.h" #include "ActsKhrgles3TestSuite.h" +#include "testsuitehead.h" +SHRINK_SUITETEST_HEAD(ActsKhrgles20001TestSuite) namespace OHOS { using namespace std; using namespace testing::ext; @@ -27,34 +29,4 @@ namespace OHOS { time_t ActsKhrgles3TestSuite::endTime; FuncRunResult ActsKhrgles3TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsKhrgles3TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrgles3TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrgles3TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrgles3TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles3/ActsKhrgles3TestSuite.h b/graphic/vkgl/src/khrgles3/ActsKhrgles3TestSuite.h index 600c2cc2819ee32c5f53627ebd36386f22f6aaf9..5dcf918d961e8ddbeaf317c34646428e6ca853f7 100644 --- a/graphic/vkgl/src/khrgles3/ActsKhrgles3TestSuite.h +++ b/graphic/vkgl/src/khrgles3/ActsKhrgles3TestSuite.h @@ -18,23 +18,8 @@ #include #include "Khrgles3BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrgles3TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsKhrgles3TestSuite) #endif // KHRGLES3_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles31/ActsKhrgles310001TestSuite.cpp b/graphic/vkgl/src/khrgles31/ActsKhrgles310001TestSuite.cpp index 42f7a7cf7f117302820ef3acd9e3f15af54dd8eb..bce8b715ab3f70dc5b27237c2163d83ef5edba6f 100644 --- a/graphic/vkgl/src/khrgles31/ActsKhrgles310001TestSuite.cpp +++ b/graphic/vkgl/src/khrgles31/ActsKhrgles310001TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsKhrgles310001TestSuite::endTime; FuncRunResult ActsKhrgles310001TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsKhrgles310001TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrgles310001TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrgles310001TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrgles310001TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles31/ActsKhrgles310001TestSuite.h b/graphic/vkgl/src/khrgles31/ActsKhrgles310001TestSuite.h index 0e67f6b59c2f824d60c9a31b6382b49116252390..f18f1a35d8a4a0e2936d88c0b6c6106a4f949502 100644 --- a/graphic/vkgl/src/khrgles31/ActsKhrgles310001TestSuite.h +++ b/graphic/vkgl/src/khrgles31/ActsKhrgles310001TestSuite.h @@ -18,23 +18,7 @@ #include #include "Khrgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrgles310001TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsKhrgles310001TestSuite) #endif // KHRGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles31/ActsKhrgles310002TestSuite.cpp b/graphic/vkgl/src/khrgles31/ActsKhrgles310002TestSuite.cpp index c3e9ddf2f9329b1a0bc34b2edae5d77124fe5d5a..f725d66c10117d11d74ef93d6e8d498e9f779c92 100644 --- a/graphic/vkgl/src/khrgles31/ActsKhrgles310002TestSuite.cpp +++ b/graphic/vkgl/src/khrgles31/ActsKhrgles310002TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsKhrgles310002TestSuite::endTime; FuncRunResult ActsKhrgles310002TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsKhrgles310002TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrgles310002TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrgles310002TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrgles310002TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles31/ActsKhrgles310002TestSuite.h b/graphic/vkgl/src/khrgles31/ActsKhrgles310002TestSuite.h index db5794b97f7d664122a4006dee1a1bb4bd009fe2..fbbb55289487e8bfc937f632f557ff9f72a37005 100644 --- a/graphic/vkgl/src/khrgles31/ActsKhrgles310002TestSuite.h +++ b/graphic/vkgl/src/khrgles31/ActsKhrgles310002TestSuite.h @@ -18,23 +18,7 @@ #include #include "Khrgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrgles310002TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsKhrgles310002TestSuite) #endif // KHRGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles31/ActsKhrgles310003TestSuite.cpp b/graphic/vkgl/src/khrgles31/ActsKhrgles310003TestSuite.cpp index 6235e791759f8c7538bbcd086c68981034d0a491..003b45c6916d6260f9378767488a4db9e3116d60 100644 --- a/graphic/vkgl/src/khrgles31/ActsKhrgles310003TestSuite.cpp +++ b/graphic/vkgl/src/khrgles31/ActsKhrgles310003TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsKhrgles310003TestSuite::startTime; time_t ActsKhrgles310003TestSuite::endTime; FuncRunResult ActsKhrgles310003TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsKhrgles310003TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrgles310003TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrgles310003TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrgles310003TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles31/ActsKhrgles310003TestSuite.h b/graphic/vkgl/src/khrgles31/ActsKhrgles310003TestSuite.h index 726ccb7f9d0cbbc0d30c7e5dcd92a9b876a0e3d3..8fff4602c2a19caada5b2d5d2758cbbead45e99a 100644 --- a/graphic/vkgl/src/khrgles31/ActsKhrgles310003TestSuite.h +++ b/graphic/vkgl/src/khrgles31/ActsKhrgles310003TestSuite.h @@ -18,23 +18,7 @@ #include #include "Khrgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrgles310003TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsKhrgles310003TestSuite) #endif // KHRGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles31/ActsKhrgles310004TestSuite.cpp b/graphic/vkgl/src/khrgles31/ActsKhrgles310004TestSuite.cpp index e889246d8e88e75c0091634e0ad5b2a7b2988355..fab314d35f3217e8a4fc97c4e7873e3d53f8daea 100644 --- a/graphic/vkgl/src/khrgles31/ActsKhrgles310004TestSuite.cpp +++ b/graphic/vkgl/src/khrgles31/ActsKhrgles310004TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsKhrgles310004TestSuite::endTime; FuncRunResult ActsKhrgles310004TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsKhrgles310004TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrgles310004TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrgles310004TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrgles310004TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles31/ActsKhrgles310004TestSuite.h b/graphic/vkgl/src/khrgles31/ActsKhrgles310004TestSuite.h index bd57429ddbcbed7a2484ddc4c090555e13d2b18a..8df6b0a3f5226e896dd106287843f9a76d3c1ad9 100644 --- a/graphic/vkgl/src/khrgles31/ActsKhrgles310004TestSuite.h +++ b/graphic/vkgl/src/khrgles31/ActsKhrgles310004TestSuite.h @@ -18,23 +18,7 @@ #include #include "Khrgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrgles310004TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsKhrgles310004TestSuite) #endif // KHRGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles31/ActsKhrgles31TestSuite.cpp b/graphic/vkgl/src/khrgles31/ActsKhrgles31TestSuite.cpp index a2f566ef98727439254b4f8eb02f8d411e27dc02..f0c514cc6e1a1b7f6adb6a1ab26afbaeb2231367 100644 --- a/graphic/vkgl/src/khrgles31/ActsKhrgles31TestSuite.cpp +++ b/graphic/vkgl/src/khrgles31/ActsKhrgles31TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsKhrgles31TestSuite::endTime; FuncRunResult ActsKhrgles31TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsKhrgles31TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrgles31TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrgles31TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrgles31TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles31/ActsKhrgles31TestSuite.h b/graphic/vkgl/src/khrgles31/ActsKhrgles31TestSuite.h index 6841d9f9c884d60a9d2bcf91efc8cfc5c61e5a7a..ccf4bcd80dec2c0276dfede24b012d2aac3eafaa 100644 --- a/graphic/vkgl/src/khrgles31/ActsKhrgles31TestSuite.h +++ b/graphic/vkgl/src/khrgles31/ActsKhrgles31TestSuite.h @@ -18,23 +18,7 @@ #include #include "Khrgles31BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrgles31TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsKhrgles31TestSuite) #endif // KHRGLES31_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles32/ActsKhrgles320001TestSuite.cpp b/graphic/vkgl/src/khrgles32/ActsKhrgles320001TestSuite.cpp index 9e5ece5f8fbfdaf09abad0aeabde3af0ea6709db..25146b4a9298897b6aab8c84b2920fecf91b93d3 100644 --- a/graphic/vkgl/src/khrgles32/ActsKhrgles320001TestSuite.cpp +++ b/graphic/vkgl/src/khrgles32/ActsKhrgles320001TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsKhrgles320001TestSuite::endTime; FuncRunResult ActsKhrgles320001TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsKhrgles320001TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrgles320001TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrgles320001TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrgles320001TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles32/ActsKhrgles320001TestSuite.h b/graphic/vkgl/src/khrgles32/ActsKhrgles320001TestSuite.h index b37608646b6020c35b0eda23a515ae9632ac9e8b..6f599c3aea99176c9ae30f698e7e5f5cd387dd5b 100644 --- a/graphic/vkgl/src/khrgles32/ActsKhrgles320001TestSuite.h +++ b/graphic/vkgl/src/khrgles32/ActsKhrgles320001TestSuite.h @@ -18,23 +18,8 @@ #include #include "Khrgles32BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrgles320001TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsKhrgles320001TestSuite) #endif // KHRGLES32_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles32/ActsKhrgles320002TestSuite.cpp b/graphic/vkgl/src/khrgles32/ActsKhrgles320002TestSuite.cpp index a765223c64ccc94af16da528d7765b543a05e56c..b19e2d0dc293043d79e941ba3b8515b7030fcdab 100644 --- a/graphic/vkgl/src/khrgles32/ActsKhrgles320002TestSuite.cpp +++ b/graphic/vkgl/src/khrgles32/ActsKhrgles320002TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsKhrgles320002TestSuite::endTime; FuncRunResult ActsKhrgles320002TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsKhrgles320002TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrgles320002TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrgles320002TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrgles320002TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles32/ActsKhrgles320002TestSuite.h b/graphic/vkgl/src/khrgles32/ActsKhrgles320002TestSuite.h index 5452ff517c5b8bb0eccd84c7a1facec9fc517abd..6b4a01292fb3a25920a2a9f483fbbbcf6106bf99 100644 --- a/graphic/vkgl/src/khrgles32/ActsKhrgles320002TestSuite.h +++ b/graphic/vkgl/src/khrgles32/ActsKhrgles320002TestSuite.h @@ -18,23 +18,7 @@ #include #include "Khrgles32BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrgles320002TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsKhrgles320002TestSuite) #endif // KHRGLES32_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles32/ActsKhrgles32TestSuite.cpp b/graphic/vkgl/src/khrgles32/ActsKhrgles32TestSuite.cpp index c4693d96878607667a562bb6750adde50b49f6ac..a83b08666130b48f789383c1dd237bb97daf3e8a 100644 --- a/graphic/vkgl/src/khrgles32/ActsKhrgles32TestSuite.cpp +++ b/graphic/vkgl/src/khrgles32/ActsKhrgles32TestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsKhrgles32TestSuite::endTime; FuncRunResult ActsKhrgles32TestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsKhrgles32TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrgles32TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrgles32TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrgles32TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrgles32/ActsKhrgles32TestSuite.h b/graphic/vkgl/src/khrgles32/ActsKhrgles32TestSuite.h index 7abca570b95af6a502ecceabbdaa3a75aaf18910..5c420900bad8956a90d0b507fa8af211f6ffb3c5 100644 --- a/graphic/vkgl/src/khrgles32/ActsKhrgles32TestSuite.h +++ b/graphic/vkgl/src/khrgles32/ActsKhrgles32TestSuite.h @@ -18,23 +18,8 @@ #include #include "Khrgles32BaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrgles32TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsKhrgles32TestSuite) #endif // KHRGLES32_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrglesext/ActsKhrglesext0001TestSuite.cpp b/graphic/vkgl/src/khrglesext/ActsKhrglesext0001TestSuite.cpp index 2c4e8f2fe6878ab535bc401daa3f0ce933172a95..ef9fe9634197b127d67a0ab1812528c231523b73 100644 --- a/graphic/vkgl/src/khrglesext/ActsKhrglesext0001TestSuite.cpp +++ b/graphic/vkgl/src/khrglesext/ActsKhrglesext0001TestSuite.cpp @@ -26,35 +26,4 @@ namespace OHOS { time_t ActsKhrglesext0001TestSuite::startTime; time_t ActsKhrglesext0001TestSuite::endTime; FuncRunResult ActsKhrglesext0001TestSuite::runResult; - - // Preset action of the test suite, which is executed before the first test case - void ActsKhrglesext0001TestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrglesext0001TestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrglesext0001TestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrglesext0001TestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrglesext/ActsKhrglesext0001TestSuite.h b/graphic/vkgl/src/khrglesext/ActsKhrglesext0001TestSuite.h index 7e89f81b33d56778eb0020befa2eeb9ebea112a1..c03acde458b636085dabef9311908300c3ebd1a9 100644 --- a/graphic/vkgl/src/khrglesext/ActsKhrglesext0001TestSuite.h +++ b/graphic/vkgl/src/khrglesext/ActsKhrglesext0001TestSuite.h @@ -18,23 +18,7 @@ #include #include "KhrglesextBaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrglesext0001TestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS - +SHRINK_SUITETEST_HEAD(ActsKhrglesext0001TestSuite) #endif // KHRGLESEXT_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/khrglesext/ActsKhrglesextTestSuite.cpp b/graphic/vkgl/src/khrglesext/ActsKhrglesextTestSuite.cpp index 2fe9898d0e35c8bbfd33ef53c2d3295be21e81f5..bf3bf5a23b4dc56753744ff6cb2bf03a4891e06e 100644 --- a/graphic/vkgl/src/khrglesext/ActsKhrglesextTestSuite.cpp +++ b/graphic/vkgl/src/khrglesext/ActsKhrglesextTestSuite.cpp @@ -27,34 +27,4 @@ namespace OHOS { time_t ActsKhrglesextTestSuite::endTime; FuncRunResult ActsKhrglesextTestSuite::runResult; - // Preset action of the test suite, which is executed before the first test case - void ActsKhrglesextTestSuite::SetUpTestCase(void) - { - time(&startTime); - RegistPackage(); - runResult.numPassed = 0; - runResult.numFailed = 0; - runResult.numNotSupported = 0; - runResult.numWarnings = 0; - runResult.numWaived = 0; - } - // Test suite cleanup action, which is executed after the last test case - void ActsKhrglesextTestSuite::TearDownTestCase(void) - { - time(&endTime); - printf("Test run totals --- Passed[%d]\n", runResult.numPassed); - printf("Test run totals --- Failed[%d]\n", runResult.numFailed); - printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); - printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); - printf("Test run totals --- Waved[%d]\n", runResult.numWaived); - cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl;; - } - // Preset action of the test case - void ActsKhrglesextTestSuite::SetUp(void) - { - } - // Cleanup action of the test case - void ActsKhrglesextTestSuite::TearDown(void) - { - } } \ No newline at end of file diff --git a/graphic/vkgl/src/khrglesext/ActsKhrglesextTestSuite.h b/graphic/vkgl/src/khrglesext/ActsKhrglesextTestSuite.h index 71a100311c64e0eadb5da836b6c53e3268550aa5..4da701effcb6d362672e4893d59ec0c10e9f0f34 100644 --- a/graphic/vkgl/src/khrglesext/ActsKhrglesextTestSuite.h +++ b/graphic/vkgl/src/khrglesext/ActsKhrglesextTestSuite.h @@ -18,23 +18,8 @@ #include #include "KhrglesextBaseFunc.h" +#include "testsuitehead.h" -namespace OHOS { - class ActsKhrglesextTestSuite : public testing::Test { - public: - static time_t startTime; - static time_t endTime; - static FuncRunResult runResult; - protected: - // Preset action of the test suite, which is executed before the first test case - static void SetUpTestCase(void); - // Test suite cleanup action, which is executed after the last test case - static void TearDownTestCase(void); - // Preset action of the test case - virtual void SetUp(void); - // Cleanup action of the test case - virtual void TearDown(void); - }; -} // namespace OHOS +SHRINK_SUITETEST_HEAD(ActsKhrglesextTestSuite) #endif // KHRGLESEXT_TESTCASE_H \ No newline at end of file diff --git a/graphic/vkgl/src/testsuitehead.h b/graphic/vkgl/src/testsuitehead.h new file mode 100644 index 0000000000000000000000000000000000000000..218a4ef7cee79d050dada8cd5f21b1e84d1d1d51 --- /dev/null +++ b/graphic/vkgl/src/testsuitehead.h @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef TEST_SUITETESTSHRINKHEAD_H +#define TEST_SUITETESTSHRINKHEAD_H + +#define SHRINK_SUITETEST_HEAD(TestSuite) \ +namespace OHOS { \ + class TestSuite : public testing::Test { \ + public: \ + static time_t startTime; \ + static time_t endTime; \ + static FuncRunResult runResult; \ + protected: \ + static void SetUpTestCase(void) \ + { \ + time(&startTime); \ + RegistPackage(); \ + runResult.numPassed = 0; \ + runResult.numFailed = 0; \ + runResult.numNotSupported = 0; \ + runResult.numWarnings = 0; \ + runResult.numWaived = 0; \ + }; \ + static void TearDownTestCase(void) \ + { \ + time(&endTime); \ + printf("Test run totals --- Passed[%d]\n", runResult.numPassed); \ + printf("Test run totals --- Failed[%d]\n", runResult.numFailed); \ + printf("Test run totals --- Notsupport[%d]\n", runResult.numNotSupported); \ + printf("Test run totals --- Warnings[%d]\n", runResult.numWarnings); \ + printf("Test run totals --- Waved[%d]\n", runResult.numWaived); \ + std::cout << "testmain end --- COST TIME ["<< (endTime-startTime) << "]" << std::endl; \ + }; \ + virtual void SetUp(void) {}; \ + virtual void TearDown(void) {}; \ + }; \ +} +#endif // 为缩减代码而存在 \ No newline at end of file