X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tests%2Fzypp%2Fbase%2FGlob_test.cc;h=064159dcec51f127b86eb3f5807e478391aece4d;hb=42b5d038414cf4a4a050e816b471f890b24e8032;hp=f0d338d64482d8a22850f5bccde0d98a5f3e86be;hpb=b61a0ff7e76a542a874714e4ee7753db48f9f8aa;p=platform%2Fupstream%2Flibzypp.git diff --git a/tests/zypp/base/Glob_test.cc b/tests/zypp/base/Glob_test.cc index f0d338d..064159d 100644 --- a/tests/zypp/base/Glob_test.cc +++ b/tests/zypp/base/Glob_test.cc @@ -24,11 +24,11 @@ BOOST_AUTO_TEST_CASE(Glob_default) BOOST_CHECK_NE( q.begin(), q.end() ); BOOST_CHECK_EQUAL( *q.begin(), TEST_ROOT/"file" ); - q.reset( Glob::_BRACE ); + q.reset( Glob::kBrace ); BOOST_CHECK( q.empty() ); BOOST_CHECK( q.size() == 0 ); BOOST_CHECK_EQUAL( q.begin(), q.end() ); - BOOST_CHECK( q.defaultFlags() == Glob::_BRACE ); + BOOST_CHECK( q.defaultFlags() == Glob::kBrace ); q.add( TEST_ROOT/"file*" ); BOOST_CHECK( q.size() == 3 ); @@ -36,13 +36,13 @@ BOOST_AUTO_TEST_CASE(Glob_default) q.add( TEST_ROOT/"*{.xml,.xml.gz}" ); BOOST_CHECK( q.size() == 5 ); - q.clear(); // no flags reset: Glob::_BRACE active + q.clear(); // no flags reset: Glob::kBrace active BOOST_CHECK( q.size() == 0 ); q.add( TEST_ROOT/"*{.xml,.xml.gz}" ); BOOST_CHECK( q.size() == 2 ); - q.reset(); // flags reset: Glob::_BRACE off + q.reset(); // flags reset: Glob::kBrace off BOOST_CHECK( q.size() == 0 ); q.add( TEST_ROOT/"*{.xml,.xml.gz}" ); @@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE(Glob_default) BOOST_AUTO_TEST_CASE(Glob_static) { std::set q; - Glob::collect( TEST_ROOT/"*{.xml,.xml.gz}", Glob::_BRACE, std::inserter( q, q.begin() ) ); + Glob::collect( TEST_ROOT/"*{.xml,.xml.gz}", Glob::kBrace, std::inserter( q, q.begin() ) ); BOOST_REQUIRE( q.size() == 2 ); BOOST_CHECK_EQUAL( *q.begin(), TEST_ROOT/"file.xml" ); BOOST_CHECK_EQUAL( *++q.begin(), TEST_ROOT/"file.xml.gz" );