diff --git a/base/test/unittest/common/utils_parcel_test.cpp b/base/test/unittest/common/utils_parcel_test.cpp index 07f841d926bdd3eec30e74ebb2479aaa81fc352f..f5c6968c0b29bd8591775d1705b2975210c0ad13 100644 --- a/base/test/unittest/common/utils_parcel_test.cpp +++ b/base/test/unittest/common/utils_parcel_test.cpp @@ -49,13 +49,23 @@ public: static sptr Unmarshalling(Parcel &parcel); }; +sptr RemoteObject::Unmarshalling(Parcel &parcel) +{ + const uint8_t *buffer = parcel.ReadBuffer(sizeof(parcel_flat_binder_object)); + if (buffer == nullptr) { + return nullptr; + } + sptr obj = new RemoteObject(); + return obj; +} + bool RemoteObject::Marshalling(Parcel &parcel) const { parcel_flat_binder_object flat; flat.hdr.type = 0xff; - flat.flags = 0x7f; flat.binder = 0; flat.handle = (uint32_t)(-1); + flat.flags = 0x7f; flat.cookie = reinterpret_cast(this); bool status = parcel.WriteBuffer(&flat, sizeof(parcel_flat_binder_object)); if (!status) { @@ -64,26 +74,16 @@ bool RemoteObject::Marshalling(Parcel &parcel) const return true; } -sptr RemoteObject::Unmarshalling(Parcel &parcel) -{ - const uint8_t *buffer = parcel.ReadBuffer(sizeof(parcel_flat_binder_object)); - if (buffer == nullptr) { - return nullptr; - } - sptr obj = new RemoteObject(); - return obj; -} - /*-------------------------------base data------------------------------------*/ struct TestData { bool booltest; - int8_t int8test; - int16_t int16test; - int32_t int32test; uint8_t uint8test; uint16_t uint16test; uint32_t uint32test; + int8_t int8test; + int16_t int16test; + int32_t int32test; }; void WriteTestData(Parcel &parcel, const struct TestData &data) @@ -1363,12 +1363,12 @@ HWTEST_F(UtilsParcelTest, test_parcel_Data_Structure_002, TestSize.Level0) struct VectorTestData { vector booltest = { false, false, true, false, true }; vector int8test = { 0x01, 0x10, -0x20, 0x30, 0x40 }; - vector int16test = { 0x1234, -0x2345, 0x3456, -0x4567, 0x5678 }; - vector int32test = { 0x12345678, -0x23456789, 0x34567890, -0x45678901 }; - vector int64test = { 0x1234567887654321, -0x2345678998765432 }; vector uint8test = { 0x01, 0x10, 0x20, 0x30, 0x40 }; + vector int16test = { 0x1234, -0x2345, 0x3456, -0x4567, 0x5678 }; vector uint16test = { 0x1234, 0x2345, 0x3456, 0x4567, 0x5678 }; + vector int32test = { 0x12345678, -0x23456789, 0x34567890, -0x45678901 }; vector uint32test = { 0x12345678, 0x23456789, 0x34567890, 0x45678901 }; + vector int64test = { 0x1234567887654321, -0x2345678998765432 }; vector uint64test = { 0x1234567887654321, 0x2345678998765432 }; }; @@ -1398,13 +1398,12 @@ void ReadVectorTestData(Parcel &parcel, const VectorTestData &data) { vector boolread; vector int8read; - vector int16read; - vector int32read; - vector int64read; - vector uint8read; + vector int16read; vector uint16read; + vector int32read; vector uint32read; + vector int64read; vector uint64read; bool result = parcel.ReadBoolVector(&boolread); @@ -1681,12 +1680,12 @@ HWTEST_F(UtilsParcelTest, test_parcel_WriteAndReadVector_005, TestSize.Level0) { vector boolVectorTest { true, false }; vector int8VectorTest { 1, 0 }; - vector int16VectorTest { 1, 0 }; - vector int32VectorTest { 1, 0 }; - vector int64VectorTest { 1, 0 }; vector uint8VectorTest { 1, 0 }; + vector int16VectorTest { 1, 0 }; vector uint16VectorTest { 1, 0 }; + vector int32VectorTest { 1, 0 }; vector uint32VectorTest { 1, 0 }; + vector int64VectorTest { 1, 0 }; vector uint64VectorTest { 1, 0 }; vector floatVectorTest { 1.1, 0 }; vector doubleVectorTest { 1.1, 0 }; @@ -1717,16 +1716,10 @@ public: static TestParcelable *Unmarshalling(Parcel &parcel); public: - int32_t int32Write_ = -0x12345678; int32_t int32Read_; + int32_t int32Write_ = -0x12345678; }; -bool TestParcelable::Marshalling(Parcel &parcel) const -{ - bool result = parcel.WriteInt32(this->int32Write_); - return result; -} - TestParcelable *TestParcelable::Unmarshalling(Parcel &parcel) { auto *read = new TestParcelable(); @@ -1734,6 +1727,12 @@ TestParcelable *TestParcelable::Unmarshalling(Parcel &parcel) return read; } +bool TestParcelable::Marshalling(Parcel &parcel) const +{ + bool result = parcel.WriteInt32(this->int32Write_); + return result; +} + /** * @tc.name: test_parcel_parcelable_001 * @tc.desc: test parcel read and write parcelable obj. @@ -1849,11 +1848,9 @@ HWTEST_F(UtilsParcelTest, test_SetMaxCapacity_002, TestSize.Level0) EXPECT_EQ(false, ret); } -HWTEST_F(UtilsParcelTest, test_ValidateReadData_001, TestSize.Level0) +void TestWrite(Parcel& parcel, string& strWrite, u16string& str16Write) { - Parcel parcel(nullptr); parcel.WriteBool(true); - string strWrite = "test"; bool result = parcel.WriteString(strWrite); EXPECT_EQ(result, true); @@ -1864,10 +1861,16 @@ HWTEST_F(UtilsParcelTest, test_ValidateReadData_001, TestSize.Level0) RemoteObject obj2; result = parcel.WriteRemoteObject(&obj2); EXPECT_EQ(result, true); - u16string str16Write = u"12345"; result = parcel.WriteString16(str16Write); EXPECT_EQ(result, true); +} +HWTEST_F(UtilsParcelTest, test_ValidateReadData_001, TestSize.Level0) +{ + Parcel parcel(nullptr); + string strWrite = "test"; + u16string str16Write = u"12345"; + TestWrite(parcel, strWrite, str16Write) bool readBool = parcel.ReadBool(); EXPECT_EQ(readBool, true); @@ -1890,21 +1893,9 @@ HWTEST_F(UtilsParcelTest, test_ValidateReadData_001, TestSize.Level0) HWTEST_F(UtilsParcelTest, test_ValidateReadData_002, TestSize.Level0) { Parcel parcel(nullptr); - parcel.WriteBool(true); string strWrite = "test"; - bool result = parcel.WriteString(strWrite); - EXPECT_EQ(result, true); - - RemoteObject obj1; - result = parcel.WriteRemoteObject(&obj1); - EXPECT_EQ(result, true); - parcel.WriteInt32(5); - RemoteObject obj2; - result = parcel.WriteRemoteObject(&obj2); - EXPECT_EQ(result, true); u16string str16Write = u"12345"; - result = parcel.WriteString16(str16Write); - EXPECT_EQ(result, true); + TestWrite(parcel, strWrite, str16Write) bool readBool = parcel.ReadBool(); EXPECT_EQ(readBool, true);