From 63abc4f7114277ebc1a943b8c8e33a0f535c142a Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Tue, 28 Aug 2018 14:37:54 +0800 Subject: [PATCH] fix: csv path in a test --- src/tools.cpp | 6 ++++++ tests/mocks.h | 2 +- tests/txsearch_tests.cpp | 7 +++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/tools.cpp b/src/tools.cpp index 361f572..7f40808 100755 --- a/src/tools.cpp +++ b/src/tools.cpp @@ -1500,6 +1500,12 @@ populate_known_outputs_from_csv( std::ifstream input(csv_file); + if (!input.is_open()) + { + cerr << "Cant open: " << csv_file << '\n'; + return false; + } + string line; while(getline(input, line)) diff --git a/tests/mocks.h b/tests/mocks.h index 7de04ba..cee9a86 100644 --- a/tests/mocks.h +++ b/tests/mocks.h @@ -207,7 +207,7 @@ struct MockGettingOutputs // this is the mock version of CurrentBlockchainStatus::get_output_keys // which is going to return correct outputs // based on absolute_offsets - bool + virtual bool get_output_keys( const uint64_t& amount, const vector& absolute_offsets, diff --git a/tests/txsearch_tests.cpp b/tests/txsearch_tests.cpp index 03b2b39..9e4929a 100644 --- a/tests/txsearch_tests.cpp +++ b/tests/txsearch_tests.cpp @@ -161,8 +161,11 @@ TEST_F(OUTPUTIDENT_TEST, OutgingPreRingctTransaction) xmreg::TxSearch::known_outputs_t known_outputs; - xmreg::populate_known_outputs_from_csv( - known_outputs_csv_9wq792k, known_outputs); + if (!boost::filesystem::exists(known_outputs_csv_9wq792k)) + known_outputs_csv_9wq792k = "./tests/" + known_outputs_csv_9wq792k; + + ASSERT_TRUE(xmreg::populate_known_outputs_from_csv( + known_outputs_csv_9wq792k, known_outputs)); oi.identify_outputs(); oi.identify_inputs(known_outputs);