From 8ab540a511481e83c8db435c439e291d0f3e52ea Mon Sep 17 00:00:00 2001 From: JINMEI Tatuya Date: Fri, 30 Nov 2012 13:41:01 -0800 Subject: [PATCH] [2497] constify --- src/lib/dns/tests/rdata_naptr_unittest.cc | 2 +- src/lib/dns/tests/rdata_rrsig_unittest.cc | 15 ++++++++------- src/lib/dns/tests/rdata_unittest.cc | 2 +- src/lib/dns/tests/rrparamregistry_unittest.cc | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/lib/dns/tests/rdata_naptr_unittest.cc b/src/lib/dns/tests/rdata_naptr_unittest.cc index e23fbcab15..fed98cbda8 100644 --- a/src/lib/dns/tests/rdata_naptr_unittest.cc +++ b/src/lib/dns/tests/rdata_naptr_unittest.cc @@ -129,7 +129,7 @@ TEST_F(Rdata_NAPTR_Test, createFromWire) { } TEST_F(Rdata_NAPTR_Test, createFromLexer) { - NAPTR rdata_naptr(naptr_str); + const NAPTR rdata_naptr(naptr_str); EXPECT_EQ(0, rdata_naptr.compare( *test::createRdataUsingLexer(RRType::NAPTR(), RRClass::IN(), diff --git a/src/lib/dns/tests/rdata_rrsig_unittest.cc b/src/lib/dns/tests/rdata_rrsig_unittest.cc index 726fc535df..d758ff390b 100644 --- a/src/lib/dns/tests/rdata_rrsig_unittest.cc +++ b/src/lib/dns/tests/rdata_rrsig_unittest.cc @@ -46,8 +46,8 @@ public: rdata_rrsig(rrsig_txt) {} - string rrsig_txt; - generic::RRSIG rdata_rrsig; + const string rrsig_txt; + const generic::RRSIG rdata_rrsig; }; TEST_F(Rdata_RRSIG_Test, fromText) { @@ -122,14 +122,15 @@ TEST_F(Rdata_RRSIG_Test, toWireBuffer) { } TEST_F(Rdata_RRSIG_Test, createFromWire) { - string rrsig_txt2("A 5 2 43200 20100327070149 20100225070149 2658 isc.org. " - "HkJk/xZTvzePU8NENl/ley8bbUumhk1hXciyqhLnz1VQFzkDooej6neX" - "ZgWZzQKeTKPOYWrnYtdZW4PnPQFeUl3orgLev7F8J6FZlDn0y/J/ThR5" - "m36Mo2/Gdxjj8lJ/IjPVkdpKyBpcnYND8KEIma5MyNCNeyO1UkfPQZGHNSQ="); + const string rrsig_txt2( + "A 5 2 43200 20100327070149 20100225070149 2658 isc.org. " + "HkJk/xZTvzePU8NENl/ley8bbUumhk1hXciyqhLnz1VQFzkDooej6neX" + "ZgWZzQKeTKPOYWrnYtdZW4PnPQFeUl3orgLev7F8J6FZlDn0y/J/ThR5" + "m36Mo2/Gdxjj8lJ/IjPVkdpKyBpcnYND8KEIma5MyNCNeyO1UkfPQZGHNSQ="); EXPECT_EQ(rrsig_txt2, rdataFactoryFromFile(RRType("RRSIG"), RRClass("IN"), "rdata_rrsig_fromWire1")->toText()); - generic::RRSIG rdata_rrsig2(rrsig_txt2); + const generic::RRSIG rdata_rrsig2(rrsig_txt2); EXPECT_EQ(0, rdata_rrsig2.compare( *rdataFactoryFromFile(RRType("RRSIG"), RRClass("IN"), "rdata_rrsig_fromWire1"))); diff --git a/src/lib/dns/tests/rdata_unittest.cc b/src/lib/dns/tests/rdata_unittest.cc index 984289c773..bc91f7ad0d 100644 --- a/src/lib/dns/tests/rdata_unittest.cc +++ b/src/lib/dns/tests/rdata_unittest.cc @@ -74,7 +74,7 @@ createRdataUsingLexer(const RRType& rrtype, const RRClass& rrclass, const MasterLoaderCallbacks::IssueCallback callback (boost::bind(&dummyCallback, _1, _2, _3)); MasterLoaderCallbacks callbacks(callback, callback); - Name origin("example.org."); + const Name origin("example.org."); return (createRdata(rrtype, rrclass, lexer, &origin, MasterLoader::MANY_ERRORS, callbacks)); diff --git a/src/lib/dns/tests/rrparamregistry_unittest.cc b/src/lib/dns/tests/rrparamregistry_unittest.cc index b749d74db7..0ae0a762c6 100644 --- a/src/lib/dns/tests/rrparamregistry_unittest.cc +++ b/src/lib/dns/tests/rrparamregistry_unittest.cc @@ -172,7 +172,7 @@ createRdataHelper(const std::string& str) { const MasterLoaderCallbacks::IssueCallback callback (boost::bind(&dummyCallback, _1, _2, _3)); MasterLoaderCallbacks callbacks(callback, callback); - Name origin("example.org."); + const Name origin("example.org."); return (rdf->create(lexer, &origin, MasterLoader::MANY_ERRORS,