[2390] Use createNameFromLexer()

Also fix tests to use absolute names.

diff --git a/src/lib/dns/rdata/generic/mx_15.cc b/src/lib/dns/rdata/generic/mx_15.cc
index 48e4c26afc77bc6c35a91c5d0160a36ad28fea2e..32c01f3d9e017744e209797779c782259375017e 100644 (file)
--- a/src/lib/dns/rdata/generic/mx_15.cc
+++ b/src/lib/dns/rdata/generic/mx_15.cc
@@ -26,6 +26,8 @@
 #include <dns/rdata.h>
 #include <dns/rdataclass.h>
 
+#include <dns/rdata/generic/detail/lexer_util.h>
+
 using namespace std;
 using boost::lexical_cast;
 using namespace isc::util;
@@ -57,17 +59,17 @@ MX::MX(const std::string& mx_str) :
     mxname_ = Name(mxname);
 }
 
-MX::MX(MasterLexer& lexer, const Name*, MasterLoader::Options,
-       MasterLoaderCallbacks&) :
+MX::MX(MasterLexer& lexer, const Name* origin,
+       MasterLoader::Options, MasterLoaderCallbacks&) :
     preference_(0), mxname_(".")
 {
     uint32_t num = lexer.getNextToken(MasterToken::NUMBER).getNumber();
     if (num > 65535) {
         isc_throw(InvalidRdataText, "Invalid MX preference");
     }
-
     preference_ = static_cast<uint16_t>(num);
-    mxname_ = Name(lexer.getNextToken(MasterToken::QSTRING).getString());
+
+    mxname_ = createNameFromLexer(lexer, origin);
 }
 
 MX::MX(uint16_t preference, const Name& mxname) :

diff --git a/src/lib/dns/rdata/generic/ns_2.cc b/src/lib/dns/rdata/generic/ns_2.cc
index a6891fe29745f640913f19aa7d518511990bc344..96d5704330c0e8d07775dea04e637fadc756d676 100644 (file)
--- a/src/lib/dns/rdata/generic/ns_2.cc
+++ b/src/lib/dns/rdata/generic/ns_2.cc
@@ -22,6 +22,8 @@
 #include <dns/rdata.h>
 #include <dns/rdataclass.h>
 
+#include <dns/rdata/generic/detail/lexer_util.h>
+
 using namespace std;
 using namespace isc::util;
 
@@ -39,9 +41,9 @@ NS::NS(InputBuffer& buffer, size_t) :
     // check consistency.
 }
 
-NS::NS(MasterLexer& lexer, const Name*, MasterLoader::Options,
-       MasterLoaderCallbacks&) :
-    nsname_(lexer.getNextToken(MasterToken::QSTRING).getString())
+NS::NS(MasterLexer& lexer, const Name* origin,
+       MasterLoader::Options, MasterLoaderCallbacks&) :
+    nsname_(createNameFromLexer(lexer, origin))
 {}
 
 NS::NS(const NS& other) :

diff --git a/src/lib/dns/rdata/generic/ptr_12.cc b/src/lib/dns/rdata/generic/ptr_12.cc
index 6b47d0678b643df3bee1b09687ef2b16b26d0b1b..6a3cefacefc08622acc51bb9b02398afb4a32397 100644 (file)
--- a/src/lib/dns/rdata/generic/ptr_12.cc
+++ b/src/lib/dns/rdata/generic/ptr_12.cc
@@ -39,9 +39,9 @@ PTR::PTR(InputBuffer& buffer, size_t) :
     // check consistency.
 }
 
-PTR::PTR(MasterLexer& lexer, const Name*, MasterLoader::Options,
-         MasterLoaderCallbacks&) :
-    ptr_name_(lexer.getNextToken(MasterToken::QSTRING).getString())
+PTR::PTR(MasterLexer& lexer, const Name* origin,
+         MasterLoader::Options, MasterLoaderCallbacks&) :
+    ptr_name_(createNameFromLexer(lexer, origin))
 {}
 
 PTR::PTR(const PTR& source) :

diff --git a/src/lib/dns/tests/rdata_mx_unittest.cc b/src/lib/dns/tests/rdata_mx_unittest.cc
index 7eba588d7d4bf326b7b28153dc1ace117db0372e..59639444a709b11907274e0fe22f1e7b60859f29 100644 (file)
--- a/src/lib/dns/tests/rdata_mx_unittest.cc
+++ b/src/lib/dns/tests/rdata_mx_unittest.cc
@@ -65,15 +65,15 @@ TEST_F(Rdata_MX_Test, createFromWire) {
 TEST_F(Rdata_MX_Test, createFromLexer) {
     EXPECT_EQ(0, rdata_mx.compare(
         *test::createRdataUsingLexer(RRType::MX(), RRClass::IN(),
-                                     "10 mx.example.com")));
+                                     "10 mx.example.com.")));
 
     // Exceptions cause NULL to be returned.
     EXPECT_FALSE(test::createRdataUsingLexer(RRType::MX(), RRClass::IN(),
-                                             "10 mx. example.com"));
+                                             "10 mx. example.com."));
 
     // 65536 is larger than maximum possible preference
     EXPECT_FALSE(test::createRdataUsingLexer(RRType::MX(), RRClass::IN(),
-                                             "65536 mx.example.com"));
+                                             "65536 mx.example.com."));
 }
 
 TEST_F(Rdata_MX_Test, toWireRenderer) {

diff --git a/src/lib/dns/tests/rdata_ns_unittest.cc b/src/lib/dns/tests/rdata_ns_unittest.cc
index d53639308346a959b4ff3408e10547563a2a8d3e..8ec2a2bd5ca0f0389327dc73baeea39db104c2ba 100644 (file)
--- a/src/lib/dns/tests/rdata_ns_unittest.cc
+++ b/src/lib/dns/tests/rdata_ns_unittest.cc
@@ -89,7 +89,7 @@ TEST_F(Rdata_NS_Test, createFromWire) {
 TEST_F(Rdata_NS_Test, createFromLexer) {
     EXPECT_EQ(0, rdata_ns.compare(
         *test::createRdataUsingLexer(RRType::NS(), RRClass::IN(),
-                                     "ns.example.com")));
+                                     "ns.example.com.")));
 
     // Exceptions cause NULL to be returned.
     EXPECT_FALSE(test::createRdataUsingLexer(RRType::NS(), RRClass::IN(),

diff --git a/src/lib/dns/tests/rdata_ptr_unittest.cc b/src/lib/dns/tests/rdata_ptr_unittest.cc
index 44b849a933fb48f01a26b2479cba1147bf58b458..cecbdd341a19c41f2a7572e8a59ff8418affa038 100644 (file)
--- a/src/lib/dns/tests/rdata_ptr_unittest.cc
+++ b/src/lib/dns/tests/rdata_ptr_unittest.cc
@@ -93,7 +93,7 @@ TEST_F(Rdata_PTR_Test, createFromWire) {
 TEST_F(Rdata_PTR_Test, createFromLexer) {
     EXPECT_EQ(0, rdata_ptr.compare(
         *test::createRdataUsingLexer(RRType::PTR(), RRClass::IN(),
-                                     "ns.example.com")));
+                                     "ns.example.com.")));
 }
 
 TEST_F(Rdata_PTR_Test, toWireBuffer) {