BIND 10 trac2108_3, updated. 0a9b4b2a90c9021bb875ace73a82b5507d92f08a [2108] Rename tests

[BIND 10 source code commits]

The branch, trac2108_3 has been updated
       via  0a9b4b2a90c9021bb875ace73a82b5507d92f08a (commit)
       via  caf572ed4757d33ee4b849de2a4745dcbe04dc66 (commit)
      from  f476f78a1e47392cb1b2b95c7d1d424b099bea95 (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 0a9b4b2a90c9021bb875ace73a82b5507d92f08a
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Sep 7 10:52:15 2012 +0530

    [2108] Rename tests

commit caf572ed4757d33ee4b849de2a4745dcbe04dc66
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Sep 7 10:51:28 2012 +0530

    [2108] NSEC3/NSEC3PARAM RRs with multiple RDATA should throw

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

Summary of changes:
 .../datasrc/memory/tests/memory_client_unittest.cc |   22 ++++++++++++++++++--
 src/lib/datasrc/memory/tests/testdata/Makefile.am  |    2 ++
 .../tests/testdata/example.org-multiple-nsec3.zone |    3 +++
 .../testdata/example.org-multiple-nsec3param.zone  |    3 +++
 4 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 src/lib/datasrc/memory/tests/testdata/example.org-multiple-nsec3.zone
 create mode 100644 src/lib/datasrc/memory/tests/testdata/example.org-multiple-nsec3param.zone

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/tests/memory_client_unittest.cc b/src/lib/datasrc/memory/tests/memory_client_unittest.cc
index 1e5b7dc..fb9d339 100644
--- a/src/lib/datasrc/memory/tests/memory_client_unittest.cc
+++ b/src/lib/datasrc/memory/tests/memory_client_unittest.cc
@@ -245,7 +245,7 @@ TEST_F(MemoryClientTest, loadDuplicateType) {
     // Teardown checks for memory segment leaks
 }
 
-TEST_F(MemoryClientTest, loadMultipleCNAME) {
+TEST_F(MemoryClientTest, loadMultipleCNAMEThrows) {
     // Multiple CNAME RRs should throw.
     EXPECT_THROW(client_->load(Name("example.org"),
                                TEST_DATA_DIR
@@ -254,7 +254,7 @@ TEST_F(MemoryClientTest, loadMultipleCNAME) {
     // Teardown checks for memory segment leaks
 }
 
-TEST_F(MemoryClientTest, loadMultipleDNAME) {
+TEST_F(MemoryClientTest, loadMultipleDNAMEThrows) {
     // Multiple DNAME RRs should throw.
     EXPECT_THROW(client_->load(Name("example.org"),
                                TEST_DATA_DIR
@@ -263,6 +263,24 @@ TEST_F(MemoryClientTest, loadMultipleDNAME) {
     // Teardown checks for memory segment leaks
 }
 
+TEST_F(MemoryClientTest, loadMultipleNSEC3Throws) {
+    // Multiple NSEC3 RRs should throw.
+    EXPECT_THROW(client_->load(Name("example.org"),
+                               TEST_DATA_DIR
+                               "/example.org-multiple-nsec3.zone"),
+                 InMemoryClient::AddError);
+    // Teardown checks for memory segment leaks
+}
+
+TEST_F(MemoryClientTest, loadMultipleNSEC3PARAMThrows) {
+    // Multiple NSEC3PARAM RRs should throw.
+    EXPECT_THROW(client_->load(Name("example.org"),
+                               TEST_DATA_DIR
+                               "/example.org-multiple-nsec3param.zone"),
+                 InMemoryClient::AddError);
+    // Teardown checks for memory segment leaks
+}
+
 TEST_F(MemoryClientTest, loadRRSIGFollowsNothing) {
     EXPECT_THROW(client_->load(Name("example.org"),
                                TEST_DATA_DIR
diff --git a/src/lib/datasrc/memory/tests/testdata/Makefile.am b/src/lib/datasrc/memory/tests/testdata/Makefile.am
index b13f094..d523972 100644
--- a/src/lib/datasrc/memory/tests/testdata/Makefile.am
+++ b/src/lib/datasrc/memory/tests/testdata/Makefile.am
@@ -13,5 +13,7 @@ EXTRA_DIST += example.org-duplicate-type.zone
 EXTRA_DIST += example.org-duplicate-type-bad.zone
 EXTRA_DIST += example.org-multiple-cname.zone
 EXTRA_DIST += example.org-multiple-dname.zone
+EXTRA_DIST += example.org-multiple-nsec3.zone
+EXTRA_DIST += example.org-multiple-nsec3param.zone
 EXTRA_DIST += example.org-nsec3-signed.zone
 EXTRA_DIST += example.org-nsec3-signed-no-param.zone
diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-multiple-nsec3.zone b/src/lib/datasrc/memory/tests/testdata/example.org-multiple-nsec3.zone
new file mode 100644
index 0000000..874023a
--- /dev/null
+++ b/src/lib/datasrc/memory/tests/testdata/example.org-multiple-nsec3.zone
@@ -0,0 +1,3 @@
+example.org.				      86400 IN SOA	ns.example.org. ns.example.org. 2012090702 7200 3600 2592000 1200
+09GM5T42SMIMT7R8DF6RTG80SFMS1NLU.example.org. 1200 IN NSEC3	1 0 10 AABBCCDD RKOF8QMFRB5F2V9EJHFBVB2JPVSA0DJD A RRSIG
+09GM5T42SMIMT7R8DF6RTG80SFMS1NLU.example.org. 1200 IN NSEC3	1 0 10 AABBCCDD 09GM5T42SMIMT7R8DF6RTG80SFMS1NLU NS SOA RRSIG DNSKEY NSEC3PARAM
diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-multiple-nsec3param.zone b/src/lib/datasrc/memory/tests/testdata/example.org-multiple-nsec3param.zone
new file mode 100644
index 0000000..5e69518
--- /dev/null
+++ b/src/lib/datasrc/memory/tests/testdata/example.org-multiple-nsec3param.zone
@@ -0,0 +1,3 @@
+example.org.				      86400 IN SOA	ns.example.org. ns.example.org. 2012090700 7200 3600 2592000 1200
+example.org.				      0	IN NSEC3PARAM	1 0 10 AABBCCDD
+example.org.				      0	IN NSEC3PARAM	1 0 10 AABBCCDD