From 1f2494456b64cb50009c279cac34ee17286ed4ed Mon Sep 17 00:00:00 2001 From: Jan Eilers Date: Wed, 1 Jul 2020 15:37:50 +0100 Subject: Refactor: Remove need of OutgoingCaptureFile in JSONTimelineDecoder * moves ownership of the output file to caller of TimelineDecoder * by using ostream the output can be printed to std::cout or any other file stream * updated unit test accordingly Signed-off-by: Jan Eilers Change-Id: Iaa8994e9997c674c1a026a65fcbd1ab8e3832d3e --- src/timelineDecoder/JSONTimelineDecoder.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src/timelineDecoder/JSONTimelineDecoder.cpp') diff --git a/src/timelineDecoder/JSONTimelineDecoder.cpp b/src/timelineDecoder/JSONTimelineDecoder.cpp index a0392149ed..c0e81370ed 100644 --- a/src/timelineDecoder/JSONTimelineDecoder.cpp +++ b/src/timelineDecoder/JSONTimelineDecoder.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2020 Arm Ltd. All rights reserved. +// Copyright © 2020 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -242,12 +242,10 @@ void JSONTimelineDecoder::JSONEntity::SetParent(JSONEntity& parent) parent.childEntities.push_back(GetGuid()); } -void JSONTimelineDecoder::PrintJSON(JSONTimelineDecoder::JSONEntity& rootEntity) +void JSONTimelineDecoder::PrintJSON(JSONTimelineDecoder::JSONEntity& rootEntity, std::ostream& os) { std::string jsonString = GetJSONString(rootEntity); - std::ofstream ofs{this->outputJSONFile}; - ofs << jsonString; - ofs.close(); + os << jsonString; } std::string JSONTimelineDecoder::GetJSONString(JSONTimelineDecoder::JSONEntity& rootEntity) @@ -377,11 +375,6 @@ const JSONTimelineDecoder::Model &JSONTimelineDecoder::GetModel() return m_Model; } -void JSONTimelineDecoder::SetOutgoingCaptureFile(const std::string& outgoingCaptureFile) -{ - this->outputJSONFile = outgoingCaptureFile; -} - void JSONTimelineDecoder::JSONEntity::SetName(std::string entityName) { this->name = entityName; -- cgit v1.2.1