From 92f7fed30d6755667ffe48a947443ef615576bf7 Mon Sep 17 00:00:00 2001
From: liyaoyao777 <liyaoyao7@huawei.com>
Date: Tue, 27 Aug 2024 10:14:26 +0800
Subject: [PATCH 1/2] Rectify namespace irregularities

Signed-off-by: liyaoyao777 <liyaoyao7@huawei.com>
---
 .../createdatachannelstub_fuzzer.cpp                          | 4 ++--
 .../createsocketchannelstub_fuzzer.cpp                        | 4 ++--
 .../destroydatachannelstub_fuzzer.cpp                         | 4 ++--
 .../destroysocketchannelstub_fuzzer.cpp                       | 4 ++--
 .../disableactiveinfocbstub_fuzzer.cpp                        | 4 ++--
 .../enableactiveinfocbstub_fuzzer.cpp                         | 4 ++--
 .../getactiveinfoliststub_fuzzer.cpp                          | 4 ++--
 .../getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp     | 4 ++--
 .../resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp       | 4 ++--
 .../resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp     | 4 ++--
 .../sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp     | 4 ++--
 .../sensoronremoterequest_fuzzer.cpp                          | 4 ++--
 .../suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp   | 4 ++--
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/test/fuzztest/services/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp b/test/fuzztest/services/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp
index 84d56fa1..f3f85d1b 100644
--- a/test/fuzztest/services/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp
+++ b/test/fuzztest/services/createdatachannelstub_fuzzer/createdatachannelstub_fuzzer.cpp
@@ -78,8 +78,8 @@ bool OnRemoteRequestFuzzTest(const uint8_t *data, size_t size)
         datas, reply, option);
     return true;
 }
-}  // namespace Sensors
-}  // namespace OHOS
+} // namespace Sensors
+} // namespace OHOS
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
diff --git a/test/fuzztest/services/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp b/test/fuzztest/services/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp
index 456696b9..59717834 100644
--- a/test/fuzztest/services/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp
+++ b/test/fuzztest/services/createsocketchannelstub_fuzzer/createsocketchannelstub_fuzzer.cpp
@@ -78,8 +78,8 @@ bool OnRemoteRequestFuzzTest(const uint8_t *data, size_t size)
         datas, reply, option);
     return true;
 }
-}  // namespace Sensors
-}  // namespace OHOS
+} // namespace Sensors
+} // namespace OHOS
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
diff --git a/test/fuzztest/services/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp b/test/fuzztest/services/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp
index 08ec5740..48284574 100644
--- a/test/fuzztest/services/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp
+++ b/test/fuzztest/services/destroydatachannelstub_fuzzer/destroydatachannelstub_fuzzer.cpp
@@ -78,8 +78,8 @@ bool OnRemoteRequestFuzzTest(const uint8_t *data, size_t size)
         datas, reply, option);
     return true;
 }
-}  // namespace Sensors
-}  // namespace OHOS
+} // namespace Sensors
+} // namespace OHOS
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
diff --git a/test/fuzztest/services/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp b/test/fuzztest/services/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp
index 004f9745..92d43754 100644
--- a/test/fuzztest/services/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp
+++ b/test/fuzztest/services/destroysocketchannelstub_fuzzer/destroysocketchannelstub_fuzzer.cpp
@@ -78,8 +78,8 @@ bool OnRemoteRequestFuzzTest(const uint8_t *data, size_t size)
         datas, reply, option);
     return true;
 }
-}  // namespace Sensors
-}  // namespace OHOS
+} // namespace Sensors
+} // namespace OHOS
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
diff --git a/test/fuzztest/services/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp
index c5510ddd..21dc7572 100644
--- a/test/fuzztest/services/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp
+++ b/test/fuzztest/services/disableactiveinfocbstub_fuzzer/disableactiveinfocbstub_fuzzer.cpp
@@ -74,8 +74,8 @@ bool OnRemoteRequestFuzzTest(const uint8_t *data, size_t size)
         datas, reply, option);
     return true;
 }
-}  // namespace Sensors
-}  // namespace OHOS
+} // namespace Sensors
+} // namespace OHOS
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
diff --git a/test/fuzztest/services/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp
index 89920778..a99b9e13 100644
--- a/test/fuzztest/services/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp
+++ b/test/fuzztest/services/enableactiveinfocbstub_fuzzer/enableactiveinfocbstub_fuzzer.cpp
@@ -74,8 +74,8 @@ bool OnRemoteRequestFuzzTest(const uint8_t *data, size_t size)
         datas, reply, option);
     return true;
 }
