From 27a006e3de2faa4e44db06c8ff7e36f7d15529ad Mon Sep 17 00:00:00 2001
From: gaohongliang410 <gaohongliang410@huawei.com>
Date: Sat, 18 Nov 2023 06:54:04 +0000
Subject: [PATCH 1/2] modify tdd test

Signed-off-by: gaohongliang410 <gaohongliang410@huawei.com>
---
 .../unittest/datatransmitmgr/DevSLMgrTest.cpp | 14 -------------
 test/unittest/datatransmitmgr/DevSLMgrTest.h  | 21 +++++++++++++++++++
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/test/unittest/datatransmitmgr/DevSLMgrTest.cpp b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp
index 2e5fd64..9577001 100644
--- a/test/unittest/datatransmitmgr/DevSLMgrTest.cpp
+++ b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp
@@ -17,7 +17,6 @@
 #include <mutex>
 #include <thread>
 #include <condition_variable>
-#include "gtest/gtest.h"
 #include "file_ex.h"
 #include "securec.h"
 #include "softbus_bus_center.h"
@@ -28,19 +27,6 @@
 #include "token_setproc.h"
 #include "accesstoken_kit.h"
 
-using namespace testing::ext;
-class DevSLMgrTest : public testing::Test {
-public:
-    DevSLMgrTest();
-    ~DevSLMgrTest();
-    static void SetUpTestCase();
-    static void TearDownTestCase();
-    void SetUp() override;
-    void TearDown() override;
-private:
-    static bool isEnforcing_;
-};
-
 static const int32_t DEV_SEC_LEVEL_ERR = 100;
 static const int32_t LIST_LENGTH = 128;
 
diff --git a/test/unittest/datatransmitmgr/DevSLMgrTest.h b/test/unittest/datatransmitmgr/DevSLMgrTest.h
index 472e5d2..e5673aa 100644
--- a/test/unittest/datatransmitmgr/DevSLMgrTest.h
+++ b/test/unittest/datatransmitmgr/DevSLMgrTest.h
@@ -16,4 +16,25 @@
 #ifndef DATASECURITYLEVEL_TEST_H
 #define DATASECURITYLEVEL_TEST_H
 
+#include <gtest/gtest.h>
+
+namespace OHOS {
+namespace Security {
+namespace DevSLMgrTest {
+using namespace testing::ext;
+class DevSLMgrTest : public testing::Test {
+public:
+    DevSLMgrTest();
+    ~DevSLMgrTest();
+    static void SetUpTestCase();
+    static void TearDownTestCase();
+    void SetUp() override;
+    void TearDown() override;
+private:
+    static bool isEnforcing_;
+};
+}
+}
+}
+
 #endif
\ No newline at end of file
-- 
Gitee


From 5f8969dc13d3caa86c6391ba883f4fb0428be1c5 Mon Sep 17 00:00:00 2001
From: gaohongliang410 <gaohongliang410@huawei.com>
Date: Sat, 18 Nov 2023 08:33:39 +0000
Subject: [PATCH 2/2] modify tdd test

Signed-off-by: gaohongliang410 <gaohongliang410@huawei.com>
---
 test/unittest/datatransmitmgr/DevSLMgrTest.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/unittest/datatransmitmgr/DevSLMgrTest.cpp b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp
index 9577001..1af2956 100644
--- a/test/unittest/datatransmitmgr/DevSLMgrTest.cpp
+++ b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp
@@ -39,7 +39,9 @@ struct DeviceSecurityInfo {
 extern "C" {
     extern void OnApiDeviceSecInfoCallback(const DeviceIdentify *identify, struct DeviceSecurityInfo *info);
 }
-
+namespace OHOS {
+namespace Security {
+namespace DevSLMgrTest {
 static void NativeTokenGet()
 {
     uint64_t tokenId;
@@ -463,4 +465,7 @@ static HWTEST_F(DevSLMgrTest, TestGetHighestSecLevelExcept005, TestSize.Level1)
     ClearList(g_tmpList);
     g_tmpList = nullptr;
     DATASL_OnStop();
+}
+}
+}
 }
\ No newline at end of file
-- 
Gitee