OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change OrderMap to more closely resemble std::map

Browse Source 
- Removed the hasKey() and get() methods.
 - Key type is a template parameter
 - insert takes a pair
 - implement count()
 - implement find()
 - implement operator[]
 - implement erase
This commit is contained in:
Joakim Hove
2019-03-08 09:00:36 +01:00
parent 3542d43c72
commit f80b220b44
10 changed files with 185 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
tests/parser/OrderedMapTests.cpp
View File

@@ -29,47 +29,90 @@
BOOST_AUTO_TEST_CASE( check_empty) {
Opm::OrderedMap<std::string> map;
Opm::OrderedMap<std::string, std::string> map;
BOOST_CHECK_EQUAL( 0U , map.size() );
BOOST_CHECK( !map.hasKey("KEY"));
BOOST_CHECK_THROW( map.get( 0 ) , std::invalid_argument);
BOOST_CHECK_THROW( map.iget( 0 ) , std::invalid_argument);
BOOST_CHECK_THROW( map.get( "KEY" ) , std::invalid_argument);
BOOST_CHECK_THROW( map.at("KEY"), std::invalid_argument);
BOOST_CHECK_THROW( map.at(0), std::invalid_argument);
BOOST_CHECK_EQUAL( map.count("NO_SUCH_KEY"), 0);
}
BOOST_AUTO_TEST_CASE( operator_square ) {
Opm::OrderedMap<std::string, std::string> map;
map.insert(std::make_pair("CKEY1" , "Value1"));
map.insert(std::make_pair("BKEY2" , "Value2"));
map.insert(std::make_pair("AKEY3" , "Value3"));
const auto& value = map["CKEY1"];
BOOST_CHECK_EQUAL( value, std::string("Value1"));
BOOST_CHECK_EQUAL( map.size(), 3);
auto& new_value = map["NEW_KEY"];
BOOST_CHECK_EQUAL( map.size(), 4);
BOOST_CHECK_EQUAL( new_value, "");
}
BOOST_AUTO_TEST_CASE( find ) {
Opm::OrderedMap<std::string, std::string> map;
map.insert(std::make_pair("CKEY1" , "Value1"));
map.insert(std::make_pair("BKEY2" , "Value2"));
map.insert(std::make_pair("AKEY3" , "Value3"));
auto iter_end = map.find("NO_SUCH_KEY");
BOOST_CHECK( iter_end == map.end());
auto iter_found = map.find("CKEY1");
BOOST_CHECK_EQUAL( iter_found->first, std::string("CKEY1"));
BOOST_CHECK_EQUAL( iter_found->second, std::string("Value1"));
}
BOOST_AUTO_TEST_CASE( check_order ) {
Opm::OrderedMap<std::string> map;
map.insert("CKEY1" , "Value1");
map.insert("BKEY2" , "Value2");
map.insert("AKEY3" , "Value3");
Opm::OrderedMap<std::string, std::string> map;
map.insert(std::make_pair("CKEY1" , "Value1"));
map.insert(std::make_pair("BKEY2" , "Value2"));
map.insert(std::make_pair("AKEY3" , "Value3"));
BOOST_CHECK_EQUAL( 3U , map.size() );
BOOST_CHECK( map.hasKey("CKEY1"));
BOOST_CHECK( map.hasKey("BKEY2"));
BOOST_CHECK( map.hasKey("AKEY3"));
BOOST_CHECK( map.count("CKEY1") > 0);
BOOST_CHECK( map.count("BKEY2") > 0);
BOOST_CHECK( map.count("AKEY3") > 0);
BOOST_CHECK_EQUAL( "Value1" , map.get("CKEY1"));
BOOST_CHECK_EQUAL( "Value1" , map.get( 0 ));
BOOST_CHECK_EQUAL( "Value1" , map.iget( 0 ));
BOOST_CHECK_EQUAL( map.count("CKEY"), 0);
BOOST_CHECK_EQUAL( "Value2" , map.get("BKEY2"));
BOOST_CHECK_EQUAL( "Value2" , map.get( 1 ));
BOOST_CHECK_EQUAL( "Value2" , map.iget( 1 ));
BOOST_CHECK_EQUAL( "Value3" , map.at("AKEY3"));
BOOST_CHECK_EQUAL( "Value3" , map.at( 2 ));
map.insert( "CKEY1" , "NewValue1");
map.insert( std::make_pair("CKEY1" , "NewValue1"));
BOOST_CHECK_EQUAL( "NewValue1" , map.get("CKEY1"));
BOOST_CHECK_EQUAL( "NewValue1" , map.get( 0 ));
BOOST_CHECK_EQUAL( "NewValue1" , map.iget( 0 ));
{
std::vector<std::string> values;
for (auto iter = map.begin(); iter != map.end(); ++iter)
values.push_back( *iter );
values.push_back( iter->second );
BOOST_CHECK_EQUAL( values[0] , "NewValue1");
BOOST_CHECK_EQUAL( values[1] , "Value2");
BOOST_CHECK_EQUAL( values[2] , "Value3");
}
BOOST_CHECK_EQUAL(map.erase("NO_SUCH_KEY"), 0);
BOOST_CHECK_EQUAL(map.erase("BKEY2"), 1);
/*
BOOST_CHECK_EQUAL( "NewValue1" , map.get("CKEY1"));
BOOST_CHECK_EQUAL( "NewValue1" , map.iget( 0 ));
BOOST_CHECK_EQUAL( map.count("CKEY"), 0);
BOOST_CHECK_EQUAL( "Value3" , map.at("AKEY3"));
BOOST_CHECK_EQUAL( "Value3" , map.at( 1 ));
*/
}