[2522] a couple more TSIG and SSHFP unit tests

diff --git a/src/lib/dns/tests/rdata_sshfp_unittest.cc b/src/lib/dns/tests/rdata_sshfp_unittest.cc
index c900367a60b6763b739c656a7445767b79119129..7df24d5637d9064548ccbbf645498e3e0fe34629 100644 (file)
--- a/src/lib/dns/tests/rdata_sshfp_unittest.cc
+++ b/src/lib/dns/tests/rdata_sshfp_unittest.cc
@@ -155,6 +155,9 @@ TEST_F(Rdata_SSHFP_Test, badText) {
 TEST_F(Rdata_SSHFP_Test, copy) {
     const generic::SSHFP rdata_sshfp2(rdata_sshfp);
     EXPECT_EQ(0, rdata_sshfp.compare(rdata_sshfp2));
+
+    const generic::SSHFP rdata_sshfp3 = rdata_sshfp;
+    EXPECT_EQ(0, rdata_sshfp.compare(rdata_sshfp3));
 }
 
 TEST_F(Rdata_SSHFP_Test, createFromWire) {

diff --git a/src/lib/dns/tests/rdata_tsig_unittest.cc b/src/lib/dns/tests/rdata_tsig_unittest.cc
index 8e91c142c48473c5fb9dfefcd973e3cb72435183..d351b40e5f363b632f15bc0e3151c450ba2237e5 100644 (file)
--- a/src/lib/dns/tests/rdata_tsig_unittest.cc
+++ b/src/lib/dns/tests/rdata_tsig_unittest.cc
@@ -60,6 +60,11 @@ protected:
         rdata_tsig(valid_text1)
     {}
 
+    void checkFromText_None(const string& rdata_str) {
+        checkFromText<any::TSIG, isc::Exception, isc::Exception>(
+            rdata_str, rdata_tsig, false, false);
+    }
+
     void checkFromText_InvalidText(const string& rdata_str) {
         checkFromText<any::TSIG, InvalidRdataText, InvalidRdataText>(
             rdata_str, rdata_tsig, true, true);
@@ -112,7 +117,7 @@ TEST_F(Rdata_TSIG_Test, fromText) {
     EXPECT_EQ(0, rdata_tsig.getMACSize());
     EXPECT_EQ(static_cast<void*>(NULL), rdata_tsig.getMAC());
     EXPECT_EQ(16020, rdata_tsig.getOriginalID());
-    EXPECT_EQ(17, rdata_tsig.getError()); // TODO: use constant
+    EXPECT_EQ(TSIGError::BAD_KEY_CODE, rdata_tsig.getError());
     EXPECT_EQ(0, rdata_tsig.getOtherLen());
     EXPECT_EQ(static_cast<void*>(NULL), rdata_tsig.getOtherData());
 
@@ -134,7 +139,11 @@ TEST_F(Rdata_TSIG_Test, fromText) {
     any::TSIG tsig1("hmac-md5.sig-alg.reg.int 1286779327 300 "
                     "0 16020 BADKEY 0");
     EXPECT_EQ(0, tsig1.compare(rdata_tsig));
-}
+
+    // multi-line rdata
+    checkFromText_None("hmac-md5.sig-alg.reg.int. ( 1286779327 300 \n"
+                       "0 16020 BADKEY 0 )");
+};
 
 TEST_F(Rdata_TSIG_Test, badText) {
     // too many fields