BIND 10 trac2108_3, updated. 90b10c0f2a7b7843ecc74961e1d8ee491df69d33 [2108] Add two more InMemoryClient unittests

[BIND 10 source code commits]

The branch, trac2108_3 has been updated
       via  90b10c0f2a7b7843ecc74961e1d8ee491df69d33 (commit)
       via  21ff0c5ddf62e42a6221a716ae0f79023301b71d (commit)
       via  42cd408242643ec58c3865fb1ad80a2c9340a874 (commit)
       via  b3310cab0f5e156a7cde66921b5151099346a366 (commit)
      from  0523c84f2a8a2e32fa5d831b32eec5a59325c119 (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 90b10c0f2a7b7843ecc74961e1d8ee491df69d33
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Sep 5 18:54:12 2012 +0530

    [2108] Add two more InMemoryClient unittests

commit 21ff0c5ddf62e42a6221a716ae0f79023301b71d
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Sep 5 18:53:33 2012 +0530

    [2108] Add getIterator() test for existing zone

commit 42cd408242643ec58c3865fb1ad80a2c9340a874
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Sep 5 18:52:52 2012 +0530

    [2108] Untabify code

commit b3310cab0f5e156a7cde66921b5151099346a366
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Sep 5 18:48:04 2012 +0530

    [2108] Rename test

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

Summary of changes:
 .../datasrc/memory/tests/memory_client_unittest.cc |   24 ++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/tests/memory_client_unittest.cc b/src/lib/datasrc/memory/tests/memory_client_unittest.cc
index 0a683ff..142f381 100644
--- a/src/lib/datasrc/memory/tests/memory_client_unittest.cc
+++ b/src/lib/datasrc/memory/tests/memory_client_unittest.cc
@@ -66,29 +66,35 @@ protected:
     memory::ZoneTable* zone_table;
 };
 
-TEST_F(MemoryClientTest, load) {
-    // Zone "example.org." doesn't exist
-    EXPECT_THROW(client_->getIterator(Name("example.org")), DataSourceError);
-    EXPECT_EQ(0, client_->getZoneCount());
+TEST_F(MemoryClientTest, loadRRsetDoesntMatchOrigin) {
+    EXPECT_THROW(client_->load(Name("example.com"),
+                               TEST_DATA_DIR "/example.org-empty.zone"),
+                 MasterLoadError);
+}
 
+TEST_F(MemoryClientTest, getZoneCount) {
+    EXPECT_EQ(0, client_->getZoneCount());
     client_->load(Name("example.org"), TEST_DATA_DIR "/example.org-empty.zone");
     EXPECT_EQ(1, client_->getZoneCount());
-
-    ZoneIteratorPtr iterator(client_->getIterator(Name("example.org")));
 }
 
-TEST_F(MemoryClientTest, getIteratorNonExistent) {
+TEST_F(MemoryClientTest, getIteratorForNonExistentZone) {
     // Zone "." doesn't exist
     EXPECT_THROW(client_->getIterator(Name(".")), DataSourceError);
 }
 
+TEST_F(MemoryClientTest, getIterator) {
+    client_->load(Name("example.org"), TEST_DATA_DIR "/example.org-empty.zone");
+    ZoneIteratorPtr iterator(client_->getIterator(Name("example.org")));
+}
+
 TEST_F(MemoryClientTest, getUpdaterThrowsNotImplemented) {
     EXPECT_THROW(client_->getUpdater(Name("."), false, false),
-		 isc::NotImplemented);
+                 isc::NotImplemented);
 }
 
 TEST_F(MemoryClientTest, getJournalReaderNotImplemented) {
     EXPECT_THROW(client_->getJournalReader(Name("."), 0, 0),
-		 isc::NotImplemented);
+                 isc::NotImplemented);
 }
 }