From 0a336dce464a822bbd9563b5dc021a37c6671515 Mon Sep 17 00:00:00 2001 From: Finn Williams Date: Mon, 11 May 2020 15:39:58 +0100 Subject: IVGCVSW-4734 Add an Attribute label guid to the relationship message to reduce traffic Signed-off-by: Finn Williams Change-Id: Ia55c52c12fe3d30eb47bc42c932a33c620dc9197 --- src/profiling/test/TimelinePacketTests.cpp | 45 +++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 4 deletions(-) (limited to 'src/profiling/test/TimelinePacketTests.cpp') diff --git a/src/profiling/test/TimelinePacketTests.cpp b/src/profiling/test/TimelinePacketTests.cpp index e57ed2a652..8cce520da2 100644 --- a/src/profiling/test/TimelinePacketTests.cpp +++ b/src/profiling/test/TimelinePacketTests.cpp @@ -122,11 +122,13 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketNullBufferTest) const uint64_t relationshipGuid = 123456u; const uint64_t headGuid = 234567u; const uint64_t tailGuid = 345678u; + const uint64_t attributeGuid = 876345u; unsigned int numberOfBytesWritten = 789u; TimelinePacketStatus result = WriteTimelineRelationshipBinary(relationshipType, relationshipGuid, headGuid, tailGuid, + attributeGuid, nullptr, 512u, numberOfBytesWritten); @@ -142,11 +144,13 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketZeroBufferSizeTest) const uint64_t relationshipGuid = 123456u; const uint64_t headGuid = 234567u; const uint64_t tailGuid = 345678u; + const uint64_t attributeGuid = 876345u; unsigned int numberOfBytesWritten = 789u; TimelinePacketStatus result = WriteTimelineRelationshipBinary(relationshipType, relationshipGuid, headGuid, tailGuid, + attributeGuid, buffer.data(), 0, numberOfBytesWritten); @@ -162,12 +166,14 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketSmallBufferSizeTest) const uint64_t relationshipGuid = 123456u; const uint64_t headGuid = 234567u; const uint64_t tailGuid = 345678u; + const uint64_t attributeGuid = 876345u; unsigned int numberOfBytesWritten = 789u; TimelinePacketStatus result = WriteTimelineRelationshipBinary(relationshipType, relationshipGuid, headGuid, tailGuid, + attributeGuid, buffer.data(), boost::numeric_cast(buffer.size()), numberOfBytesWritten); @@ -182,12 +188,15 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketInvalidRelationTest) const uint64_t relationshipGuid = 123456u; const uint64_t headGuid = 234567u; const uint64_t tailGuid = 345678u; + const uint64_t attributeGuid = 876345u; + unsigned int numberOfBytesWritten = 789u; BOOST_CHECK_THROW(WriteTimelineRelationshipBinary(relationshipType, relationshipGuid, headGuid, tailGuid, + attributeGuid, buffer.data(), boost::numeric_cast(buffer.size()), numberOfBytesWritten), @@ -204,17 +213,19 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketTestDataConstruction) const uint64_t relationshipGuid = 123456u; const uint64_t headGuid = 234567u; const uint64_t tailGuid = 345678u; + const uint64_t attributeGuid = 876345u; unsigned int numberOfBytesWritten = 789u; TimelinePacketStatus result = WriteTimelineRelationshipBinary(relationshipType, relationshipGuid, headGuid, tailGuid, + attributeGuid, buffer.data(), boost::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Ok); - BOOST_CHECK(numberOfBytesWritten == 32); + BOOST_CHECK(numberOfBytesWritten == 40); unsigned int uint32_t_size = sizeof(uint32_t); unsigned int uint64_t_size = sizeof(uint64_t); @@ -244,6 +255,11 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketTestDataConstruction) offset += uint64_t_size; uint64_t readTailGuid = ReadUint64(buffer.data(), offset); BOOST_CHECK(readTailGuid == tailGuid); + + // Check the attribute GUID + offset += uint64_t_size; + uint64_t readAttributeGuid = ReadUint64(buffer.data(), offset); + BOOST_CHECK(readAttributeGuid == attributeGuid); } BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketExecutionLinkTestDataConstruction) @@ -254,17 +270,19 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketExecutionLinkTestDataConstruction const uint64_t relationshipGuid = 123456u; const uint64_t headGuid = 234567u; const uint64_t tailGuid = 345678u; + const uint64_t attributeGuid = 876345u; unsigned int numberOfBytesWritten = 789u; TimelinePacketStatus result = WriteTimelineRelationshipBinary(relationshipType, relationshipGuid, headGuid, tailGuid, + attributeGuid, buffer.data(), boost::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Ok); - BOOST_CHECK(numberOfBytesWritten == 32); + BOOST_CHECK(numberOfBytesWritten == 40); unsigned int uint32_t_size = sizeof(uint32_t); unsigned int uint64_t_size = sizeof(uint64_t); @@ -292,6 +310,11 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketExecutionLinkTestDataConstruction offset += uint64_t_size; uint64_t readTailGuid = ReadUint64(buffer.data(), offset); BOOST_CHECK(readTailGuid == tailGuid); + + // Check the attribute GUID + offset += uint64_t_size; + uint64_t readAttributeGuid = ReadUint64(buffer.data(), offset); + BOOST_CHECK(readAttributeGuid == attributeGuid); } @@ -303,17 +326,19 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketDataLinkTestDataConstruction) const uint64_t relationshipGuid = 123456u; const uint64_t headGuid = 234567u; const uint64_t tailGuid = 345678u; + const uint64_t attributeGuid = 876345u; unsigned int numberOfBytesWritten = 789u; TimelinePacketStatus result = WriteTimelineRelationshipBinary(relationshipType, relationshipGuid, headGuid, tailGuid, + attributeGuid, buffer.data(), boost::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Ok); - BOOST_CHECK(numberOfBytesWritten == 32); + BOOST_CHECK(numberOfBytesWritten == 40); unsigned int uint32_t_size = sizeof(uint32_t); unsigned int uint64_t_size = sizeof(uint64_t); @@ -341,6 +366,11 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketDataLinkTestDataConstruction) offset += uint64_t_size; uint64_t readTailGuid = ReadUint64(buffer.data(), offset); BOOST_CHECK(readTailGuid == tailGuid); + + // Check the attribute GUID + offset += uint64_t_size; + uint64_t readAttributeGuid = ReadUint64(buffer.data(), offset); + BOOST_CHECK(readAttributeGuid == attributeGuid); } @@ -352,17 +382,19 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketLabelLinkTestDataConstruction) const uint64_t relationshipGuid = 123456u; const uint64_t headGuid = 234567u; const uint64_t tailGuid = 345678u; + const uint64_t attributeGuid = 876345u; unsigned int numberOfBytesWritten = 789u; TimelinePacketStatus result = WriteTimelineRelationshipBinary(relationshipType, relationshipGuid, headGuid, tailGuid, + attributeGuid, buffer.data(), boost::numeric_cast(buffer.size()), numberOfBytesWritten); BOOST_CHECK(result == TimelinePacketStatus::Ok); - BOOST_CHECK(numberOfBytesWritten == 32); + BOOST_CHECK(numberOfBytesWritten == 40); unsigned int uint32_t_size = sizeof(uint32_t); unsigned int uint64_t_size = sizeof(uint64_t); @@ -391,6 +423,11 @@ BOOST_AUTO_TEST_CASE(TimelineRelationshipPacketLabelLinkTestDataConstruction) offset += uint64_t_size; uint64_t readTailGuid = ReadUint64(buffer.data(), offset); BOOST_CHECK(readTailGuid == tailGuid); + + // Check the attribute GUID + offset += uint64_t_size; + uint64_t readAttributeGuid = ReadUint64(buffer.data(), offset); + BOOST_CHECK(readAttributeGuid == attributeGuid); } BOOST_AUTO_TEST_CASE(TimelineMessageDirectoryPacketTestNoBuffer) -- cgit v1.2.1