-}  // namespace Sensors
-}  // namespace OHOS
+} // namespace Sensors
+} // namespace OHOS
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
diff --git a/test/fuzztest/services/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp b/test/fuzztest/services/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp
index 3f46761b..c31efbb1 100644
--- a/test/fuzztest/services/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp
+++ b/test/fuzztest/services/getactiveinfoliststub_fuzzer/getactiveinfoliststub_fuzzer.cpp
@@ -74,8 +74,8 @@ bool OnRemoteRequestFuzzTest(const uint8_t *data, size_t size)
         datas, reply, option);
     return true;
 }
-}  // namespace Sensors
-}  // namespace OHOS
+} // namespace Sensors
+} // namespace OHOS
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
diff --git a/test/fuzztest/services/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp b/test/fuzztest/services/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp
index 9e1c8f2c..ef06d085 100644
--- a/test/fuzztest/services/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp
+++ b/test/fuzztest/services/getallsensorsstub_fuzzer/getallsensorsstub_fuzzer.cpp
@@ -74,8 +74,8 @@ bool OnRemoteRequestFuzzTest(const uint8_t *data, size_t size)
         datas, reply, option);
     return true;
 }
-}  // namespace Sensors
-}  // namespace OHOS
+} // namespace Sensors
+} // namespace OHOS
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
diff --git a/test/fuzztest/services/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp b/test/fuzztest/services/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp
index f17d2dfe..41420633 100644
--- a/test/fuzztest/services/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp
+++ b/test/fuzztest/services/resetsensorsstub_fuzzer/resetsensorsstub_fuzzer.cpp
@@ -74,8 +74,8 @@ bool OnRemoteRequestFuzzTest(const uint8_t *data, size_t size)
         datas, reply, option);
     return true;
 }
-}  // namespace Sensors
-}  // namespace OHOS
+} // namespace Sensors
+} // namespace OHOS
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
diff --git a/test/fuzztest/services/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp b/test/fuzztest/services/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp
index d3ad2968..91c67ddb 100644
--- a/test/fuzztest/services/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp
+++ b/test/fuzztest/services/resumesensorsstub_fuzzer/resumesensorsstub_fuzzer.cpp
@@ -74,8 +74,8 @@ bool OnRemoteRequestFuzzTest(const uint8_t *data, size_t size)
         datas, reply, option);
     return true;
 }
-}  // namespace Sensors
-}  // namespace OHOS
+} // namespace Sensors
+} // namespace OHOS
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
diff --git a/test/fuzztest/services/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp b/test/fuzztest/services/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp
index 26ec958d..f5ca6e0d 100644
--- a/test/fuzztest/services/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp
+++ b/test/fuzztest/services/sensordisablestub_fuzzer/sensordisablestub_fuzzer.cpp
@@ -90,8 +90,8 @@ bool OnRemoteRequestFuzzTest(const uint8_t *data, size_t size)
         datas, reply, option);
     return true;
 }
-}  // namespace Sensors
-}  // namespace OHOS
+} // namespace Sensors
+} // namespace OHOS
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
diff --git a/test/fuzztest/services/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp b/test/fuzztest/services/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp
index 81224c1c..1c0a01ef 100644
--- a/test/fuzztest/services/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp
+++ b/test/fuzztest/services/sensoronremoterequest_fuzzer/sensoronremoterequest_fuzzer.cpp
@@ -81,8 +81,8 @@ bool OnRemoteRequestFuzzTest(const uint8_t *data, size_t size)
     g_service->OnRemoteRequest(code, datas, reply, option);
     return true;
 }
-}  // namespace Sensors
-}  // namespace OHOS
+} // namespace Sensors
+} // namespace OHOS
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 {
diff --git a/test/fuzztest/services/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp b/test/fuzztest/services/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp
index b7fd0647..e72bab07 100644
--- a/test/fuzztest/services/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp
+++ b/test/fuzztest/services/suspendsensorsstub_fuzzer/suspendsensorsstub_fuzzer.cpp
@@ -74,8 +74,8 @@ bool OnRemoteRequestFuzzTest(const uint8_t *data, size_t size)
         datas, reply, option);
     return true;
 }
