From 4dfb7b91ee026114768a4803f61702e852adfae0 Mon Sep 17 00:00:00 2001 From: jinduo Date: Tue, 24 Oct 2023 02:54:59 +0000 Subject: [PATCH 1/2] tdd code refine Signed-off-by: jinduo --- test/unittest/datatransmitmgr/DevSLMgrTest.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/test/unittest/datatransmitmgr/DevSLMgrTest.cpp b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp index 4b6e225..41df51d 100644 --- a/test/unittest/datatransmitmgr/DevSLMgrTest.cpp +++ b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp @@ -30,7 +30,7 @@ using namespace testing::ext; class DevSLMgrTest : public testing::Test { -protected: +public: DevSLMgrTest(); ~DevSLMgrTest(); static void SetUpTestCase(); @@ -38,6 +38,7 @@ protected: void SetUp() override; void TearDown() override; private: + static bool isEnforcing_; }; static const int32_t DEV_SEC_LEVEL_ERR = 100; @@ -79,16 +80,26 @@ DevSLMgrTest::DevSLMgrTest() {} DevSLMgrTest::~DevSLMgrTest() {} void DevSLMgrTest::SetUpTestCase() { - OHOS::SaveStringToFile("/sys/fs/selinux/enforce", "0"); + string isEnforcing; + OHOS::LoadStringFormFile("/sys/fs/selinux/enforce", isEnforcing); + if (isEnforcing.compare("1") == 0) { + DevSLMgrTest::isEnforcing_ = true; + OHOS::SaveStringToFile("/sys/fs/selinux/enforce", "0"); + } NativeTokenGet(); } void DevSLMgrTest::TearDownTestCase() { - OHOS::SaveStringToFile("/sys/fs/selinux/enforce", "1"); + if (DevSLMgrTest::isEnforcing_) { + OHOS::SaveStringToFile("/sys/fs/selinux/enforce", "1"); + } } void DevSLMgrTest::SetUp() {} + void DevSLMgrTest::TearDown() {} +bool DevSLMgrTest::isEnforcing_ = false; + static void DATASL_GetUdidByOpp(DEVSLQueryParams *queryParams) { char udid[65] = "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"; -- Gitee From dc6f9e3f972f6096c540c9a2bc832f868e371b66 Mon Sep 17 00:00:00 2001 From: jinduo Date: Tue, 24 Oct 2023 03:49:52 +0000 Subject: [PATCH 2/2] tdd test refine Signed-off-by: jinduo --- test/unittest/datatransmitmgr/DevSLMgrTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unittest/datatransmitmgr/DevSLMgrTest.cpp b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp index 41df51d..2e5fd64 100644 --- a/test/unittest/datatransmitmgr/DevSLMgrTest.cpp +++ b/test/unittest/datatransmitmgr/DevSLMgrTest.cpp @@ -81,7 +81,7 @@ DevSLMgrTest::~DevSLMgrTest() {} void DevSLMgrTest::SetUpTestCase() { string isEnforcing; - OHOS::LoadStringFormFile("/sys/fs/selinux/enforce", isEnforcing); + OHOS::LoadStringFromFile("/sys/fs/selinux/enforce", isEnforcing); if (isEnforcing.compare("1") == 0) { DevSLMgrTest::isEnforcing_ = true; OHOS::SaveStringToFile("/sys/fs/selinux/enforce", "0"); -- Gitee