From b45df9d6a73d97671cbdd38d77e9b153a80fb458 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Tue, 5 May 2015 11:36:40 -0400 Subject: Tests: Add NodeResolver unittests Minor misc. NodeResolver cleanups Prefix faux content type constants for testing with t_ to avoid confusion or name collisions --- src/nodedef.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src/nodedef.cpp') diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 58566200e..48207da1f 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -1346,7 +1346,8 @@ void CNodeDefManager::runNodeResolveCallbacks() //// NodeResolver //// -NodeResolver::NodeResolver() { +NodeResolver::NodeResolver() +{ m_ndef = NULL; m_nodenames_idx = 0; m_nnlistsizes_idx = 0; @@ -1379,14 +1380,14 @@ void NodeResolver::nodeResolveInternal() const std::string &NodeResolver::getNodeName(content_t c) const { - if (m_nodenames.size() == 0) { + if (c < m_nodenames.size()) + return m_nodenames[c]; + + if (m_ndef) return m_ndef->get(c).name; - } else { - if (c < m_nodenames.size()) - return m_nodenames[c]; - else - return m_ndef->get(CONTENT_UNKNOWN).name; - } + + static const std::string unknown_str("unknown"); + return unknown_str; } @@ -1395,7 +1396,7 @@ bool NodeResolver::getIdFromNrBacklog(content_t *result_out, { if (m_nodenames_idx == m_nodenames.size()) { *result_out = c_fallback; - errorstream << "Resolver: no more nodes in list" << std::endl; + errorstream << "NodeResolver: no more nodes in list" << std::endl; return false; } -- cgit v1.2.3