[2281] Enable factory test for static DS with bad zone file

diff --git a/src/lib/datasrc/tests/Makefile.am b/src/lib/datasrc/tests/Makefile.am
index 32e1263da24a3c5fdfecfd0cc67596d3181a6719..c1e7d4ec61afe63e5f17f610a21d53817ffb8687 100644 (file)
--- a/src/lib/datasrc/tests/Makefile.am
+++ b/src/lib/datasrc/tests/Makefile.am
@@ -114,5 +114,6 @@ EXTRA_DIST += testdata/new_minor_schema.sqlite3
 EXTRA_DIST += testdata/newschema.sqlite3
 EXTRA_DIST += testdata/oldschema.sqlite3
 EXTRA_DIST += testdata/static.zone
+EXTRA_DIST += testdata/static-bad.zone
 EXTRA_DIST += testdata/novalidate.zone
 EXTRA_DIST += testdata/checkwarn.zone

diff --git a/src/lib/datasrc/tests/factory_unittest.cc b/src/lib/datasrc/tests/factory_unittest.cc
index 12c611de21916720ea007071776723b99dbd3959..cc03ce30c5d4e470908dc0742dc858b54f849d8a 100644 (file)
--- a/src/lib/datasrc/tests/factory_unittest.cc
+++ b/src/lib/datasrc/tests/factory_unittest.cc
@@ -29,6 +29,7 @@ using namespace isc::data;
 
 std::string SQLITE_DBFILE_EXAMPLE_ORG = TEST_DATA_DIR "/example.org.sqlite3";
 const std::string STATIC_DS_FILE = TEST_DATA_DIR "/static.zone";
+const std::string STATIC_BAD_DS_FILE = TEST_DATA_DIR "/static-bad.zone";
 const std::string ROOT_ZONE_FILE = TEST_DATA_DIR "/root.zone";
 
 namespace {
@@ -187,13 +188,9 @@ TEST(FactoryTest, staticDS) {
 }
 
 // Check that file not containing BIND./CH is rejected
-//
-// FIXME: This test is disabled because the InMemoryZoneFinder::load does
-// not check if the data loaded correspond with the origin. The static
-// factory is not the place to fix that.
-TEST(FactoryTest, DISABLED_staticDSBadFile) {
+TEST(FactoryTest, staticDSBadFile) {
     // The only configuration is the file to load.
-    const ConstElementPtr config(new StringElement(STATIC_DS_FILE));
+    const ConstElementPtr config(new StringElement(STATIC_BAD_DS_FILE));
     // See it does not want the file
     EXPECT_THROW(DataSourceClientContainer("static", config), DataSourceError);
 }

diff --git a/src/lib/datasrc/tests/testdata/static-bad.zone b/src/lib/datasrc/tests/testdata/static-bad.zone
new file mode 100644 (file)
index 0000000..500ccca
--- /dev/null
+++ b/src/lib/datasrc/tests/testdata/static-bad.zone
@@ -0,0 +1,3 @@
+NOTBIND.           3600    CH  SOA NOTBIND. NOTBIND. 4 3600 300 36000 3600
+NOTBIND.           3600    CH  NS  NOTBIND.
+VERSION.NOTBIND.   3600    CH  TXT "10"