From cb940745d7f66dac00e78bb113aae97e5da14aed Mon Sep 17 00:00:00 2001 From: peilixia Date: Fri, 23 Sep 2022 14:28:09 +0800 Subject: [PATCH] modify codes to cleanWaring Signed-off-by: peilixia --- base/test/unittest/common/utils_file_test.cpp | 2 +- .../unittest/common/utils_singleton_test.cpp | 30 +++++++++++++++---- .../common/utils_thread_pool_test.cpp | 6 ++-- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/base/test/unittest/common/utils_file_test.cpp b/base/test/unittest/common/utils_file_test.cpp index b8bd84a..8e92c16 100644 --- a/base/test/unittest/common/utils_file_test.cpp +++ b/base/test/unittest/common/utils_file_test.cpp @@ -25,7 +25,7 @@ using namespace testing::ext; using namespace std; namespace OHOS { -namespace { +namespace { class UtilsFileTest : public testing::Test { public : static void SetUpTestCase(void); diff --git a/base/test/unittest/common/utils_singleton_test.cpp b/base/test/unittest/common/utils_singleton_test.cpp index 37c28ff..8461612 100644 --- a/base/test/unittest/common/utils_singleton_test.cpp +++ b/base/test/unittest/common/utils_singleton_test.cpp @@ -25,7 +25,10 @@ namespace { class DelayedSingletonDeclearTest { DECLARE_DELAYED_SINGLETON(DelayedSingletonDeclearTest); public: - void* GetObjAddr() { return static_cast(this); } + void* GetObjAddr() + { + return static_cast(this); + } }; DelayedSingletonDeclearTest::~DelayedSingletonDeclearTest() {}; @@ -34,7 +37,10 @@ DelayedSingletonDeclearTest::DelayedSingletonDeclearTest() {}; class SingletonDeclearTest { DECLARE_SINGLETON(SingletonDeclearTest); public: - void* GetObjAddr() { return static_cast(this); } + void* GetObjAddr() + { + return static_cast(this); + } }; SingletonDeclearTest::~SingletonDeclearTest() {}; @@ -42,19 +48,28 @@ SingletonDeclearTest::SingletonDeclearTest() {}; class SingletonTest: public Singleton { public: - void* GetObjAddr() { return static_cast(this); } + void* GetObjAddr() + { + return static_cast(this); + } }; class DelayedSingletonTest: public DelayedSingleton { public: - void* GetObjAddr() { return static_cast(this); } + void* GetObjAddr() + { + return static_cast(this); + } }; class DelayedRefSingletonDeclearTest { DECLARE_DELAYED_REF_SINGLETON(DelayedRefSingletonDeclearTest); public: - void* GetObjAddr() { return static_cast(this); } + void* GetObjAddr() + { + return static_cast(this); + } }; DelayedRefSingletonDeclearTest::DelayedRefSingletonDeclearTest() {}; @@ -62,7 +77,10 @@ DelayedRefSingletonDeclearTest::~DelayedRefSingletonDeclearTest() {}; class DelayedRefSingletonTest: public DelayedRefSingleton { public: - void* GetObjAddr() { return static_cast(this); } + void* GetObjAddr() + { + return static_cast(this); + } }; diff --git a/base/test/unittest/common/utils_thread_pool_test.cpp b/base/test/unittest/common/utils_thread_pool_test.cpp index b8e62a8..884676c 100644 --- a/base/test/unittest/common/utils_thread_pool_test.cpp +++ b/base/test/unittest/common/utils_thread_pool_test.cpp @@ -18,8 +18,9 @@ #include using namespace testing::ext; -using namespace OHOS; +namespace OHOS { +namespace { class UtilsThreadPoolTest : public testing::Test { public : @@ -268,4 +269,5 @@ HWTEST_F(UtilsThreadPoolTest, test_08, TestSize.Level0) EXPECT_EQ(g_times, 1); pool.Stop(); } - +} // namespace +} // namespace OHOS -- Gitee