From 6398a98ac273931cc0b3ab33222d255d1edf48b0 Mon Sep 17 00:00:00 2001 From: Jim Flynn Date: Wed, 27 May 2020 17:05:21 +0100 Subject: IVGCVSW-4900 Update Timeline Directory Message with new fields Change-Id: I68097e176f7471a18498492b50339e68004dddd5 Signed-off-by: Jim Flynn --- src/profiling/test/SendTimelinePacketTests.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/profiling/test/SendTimelinePacketTests.cpp') diff --git a/src/profiling/test/SendTimelinePacketTests.cpp b/src/profiling/test/SendTimelinePacketTests.cpp index 05a6db8d1d..4b45cfef76 100644 --- a/src/profiling/test/SendTimelinePacketTests.cpp +++ b/src/profiling/test/SendTimelinePacketTests.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2019 Arm Ltd. All rights reserved. +// Copyright © 2019 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE(SendTimelineMessageDirectoryPackageTest) uint32_t sequenceNumbered = (packetHeaderWord1 >> 24) & 0x00000001; uint32_t dataLength = (packetHeaderWord1 >> 0) & 0x00FFFFFF; BOOST_CHECK(sequenceNumbered == 0); - BOOST_CHECK(dataLength == 419); + BOOST_CHECK(dataLength == 443); offset += uint32_t_size; uint8_t readStreamVersion = ReadUint8(packetBuffer, offset); @@ -98,26 +98,30 @@ BOOST_AUTO_TEST_CASE(SendTimelineMessageDirectoryPackageTest) BOOST_CHECK(swTraceMessage.m_Id == 2); BOOST_CHECK(swTraceMessage.m_Name == "declareEventClass"); BOOST_CHECK(swTraceMessage.m_UiName == "declare event class"); - BOOST_CHECK(swTraceMessage.m_ArgTypes.size() == 1); + BOOST_CHECK(swTraceMessage.m_ArgTypes.size() == 2); BOOST_CHECK(swTraceMessage.m_ArgTypes[0] == 'p'); - BOOST_CHECK(swTraceMessage.m_ArgNames.size() == 1); + BOOST_CHECK(swTraceMessage.m_ArgTypes[1] == 'p'); + BOOST_CHECK(swTraceMessage.m_ArgNames.size() == 2); BOOST_CHECK(swTraceMessage.m_ArgNames[0] == "guid"); + BOOST_CHECK(swTraceMessage.m_ArgNames[1] == "nameGuid"); swTraceMessage = ReadSwTraceMessage(packetBuffer->GetReadableData(), offset); BOOST_CHECK(swTraceMessage.m_Id == 3); BOOST_CHECK(swTraceMessage.m_Name == "declareRelationship"); BOOST_CHECK(swTraceMessage.m_UiName == "declare relationship"); - BOOST_CHECK(swTraceMessage.m_ArgTypes.size() == 4); + BOOST_CHECK(swTraceMessage.m_ArgTypes.size() == 5); BOOST_CHECK(swTraceMessage.m_ArgTypes[0] == 'I'); BOOST_CHECK(swTraceMessage.m_ArgTypes[1] == 'p'); BOOST_CHECK(swTraceMessage.m_ArgTypes[2] == 'p'); BOOST_CHECK(swTraceMessage.m_ArgTypes[3] == 'p'); - BOOST_CHECK(swTraceMessage.m_ArgNames.size() == 4); + BOOST_CHECK(swTraceMessage.m_ArgTypes[4] == 'p'); + BOOST_CHECK(swTraceMessage.m_ArgNames.size() == 5); BOOST_CHECK(swTraceMessage.m_ArgNames[0] == "relationshipType"); BOOST_CHECK(swTraceMessage.m_ArgNames[1] == "relationshipGuid"); BOOST_CHECK(swTraceMessage.m_ArgNames[2] == "headGuid"); BOOST_CHECK(swTraceMessage.m_ArgNames[3] == "tailGuid"); + BOOST_CHECK(swTraceMessage.m_ArgNames[4] == "attributeGuid"); swTraceMessage = ReadSwTraceMessage(packetBuffer->GetReadableData(), offset); @@ -403,7 +407,7 @@ BOOST_AUTO_TEST_CASE(SendTimelinePacketTests3) const uint64_t eventClassBinaryPacketNameGuid = 8845u; BOOST_CHECK_THROW(sendTimelinePacket->SendTimelineEventClassBinaryPacket( eventClassBinaryPacketProfilingGuid, eventClassBinaryPacketNameGuid), - armnn::RuntimeException); + armnn::profiling::BufferExhaustion); } BOOST_AUTO_TEST_CASE(GetGuidsFromProfilingService) -- cgit v1.2.1