From 8909791df194f8cb596ef617139ee57c0179e3da Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Tue, 11 Aug 2015 20:02:56 +0300 Subject: [PATCH] Fix tests and asserts --- generator/osm_source.cpp | 5 +++-- generator/xml_element.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/generator/osm_source.cpp b/generator/osm_source.cpp index b56dad0cdb..5c9ff74260 100644 --- a/generator/osm_source.cpp +++ b/generator/osm_source.cpp @@ -29,9 +29,10 @@ SourceReader::SourceReader() } SourceReader::SourceReader(string const & filename) -: m_file(unique_ptr(new ifstream(filename), Deleter())) { - CHECK(!m_filename.empty() , ("Filename can't be empty")); + CHECK(!filename.empty() , ("Filename can't be empty")); + m_file = unique_ptr(new ifstream(filename), Deleter()); + CHECK(static_cast(m_file.get())->is_open() , ("Can't open file:", filename)); LOG_SHORT(LINFO, ("Reading OSM data from", filename)); } diff --git a/generator/xml_element.cpp b/generator/xml_element.cpp index 70b5ca9b7d..07972865c0 100644 --- a/generator/xml_element.cpp +++ b/generator/xml_element.cpp @@ -106,7 +106,7 @@ void BaseOSMParser::AddAttr(string const & key, string const & value) bool BaseOSMParser::Push(string const & tagName) { - ASSERT_GREATER(tagName.size(), 2, ()); + ASSERT_GREATER_OR_EQUAL(tagName.size(), 2, ()); // As tagKey we use first two char of tag name. XMLElement::ETag tagKey = XMLElement::ETag(*reinterpret_cast(tagName.data()));