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

git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac423@3775 e5f2f494-b856-4b98-b285-d166d9295462

src/lib/dns/tests/master_unittest.cc

@@ -223,9 +223,11 @@ TEST_F(MasterTest, loadFromFile) {
     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);
 }