BIND 10 trac2377, updated. c129951474788781d54007380769ff3eed0f15cf [2377] Minor test code cleanups

[BIND 10 source code commits]

The branch, trac2377 has been updated
       via  c129951474788781d54007380769ff3eed0f15cf (commit)
      from  f4f1c1f0006d665f2e2216e3872d82b5ac25334b (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 c129951474788781d54007380769ff3eed0f15cf
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Mon Dec 10 13:56:05 2012 +0100

    [2377] Minor test code cleanups

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

Summary of changes:
 src/lib/dns/tests/master_loader_unittest.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dns/tests/master_loader_unittest.cc b/src/lib/dns/tests/master_loader_unittest.cc
index a80c055..184ab67 100644
--- a/src/lib/dns/tests/master_loader_unittest.cc
+++ b/src/lib/dns/tests/master_loader_unittest.cc
@@ -82,7 +82,7 @@ public:
                                        options));
     }
 
-    string prepareZone(const string& line, bool include_last) {
+    static string prepareZone(const string& line, bool include_last) {
         string result;
         result += "example.org. 3600 IN SOA ns1.example.org. "
             "admin.example.org. 1234 3600 1800 2419200 7200\n";
@@ -108,7 +108,7 @@ public:
         rrsets_.pop_front();
 
         EXPECT_EQ(Name(name), current->getName());
-        ASSERT_EQ(type, current->getType());
+        EXPECT_EQ(type, current->getType());
         EXPECT_EQ(RRClass::IN(), current->getClass());
         ASSERT_EQ(1, current->getRdataCount());
         EXPECT_EQ(0, isc::dns::rdata::createRdata(type, RRClass::IN(), data)->