From 8bf442e9d121323d48525ab80c45fa816ba0c82c Mon Sep 17 00:00:00 2001
From: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Date: Thu, 7 Nov 2019 18:41:40 +0000
Subject: IVGCVSW-4107 Fix bug in ProfilingConnectionDumpToFileDecoratorTests

* Replace predefined file name with randomly generated file name to
  avoid reading back old dumps

Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Ia48a9cda4527c585453383a5d758e1831c38604a
---
 .../test/FileOnlyProfilingDecoratorTests.cpp         |  9 ++-------
 .../ProfilingConnectionDumpToFileDecoratorTests.cpp  | 20 ++++++++------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp
index 7f927bdeee..9bf177c096 100644
--- a/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp
+++ b/src/profiling/test/FileOnlyProfilingDecoratorTests.cpp
@@ -4,6 +4,8 @@
 //
 
 #include "../FileOnlyProfilingConnection.hpp"
+
+#include <ProfilingService.hpp>
 #include <Runtime.hpp>
 
 #include <boost/core/ignore_unused.hpp>
@@ -11,18 +13,11 @@
 #include <boost/numeric/conversion/cast.hpp>
 #include <boost/test/unit_test.hpp>
 
-#include <ProfilingService.hpp>
 #include <cstdio>
 #include <fstream>
 #include <sstream>
 #include <sys/stat.h>
 
-#if defined(__ANDROID__)
-#define ARMNN_PROFILING_CONNECTION_TEST_DUMP_DIR "/data/local/tmp"
-#else
-#define ARMNN_PROFILING_CONNECTION_TEST_DUMP_DIR "/tmp"
-#endif
-
 using namespace armnn::profiling;
 using namespace armnn;
 
diff --git a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp
index ec4e591836..c393ec9b07 100644
--- a/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp
+++ b/src/profiling/test/ProfilingConnectionDumpToFileDecoratorTests.cpp
@@ -10,15 +10,10 @@
 #include <sstream>
 
 #include <boost/core/ignore_unused.hpp>
+#include <boost/filesystem.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 #include <boost/test/unit_test.hpp>
 
-#if defined(__ANDROID__)
-#define ARMNN_PROFILING_CONNECTION_TEST_DUMP_DIR "/data/local/tmp"
-#else
-#define ARMNN_PROFILING_CONNECTION_TEST_DUMP_DIR "/tmp"
-#endif
-
 using namespace armnn::profiling;
 
 namespace
@@ -101,10 +96,11 @@ BOOST_AUTO_TEST_CASE(DumpIncomingInvalidFileIgnoreErrors)
 
 BOOST_AUTO_TEST_CASE(DumpIncomingValidFile)
 {
-    std::stringstream fileName;
-    fileName << ARMNN_PROFILING_CONNECTION_TEST_DUMP_DIR << "/test_dump_file_incoming.dat";
+    boost::filesystem::path fileName =
+        boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
+
     armnn::Runtime::CreationOptions::ExternalProfilingOptions options;
-    options.m_IncomingCaptureFile = fileName.str();
+    options.m_IncomingCaptureFile = fileName.c_str();
     options.m_OutgoingCaptureFile =  "";
 
     ProfilingConnectionDumpToFileDecorator decorator(std::make_unique<DummyProfilingConnection>(), options, false);
@@ -148,12 +144,12 @@ BOOST_AUTO_TEST_CASE(DumpOutgoingInvalidFileIgnoreErrors)
 
 BOOST_AUTO_TEST_CASE(DumpOutgoingValidFile)
 {
-    std::stringstream fileName;
-    fileName << ARMNN_PROFILING_CONNECTION_TEST_DUMP_DIR << "/test_dump_file.dat";
+    boost::filesystem::path fileName =
+        boost::filesystem::temp_directory_path() / boost::filesystem::unique_path();
 
     armnn::Runtime::CreationOptions::ExternalProfilingOptions options;
     options.m_IncomingCaptureFile = "";
-    options.m_OutgoingCaptureFile = fileName.str();
+    options.m_OutgoingCaptureFile = fileName.c_str();
 
     ProfilingConnectionDumpToFileDecorator decorator(std::make_unique<DummyProfilingConnection>(), options, false);
 
-- 
cgit v1.2.1