[svn] commit: r3775 - /branches/trac423/src/lib/dns/tests/master_unittest.cc

[BIND 10 source code commits]

Author: jinmei
Date: Thu Dec  9 00:22:51 2010
New Revision: 3775

Log:
null filename test.  consolidate some small tests into a single case.

Modified:
    branches/trac423/src/lib/dns/tests/master_unittest.cc

Modified: branches/trac423/src/lib/dns/tests/master_unittest.cc
==============================================================================
--- branches/trac423/src/lib/dns/tests/master_unittest.cc (original)
+++ branches/trac423/src/lib/dns/tests/master_unittest.cc Thu Dec  9 00:22:51 2010
@@ -223,9 +223,11 @@
     ASSERT_EQ(2, results.size());
     EXPECT_EQ(txt_rr, results[0]->toText());
     EXPECT_EQ(string(a_rr1) + string(a_rr2), results[1]->toText());
-}
-
-TEST_F(MasterTest, loadFromFileFailure) {
+
+    // NULL file name.  Should result in exception.
+    EXPECT_THROW(masterLoad(NULL, origin, zclass, callback), MasterError);
+
+    // Non existent file name.  Ditto.
     EXPECT_THROW(masterLoad(TEST_DATA_BUILDDIR "/notexistent.txt", origin,
                             zclass, callback), MasterError);
 }