BIND 10 trac2387, updated. 6fc763dca0e5c617de20cf49353364219987db63 [2387] Remove duplicate testcase

[BIND 10 source code commits]

The branch, trac2387 has been updated
       via  6fc763dca0e5c617de20cf49353364219987db63 (commit)
       via  bbed8c3d28fb5a8cecd3c6d2682a8fa4b01c6566 (commit)
       via  55fe56a1ce1c5bb0c359942f37d912a18041a2ba (commit)
       via  23eca85ebf0a8a6f749984504cba553e2c4d38e8 (commit)
      from  09ed404f9b47807c74e0c6e59077e95a7b28b953 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6fc763dca0e5c617de20cf49353364219987db63
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu Mar 14 08:36:44 2013 +0530

    [2387] Remove duplicate testcase

commit bbed8c3d28fb5a8cecd3c6d2682a8fa4b01c6566
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu Mar 14 08:36:24 2013 +0530

    [2387] Use valid Base64 encoding in test

commit 55fe56a1ce1c5bb0c359942f37d912a18041a2ba
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu Mar 14 08:26:01 2013 +0530

    [2387] Remove duplicate # in front of ticket numbers

commit 23eca85ebf0a8a6f749984504cba553e2c4d38e8
Author: Mukund Sivaraman <muks at isc.org>
Date:   Thu Mar 14 08:23:14 2013 +0530

    [2387] Change code to use a reference instead

-----------------------------------------------------------------------

Summary of changes:
 src/lib/dns/rdata/generic/nsec3_50.cc      |    5 +++--
 src/lib/dns/tests/masterload_unittest.cc   |    8 ++++----
 src/lib/dns/tests/rdata_dnskey_unittest.cc |    9 +--------
 3 files changed, 8 insertions(+), 14 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dns/rdata/generic/nsec3_50.cc b/src/lib/dns/rdata/generic/nsec3_50.cc
index 60d7e73..c66f09d 100644
--- a/src/lib/dns/rdata/generic/nsec3_50.cc
+++ b/src/lib/dns/rdata/generic/nsec3_50.cc
@@ -137,7 +137,8 @@ NSEC3::constructFromLexer(MasterLexer& lexer) {
     const ParseNSEC3ParamResult params =
         parseNSEC3ParamFromLexer("NSEC3", lexer, salt);
 
-    const string nexthash = lexer.getNextToken(MasterToken::STRING).getString();
+    const string& nexthash =
+        lexer.getNextToken(MasterToken::STRING).getString();
     if (*nexthash.rbegin() == '=') {
         isc_throw(InvalidRdataText, "NSEC3 hash has padding: " << nexthash);
     }
@@ -151,7 +152,7 @@ NSEC3::constructFromLexer(MasterLexer& lexer) {
 
     // For NSEC3 empty bitmap is possible and allowed.
     bool empty_bitmap = false;
-    const MasterToken token = lexer.getNextToken();
+    const MasterToken& token = lexer.getNextToken();
     if ((token.getType() == MasterToken::END_OF_LINE) ||
         (token.getType() == MasterToken::END_OF_FILE)) {
          empty_bitmap = true;
diff --git a/src/lib/dns/tests/masterload_unittest.cc b/src/lib/dns/tests/masterload_unittest.cc
index c0f5d61..dfd901a 100644
--- a/src/lib/dns/tests/masterload_unittest.cc
+++ b/src/lib/dns/tests/masterload_unittest.cc
@@ -170,7 +170,7 @@ TEST_F(MasterLoadTest, loadRRsigs) {
 // This test was disabled by #2387, because the test data has trailing
 // comments and it (eventually) uses the string RDATA constructor which
 // doesn't support them. This test should be fixed and re-enabled by
-// ##2381, or deleted.
+// #2381, or deleted.
 TEST_F(MasterLoadTest, DISABLED_loadRRWithComment) {
     // Comment at the end of line should be ignored and the RR should be
     // accepted.
@@ -187,7 +187,7 @@ TEST_F(MasterLoadTest, DISABLED_loadRRWithComment) {
 // This test was disabled by #2387, because the test data has trailing
 // comments and it (eventually) uses the string RDATA constructor which
 // doesn't support them. This test should be fixed and re-enabled by
-// ##2381, or deleted.
+// #2381, or deleted.
 TEST_F(MasterLoadTest, DISABLED_loadRRWithCommentNoSpace) {
     // Similar to the previous one, but there's no space before comments.
     // It should still work.
@@ -204,7 +204,7 @@ TEST_F(MasterLoadTest, DISABLED_loadRRWithCommentNoSpace) {
 // This test was disabled by #2387, because the test data has trailing
 // comments and it (eventually) uses the string RDATA constructor which
 // doesn't support them. This test should be fixed and re-enabled by
-// ##2381, or deleted.
+// #2381, or deleted.
 TEST_F(MasterLoadTest, DISABLED_loadRRWithCommentEmptyComment) {
     // Similar to the previous one, but there's no data after the ;
     // It should still work.
@@ -221,7 +221,7 @@ TEST_F(MasterLoadTest, DISABLED_loadRRWithCommentEmptyComment) {
 // This test was disabled by #2387, because the test data has trailing
 // comments and it (eventually) uses the string RDATA constructor which
 // doesn't support them. This test should be fixed and re-enabled by
-// ##2381, or deleted.
+// #2381, or deleted.
 TEST_F(MasterLoadTest, DISABLED_loadRRWithCommentEmptyCommentNoSpace) {
     // Similar to the previous one, but there's no space before or after ;
     // It should still work.
diff --git a/src/lib/dns/tests/rdata_dnskey_unittest.cc b/src/lib/dns/tests/rdata_dnskey_unittest.cc
index 820a885..e511c77 100644
--- a/src/lib/dns/tests/rdata_dnskey_unittest.cc
+++ b/src/lib/dns/tests/rdata_dnskey_unittest.cc
@@ -76,14 +76,7 @@ TEST_F(Rdata_DNSKEY_Test, badText) {
                  InvalidRdataLength);
 
     // Missing algorithm
-    EXPECT_THROW(generic::DNSKEY("257 3 5BEAAEFTd"),
-                 InvalidRdataText);
-
-    // How about this?  It's even more confusing for the parser because
-    // it could be ambiguous '51 EAAA' vs '5 1EAA..'. But we first parse
-    // the other fields before we parse the public key, so we reject
-    // this.
-    EXPECT_THROW(generic::DNSKEY("257 3 51EAAEFTd"),
+    EXPECT_THROW(generic::DNSKEY("257 3 YmFiYWJhYmE="),
                  InvalidRdataText);
 }