From: Mukund Sivaraman <muks@isc.org>
Date: Wed, 26 Sep 2012 12:16:07 +0000 (+0530)
Subject: [2218] Update other tests for previous commit's API change
X-Git-Tag: trac2351_base~37^2~1^2~3^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12d5f67f3e58ab09f8369b4218baa2c8a40e2b9a;p=thirdparty%2Fkea.git

[2218] Update other tests for previous commit's API change
---

diff --git a/src/lib/datasrc/memory/tests/memory_client_unittest.cc b/src/lib/datasrc/memory/tests/memory_client_unittest.cc
index 81b452567b..81330313f9 100644
--- a/src/lib/datasrc/memory/tests/memory_client_unittest.cc
+++ b/src/lib/datasrc/memory/tests/memory_client_unittest.cc
@@ -180,13 +180,11 @@ TEST_F(MemoryClientTest, load) {
     // should not result in any exceptions.
     client_->load(Name("example.org"),
                   TEST_DATA_DIR "/example.org.zone");
-    isc::datasrc::memory::ZoneTable::FindResult
-        result(client_->findZoneData(Name("example.org")));
-    EXPECT_EQ(result::SUCCESS, result.code);
-    ASSERT_NE(static_cast<ZoneData*>(NULL),
-              result.zone_data);
-    EXPECT_FALSE(result.zone_data->isSigned());
-    EXPECT_FALSE(result.zone_data->isNSEC3Signed());
+    const ZoneData* zone_data =
+        client_->findZoneData(Name("example.org"));
+    ASSERT_NE(static_cast<const ZoneData*>(NULL), zone_data);
+    EXPECT_FALSE(zone_data->isSigned());
+    EXPECT_FALSE(zone_data->isNSEC3Signed());
 }
 
 TEST_F(MemoryClientTest, loadFromIterator) {
@@ -232,13 +230,11 @@ TEST_F(MemoryClientTest, loadMemoryAllocationFailures) {
 TEST_F(MemoryClientTest, loadNSEC3Signed) {
     client_->load(Name("example.org"),
                   TEST_DATA_DIR "/example.org-nsec3-signed.zone");
-    isc::datasrc::memory::ZoneTable::FindResult
-        result(client_->findZoneData(Name("example.org")));
-    EXPECT_EQ(result::SUCCESS, result.code);
-    ASSERT_NE(static_cast<ZoneData*>(NULL),
-              result.zone_data);
-    EXPECT_TRUE(result.zone_data->isSigned());
-    EXPECT_TRUE(result.zone_data->isNSEC3Signed());
+    const ZoneData* zone_data =
+        client_->findZoneData(Name("example.org"));
+    ASSERT_NE(static_cast<const ZoneData*>(NULL), zone_data);
+    EXPECT_TRUE(zone_data->isSigned());
+    EXPECT_TRUE(zone_data->isNSEC3Signed());
 }
 
 TEST_F(MemoryClientTest, loadNSEC3EmptySalt) {
@@ -246,25 +242,21 @@ TEST_F(MemoryClientTest, loadNSEC3EmptySalt) {
     // or anything.
     client_->load(Name("example.org"),
                   TEST_DATA_DIR "/example.org-nsec3-empty-salt.zone");
-    isc::datasrc::memory::ZoneTable::FindResult
-        result(client_->findZoneData(Name("example.org")));
-    EXPECT_EQ(result::SUCCESS, result.code);
-    ASSERT_NE(static_cast<ZoneData*>(NULL),
-              result.zone_data);
-    EXPECT_TRUE(result.zone_data->isSigned());
-    EXPECT_TRUE(result.zone_data->isNSEC3Signed());
+    const ZoneData* zone_data =
+        client_->findZoneData(Name("example.org"));
+    ASSERT_NE(static_cast<const ZoneData*>(NULL), zone_data);
+    EXPECT_TRUE(zone_data->isSigned());
+    EXPECT_TRUE(zone_data->isNSEC3Signed());
 }
 
 TEST_F(MemoryClientTest, loadNSEC3SignedNoParam) {
     client_->load(Name("example.org"),
                   TEST_DATA_DIR "/example.org-nsec3-signed-no-param.zone");
-    isc::datasrc::memory::ZoneTable::FindResult
-        result(client_->findZoneData(Name("example.org")));
-    EXPECT_EQ(result::SUCCESS, result.code);
-    ASSERT_NE(static_cast<ZoneData*>(NULL),
-              result.zone_data);
-    EXPECT_TRUE(result.zone_data->isSigned());
-    EXPECT_TRUE(result.zone_data->isNSEC3Signed());
+    const ZoneData* zone_data =
+        client_->findZoneData(Name("example.org"));
+    ASSERT_NE(static_cast<const ZoneData*>(NULL), zone_data);
+    EXPECT_TRUE(zone_data->isSigned());
+    EXPECT_TRUE(zone_data->isNSEC3Signed());
 }
 
 TEST_F(MemoryClientTest, loadReloadZone) {