From 3be685dbc9d49b0529c8bfc881842ef715e9e855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eberhard=20Gr=C3=A4ther?= Date: Wed, 12 Feb 2020 23:29:51 +0100 Subject: [PATCH] test: Fixed test code causing exceptions in FilePath::exists() (#921) --- src/test/helper/TestIntermediateStorage.h | 26 +++++++++-------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/test/helper/TestIntermediateStorage.h b/src/test/helper/TestIntermediateStorage.h index ed54d749..7d3e6831 100644 --- a/src/test/helper/TestIntermediateStorage.h +++ b/src/test/helper/TestIntermediateStorage.h @@ -112,10 +112,16 @@ public: } std::map nodesMap; + std::set fileIdMap; for (const StorageNode& node: getStorageNodes()) { nodesMap.emplace(node.id, node); + if (NodeType::intToType(node.type) == NodeType::NODE_FILE) + { + fileIdMap.insert(node.id); + } + std::wstring nameStr = NameHierarchy::deserialize(node.serializedName).getQualifiedNameWithSignature(); @@ -217,28 +223,16 @@ public: { std::wstring sourceName = NameHierarchy::deserialize(source.serializedName).getQualifiedNameWithSignature(); - try - { - if (FilePath(sourceName).exists()) - { - sourceName = FilePath(sourceName).fileName(); - } - } - catch (const boost::filesystem::filesystem_error&) + if (fileIdMap.find(edge.sourceNodeId) != fileIdMap.end() && FilePath(sourceName).exists()) { + sourceName = FilePath(sourceName).fileName(); } std::wstring targetName = NameHierarchy::deserialize(target.serializedName).getQualifiedNameWithSignature(); - try - { - if (FilePath(targetName).exists()) - { - targetName = FilePath(targetName).fileName(); - } - } - catch (const boost::filesystem::filesystem_error&) + if (fileIdMap.find(edge.targetNodeId) != fileIdMap.end() && FilePath(targetName).exists()) { + targetName = FilePath(targetName).fileName(); } std::wstring nameStr = sourceName + L" -> " + targetName;