-}  // namespace Sensors
-}  // namespace OHOS
+} // namespace Sensors
+} // namespace OHOS
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
 {
-- 
Gitee


From f87546031280a262781e6af5219d0e0f68fc3ced Mon Sep 17 00:00:00 2001
From: liyaoyao777 <liyaoyao7@huawei.com>
Date: Tue, 27 Aug 2024 10:25:31 +0800
Subject: [PATCH 2/2] Rectify namespace irregularities

Signed-off-by: liyaoyao777 <liyaoyao7@huawei.com>
---
 test/unittest/coverage/report_data_callback_test.cpp      | 2 +-
 test/unittest/coverage/sensor_basic_data_channel_test.cpp | 6 +++---
 test/unittest/interfaces/inner_api/sensor_agent_test.cpp  | 2 +-
 test/unittest/interfaces/kits/sensor_native_test.cpp      | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/unittest/coverage/report_data_callback_test.cpp b/test/unittest/coverage/report_data_callback_test.cpp
index 201bac50..e9320acb 100644
--- a/test/unittest/coverage/report_data_callback_test.cpp
+++ b/test/unittest/coverage/report_data_callback_test.cpp
@@ -26,7 +26,7 @@ using namespace testing::ext;
 
 namespace {
     SensorData* g_sensorData = new (std::nothrow) SensorData[CIRCULAR_BUF_LEN];
-}  // namespace
+} // namespace
 
 class SensorBasicDataChannelTest : public testing::Test {
 public:
diff --git a/test/unittest/coverage/sensor_basic_data_channel_test.cpp b/test/unittest/coverage/sensor_basic_data_channel_test.cpp
index 3001cffe..53cd8ed1 100644
--- a/test/unittest/coverage/sensor_basic_data_channel_test.cpp
+++ b/test/unittest/coverage/sensor_basic_data_channel_test.cpp
@@ -33,7 +33,7 @@ using namespace OHOS::HiviewDFX;
 
 namespace {
 constexpr int32_t INVALID_FD = 2;
-}  // namespace
+} // namespace
 
 class SensorBasicDataChannelTest : public testing::Test {
 public:
@@ -145,5 +145,5 @@ HWTEST_F(SensorBasicDataChannelTest, ReceiveData_001, TestSize.Level1)
     sensorChannel.DestroySensorBasicChannel();
 }
 
-}  // namespace Sensors
-}  // namespace OHOS
+} // namespace Sensors
+} // namespace OHOS
diff --git a/test/unittest/interfaces/inner_api/sensor_agent_test.cpp b/test/unittest/interfaces/inner_api/sensor_agent_test.cpp
index 337445f7..b74fa07e 100644
--- a/test/unittest/interfaces/inner_api/sensor_agent_test.cpp
+++ b/test/unittest/interfaces/inner_api/sensor_agent_test.cpp
@@ -60,7 +60,7 @@ HapInfoParams g_infoManagerTestInfoParms = {
     .instIndex = 0,
     .appIDDesc = "sensorAgentTest"
 };
-}  // namespace
+} // namespace
 
 class SensorAgentTest : public testing::Test {
 public:
diff --git a/test/unittest/interfaces/kits/sensor_native_test.cpp b/test/unittest/interfaces/kits/sensor_native_test.cpp
index 45e3c75e..f2125c7d 100644
--- a/test/unittest/interfaces/kits/sensor_native_test.cpp
+++ b/test/unittest/interfaces/kits/sensor_native_test.cpp
@@ -42,7 +42,7 @@ constexpr int64_t INVALID_VALUE = -1;
 constexpr float INVALID_RESOLUTION = -1.0F;
 Sensor_Subscriber *g_user = nullptr;
 std::atomic_bool g_existAmbientLight = false;
-}  // namespace
+} // namespace
 
 class SensorAgentTest : public testing::Test {
 public:
@@ -712,5 +712,5 @@ HWTEST_F(SensorAgentTest, OH_SensorSubscriber_GetCallback_003, TestSize.Level1)
         OH_Sensor_DestroySubscriber(g_user);
     }
 }
-}  // namespace Sensors
-}  // namespace OHOS
+} // namespace Sensors
+} // namespace OHOS
-- 
Gitee