fix code style

Signed-off-by: N411148299@qq.com <411148299@qq.com>

services/test/unittest/param/client_unittest.cpp

@@ -188,6 +188,24 @@ static void TestCmd()
     RunParamCommand(ARRAY_LENGTH(argForSet9), const_cast<char **>(argForSet9));
 }
 
+void TestClientApi(char testBuffer[], uint32_t size, const char *name, const char *value)
+{
+    ParamHandle handle;
+    int ret = SystemFindParameter(name, &handle);
+    SystemSetParameter(name, value);
+    ret = SystemFindParameter(name, &handle);
+    EXPECT_EQ(ret, 0);
+    uint32_t commitId = 0;
+    ret = SystemGetParameterCommitId(handle, &commitId);
+    EXPECT_EQ(ret, 0);
+    ret = SystemGetParameterName(handle, testBuffer, size);
+    EXPECT_EQ(ret, 0);
+    EXPECT_EQ(strcmp(testBuffer, name), 0);
+    ret = SystemGetParameterValue(handle, testBuffer, &size);
+    EXPECT_EQ(ret, 0);
+    EXPECT_EQ(strcmp(testBuffer, value), 0);
+}
+
 void TestClient(int index)
 {
     char testBuffer[PARAM_BUFFER_SIZE] = { 0 };
@@ -213,21 +231,7 @@ void TestClient(int index)
             break;
         }
         case 2: { // 2 api test
-            ParamHandle handle;
-            uint32_t size = PARAM_BUFFER_SIZE;
-            int ret = SystemFindParameter(name.c_str(), &handle);
-            SystemSetParameter(name.c_str(), value.c_str());
-            ret = SystemFindParameter(name.c_str(), &handle);
-            EXPECT_EQ(ret, 0);
-            uint32_t commitId = 0;
-            ret = SystemGetParameterCommitId(handle, &commitId);
-            EXPECT_EQ(ret, 0);
-            ret = SystemGetParameterName(handle, testBuffer, size);
-            EXPECT_EQ(ret, 0);
-            EXPECT_EQ(strcmp(testBuffer, name.c_str()), 0);
-            ret = SystemGetParameterValue(handle, testBuffer, &size);
-            EXPECT_EQ(ret, 0);
-            EXPECT_EQ(strcmp(testBuffer, value.c_str()), 0);
+            TestClientApi(testBuffer, PARAM_BUFFER_SIZE, name.c_str(), value.c_str());
             break;
         }
         case 3: // 3 Traversal test

services/test/unittest/param/dac_unittest.cpp

@@ -34,10 +34,10 @@ static int SecurityLabelGet(const ParamAuditData *auditData, void *context)
     return 0;
 }
 
-class ParamDacTest : public ::testing::Test {
+class DacUnitTest : public ::testing::Test {
 public:
-    ParamDacTest() {}
-    virtual ~ParamDacTest() {}
+    DacUnitTest() {}
+    virtual ~DacUnitTest() {}
 
     void SetUp() {}
     void TearDown() {}
@@ -182,37 +182,37 @@ private:
     ParamSecurityOps clientParamSercurityOps;
 };
 
-HWTEST_F(ParamDacTest, TestDacGetLabel, TestSize.Level0)
+HWTEST_F(DacUnitTest, TestDacGetLabel, TestSize.Level0)
 {
-    ParamDacTest test;
+    DacUnitTest test;
     test.TestDacGetLabel();
 }
 
-HWTEST_F(ParamDacTest, TestDacInitLocalLabel, TestSize.Level0)
+HWTEST_F(DacUnitTest, TestDacInitLocalLabel, TestSize.Level0)
 {
-    ParamDacTest test;
+    DacUnitTest test;
     test.TestDacInitLocalLabel();
 }
 
-HWTEST_F(ParamDacTest, TestDacLabelEncode, TestSize.Level0)
+HWTEST_F(DacUnitTest, TestDacLabelEncode, TestSize.Level0)
 {
-    ParamDacTest test;
+    DacUnitTest test;
     std::vector<char> buffer;
     ParamSecurityLabel label = {0, { 4444, 5555}};
     test.TestEncode(&label, buffer);
     test.TestDecode(&label, buffer);
 }
 
-HWTEST_F(ParamDacTest, TestDacCheckFilePermission, TestSize.Level0)
+HWTEST_F(DacUnitTest, TestDacCheckFilePermission, TestSize.Level0)
 {
-    ParamDacTest test;
+    DacUnitTest test;
     test.TestDacCheckFilePermission(PARAM_DEFAULT_PATH"/trigger_test.cfg");
 }
 
-HWTEST_F(ParamDacTest, TestDacCheckUserParaPermission, TestSize.Level0)
+HWTEST_F(DacUnitTest, TestDacCheckUserParaPermission, TestSize.Level0)
 {
     // 相同用户
-    ParamDacTest test;
+    DacUnitTest test;
     ParamDacData dacData;
     dacData.gid = getegid();
     dacData.uid = geteuid();
@@ -250,10 +250,10 @@ HWTEST_F(ParamDacTest, TestDacCheckUserParaPermission, TestSize.Level0)
     EXPECT_EQ(ret, 0);
 }
 
-HWTEST_F(ParamDacTest, TestDacCheckGroupParaPermission, TestSize.Level0)
+HWTEST_F(DacUnitTest, TestDacCheckGroupParaPermission, TestSize.Level0)
 {
     // 相同组
-    ParamDacTest test;
+    DacUnitTest test;
     ParamDacData dacData;
     dacData.gid = getegid();
     dacData.uid = 13333;
@@ -291,10 +291,10 @@ HWTEST_F(ParamDacTest, TestDacCheckGroupParaPermission, TestSize.Level0)
     EXPECT_EQ(ret, 0);
 }
 
-HWTEST_F(ParamDacTest, TestDacCheckOtherParaPermission, TestSize.Level0)
+HWTEST_F(DacUnitTest, TestDacCheckOtherParaPermission, TestSize.Level0)
 {
     // 其他用户
-    ParamDacTest test;
+    DacUnitTest test;
     ParamDacData dacData;
     dacData.gid = 13333;
     dacData.uid = 13333;
@@ -332,8 +332,8 @@ HWTEST_F(ParamDacTest, TestDacCheckOtherParaPermission, TestSize.Level0)
     EXPECT_EQ(ret, 0);
 }
 
-HWTEST_F(ParamDacTest, TestClientDacCheckFilePermission, TestSize.Level0)
+HWTEST_F(DacUnitTest, TestClientDacCheckFilePermission, TestSize.Level0)
 {
-    ParamDacTest test;
+    DacUnitTest test;
     test.TestClientDacCheckFilePermission(PARAM_DEFAULT_PATH"/trigger_test.cfg");
 }

watchdog/linux/init_linux_watchdog.c

@@ -62,7 +62,7 @@ int main(int argc, const char *argv[])
 
     int gap = 0;
     if (argc >= 3) { // Argument nums greater than or equal to 3.
-        gap = atoi(argv[2]); // Second parameter.
+        gap = atoi(argv[2]); // 2 second parameter.
     }
     gap = gap > 0 ? gap : DEFAULT_GAP;