From 6e323a78c3e09a0382a28d3f08094ef5efe7a48b Mon Sep 17 00:00:00 2001 From: liyiming13 Date: Thu, 30 Mar 2023 20:43:20 +0800 Subject: [PATCH] Solve codeCheck warning 0331 Issue:I6RRBR Test: unittest Signed-off-by: liyiming13 --- .../unittest/common/utils_parcel_test.cpp | 49 +++++++------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/base/test/unittest/common/utils_parcel_test.cpp b/base/test/unittest/common/utils_parcel_test.cpp index 6eaddee..94020ce 100644 --- a/base/test/unittest/common/utils_parcel_test.cpp +++ b/base/test/unittest/common/utils_parcel_test.cpp @@ -726,10 +726,9 @@ HWTEST_F(UtilsParcelTest, test_parcel_WriteAndRead_003, TestSize.Level0) HWTEST_F(UtilsParcelTest, test_parcel_WriteAndRead_004, TestSize.Level0) { Parcel parcel1(nullptr); - bool result; int64_t int64test = -0x1234567887654321; - result = parcel1.WriteInt64(int64test); + bool result = parcel1.WriteInt64(int64test); EXPECT_EQ(result, true); uint64_t uint64test = 0x1234567887654321; @@ -767,10 +766,9 @@ HWTEST_F(UtilsParcelTest, test_parcel_WriteAndRead_004, TestSize.Level0) HWTEST_F(UtilsParcelTest, test_parcel_WriteAndRead_String_001, TestSize.Level0) { Parcel parcel1(nullptr); - bool result; string strWrite = "test"; - result = parcel1.WriteString(strWrite); + bool result = parcel1.WriteString(strWrite); EXPECT_EQ(result, true); string strWrite1 = @@ -853,13 +851,12 @@ HWTEST_F(UtilsParcelTest, test_parcel_WriteAndRead_String_002, TestSize.Level0) */ HWTEST_F(UtilsParcelTest, test_parcel_WriteAndRead_String_003, TestSize.Level0) { - bool result; Parcel parcel(nullptr); string test1 = "12345"; string test2 = "23456"; string test3 = "34567"; string test4 = "45678"; - result = parcel.WriteCString(nullptr); + bool result = parcel.WriteCString(nullptr); EXPECT_FALSE(result); result = parcel.WriteCString(test1.c_str()); EXPECT_TRUE(result); @@ -984,10 +981,9 @@ HWTEST_F(UtilsParcelTest, test_parcel_WriteAndRead_String005, TestSize.Level0) HWTEST_F(UtilsParcelTest, test_parcel_WriteAndRead_Float_001, TestSize.Level0) { Parcel parcel1(nullptr); - bool result; float floatwrite = 12.345678f; - result = parcel1.WriteFloat(floatwrite); + bool result = parcel1.WriteFloat(floatwrite); EXPECT_EQ(result, true); double doublewrite = 1345.7653; @@ -1028,10 +1024,9 @@ HWTEST_F(UtilsParcelTest, test_parcel_WriteAndRead_Float_001, TestSize.Level0) HWTEST_F(UtilsParcelTest, test_parcel_WriteAndRead_String_005, TestSize.Level0) { Parcel parcel1(nullptr); - bool result; string strwrite = "test"; - result = parcel1.WriteString(strwrite); + bool result = parcel1.WriteString(strwrite); EXPECT_EQ(result, true); string strwrite1 = @@ -1109,12 +1104,11 @@ void ValidateUnpadded(const struct Unpadded &left, const struct Unpadded &right) HWTEST_F(UtilsParcelTest, test_CalcNewCapacity_001, TestSize.Level0) { Parcel parcel; - bool ret; size_t newMaxCapacity; size_t minNewCapacity = CAPACITY_THRESHOLD; const string strLenThreshd = string(minNewCapacity, 't'); - ret = parcel.WriteUnpadBuffer(static_cast(strLenThreshd.data()), minNewCapacity); + bool ret = parcel.WriteUnpadBuffer(static_cast(strLenThreshd.data()), minNewCapacity); EXPECT_EQ(true, ret); // calculated capacity = CAPACITY_THRESHOLD newMaxCapacity = CAPACITY_THRESHOLD - 1; @@ -1151,11 +1145,10 @@ HWTEST_F(UtilsParcelTest, test_CalcNewCapacity_001, TestSize.Level0) HWTEST_F(UtilsParcelTest, test_SetDataCapacity_001, TestSize.Level0) { Parcel parcel; - bool result; struct TestData data = { true, -0x34, 0x5634, -0x12345678, 0x34, 0x5634, 0x12345678 }; WriteTestData(parcel, data); - result = parcel.SetDataCapacity(0); + bool result = parcel.SetDataCapacity(0); EXPECT_FALSE(result); } @@ -1167,8 +1160,8 @@ HWTEST_F(UtilsParcelTest, test_SetDataCapacity_001, TestSize.Level0) HWTEST_F(UtilsParcelTest, test_SetDataSize_001, TestSize.Level0) { Parcel parcel; - bool result; - result = parcel.SetDataCapacity(sizeof(bool)); + + bool result = parcel.SetDataCapacity(sizeof(bool)); EXPECT_TRUE(result); result = parcel.WriteBool(true); EXPECT_TRUE(result); @@ -1184,12 +1177,11 @@ HWTEST_F(UtilsParcelTest, test_SetDataSize_001, TestSize.Level0) HWTEST_F(UtilsParcelTest, test_parcel_Data_Structure_001, TestSize.Level0) { Parcel parcel(nullptr); - bool result; const struct Padded pad = { 'p', 0x34567890, -0x2345678998765432 }; const struct Unpadded unpad = { 'u' }; - result = parcel.WriteBuffer(static_cast(&pad), sizeof(struct Padded)); + bool result = parcel.WriteBuffer(static_cast(&pad), sizeof(struct Padded)); EXPECT_EQ(true, result); const struct Padded *padRead = reinterpret_cast(parcel.ReadBuffer(sizeof(struct Padded))); ValidatePadded(*padRead, pad); @@ -1228,14 +1220,13 @@ HWTEST_F(UtilsParcelTest, test_parcel_Data_Structure_001, TestSize.Level0) HWTEST_F(UtilsParcelTest, test_parcel_Data_Structure_002, TestSize.Level0) { Parcel parcel(nullptr); - bool result; const string str = "test invalid input"; const string strOverflow = "test write with SIZE_MAX bytes"; const string strWriteFail = string((DEFAULT_CPACITY+1)/sizeof(char), 'f'); const string strWriteTermFail = string((DEFAULT_CPACITY-2)/sizeof(char), 't'); - result = parcel.WriteBuffer(nullptr, sizeof(string)); + bool result = parcel.WriteBuffer(nullptr, sizeof(string)); EXPECT_EQ(false, result); result = parcel.WriteBufferAddTerminator(nullptr, sizeof(string), sizeof(char)); EXPECT_EQ(false, result); @@ -1421,11 +1412,11 @@ HWTEST_F(UtilsParcelTest, test_parcel_WriteAndReadVector_003, TestSize.Level0) { Parcel parcel1(nullptr); Parcel parcel2(nullptr); - bool result; + vector stringtest{ "test", "test for", "test for write", "test for write vector" }; vector string16test{ u"test", u"test for", u"test for write", u"test for write vector" }; - result = parcel1.WriteStringVector(stringtest); + bool result = parcel1.WriteStringVector(stringtest); EXPECT_EQ(result, true); result = parcel1.WriteString16Vector(string16test); EXPECT_EQ(result, true); @@ -1473,12 +1464,13 @@ HWTEST_F(UtilsParcelTest, test_parcel_WriteAndReadVector_004, TestSize.Level0) { Parcel parcel1(nullptr); Parcel parcel2(nullptr); - bool result; + vector floattest{ 11221.132313, 11221.45678 }; vector doubletest{ 1122.132313, 1122.45678 }; - result = parcel1.WriteFloatVector(floattest); + bool result = parcel1.WriteFloatVector(floattest); EXPECT_EQ(result, true); + result = parcel1.WriteDoubleVector(doubletest); EXPECT_EQ(result, true); @@ -1568,8 +1560,7 @@ void ParcelWriteVector(const std::vector &vectorTest) { Parcel parcel1(nullptr); Parcel parcel2(nullptr); - bool result; - result = CallWriteVector(parcel1, vectorTest); + bool result = CallWriteVector(parcel1, vectorTest); EXPECT_EQ(result, true); void *buffer = nullptr; @@ -1733,8 +1724,7 @@ HWTEST_F(UtilsParcelTest, test_SetMaxCapacity_001, TestSize.Level0) { Parcel parcel(nullptr); char test[48] = {0}; - bool ret; - ret = parcel.WriteBuffer(test, 48); + bool ret = parcel.WriteBuffer(test, 48); EXPECT_EQ(true, ret); // because default maxCap is 200 * 1024, so reset it more parcel.SetMaxCapacity(201 * 1024); @@ -1753,8 +1743,7 @@ HWTEST_F(UtilsParcelTest, test_SetMaxCapacity_002, TestSize.Level0) { Parcel parcel(nullptr); char test[48] = {0}; - bool ret; - ret = parcel.WriteInt32(5767168); + bool ret = parcel.WriteInt32(5767168); EXPECT_EQ(true, ret); ret = parcel.WriteBuffer(test, 48); EXPECT_EQ(true, ret); -- Gitee