[1976] Cleanup: test class to test file

The SingletonList is no longer needed for transition in the main Auth
code. It is now used in Query tests only, so it was moved to the
query_unittest.cc and the list.h removed.

diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am
index c39952169eab0d67d4c009bb2b0fce51173f60e2..1f0fbbf63f94a3b079b856af929a3de6922a5f20 100644 (file)
--- a/src/bin/auth/Makefile.am
+++ b/src/bin/auth/Makefile.am
@@ -49,7 +49,7 @@ b10_auth_SOURCES += command.cc command.h
 b10_auth_SOURCES += common.h common.cc
 b10_auth_SOURCES += statistics.cc statistics.h
 b10_auth_SOURCES += datasrc_configurator.h
-b10_auth_SOURCES += main.cc list.h
+b10_auth_SOURCES += main.cc
 # This is a temporary workaround for #1206, where the InMemoryClient has been
 # moved to an ldopened library. We could add that library to LDADD, but that
 # is nonportable. This should've been moot after #1207, but there is still

diff --git a/src/bin/auth/list.h b/src/bin/auth/list.h
deleted file mode 100644 (file)
index 180f8bb..0000000
--- a/src/bin/auth/list.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <datasrc/client_list.h>
-#include <datasrc/client.h>
-
-#include <dns/name.h>
-
-// Note: This file breaks almost every rule about how it should look like and
-// other formalities. However, it is only a transitional file and will be deleted
-// before the end of this branch.
-
-using namespace isc::datasrc;
-using namespace isc::dns;
-
-class SingletonList : public ClientList {
-public:
-    SingletonList(DataSourceClient& client) :
-        client_(client)
-    {}
-    virtual FindResult find(const Name& zone, bool exact, bool) const {
-        DataSourceClient::FindResult result(client_.findZone(zone));
-        switch (result.code) {
-            case result::SUCCESS:
-                return (FindResult(&client_, result.zone_finder, true));
-            case result::PARTIALMATCH:
-                if (!exact) {
-                    return (FindResult(&client_, result.zone_finder, false));
-                }
-            default:
-                return (FindResult());
-        }
-    }
-private:
-    DataSourceClient& client_;
-};

diff --git a/src/bin/auth/tests/query_unittest.cc b/src/bin/auth/tests/query_unittest.cc
index f2ac20ea3c3c300bbd278345ceda11ddd7185a82..d63a8eb316d2d9d048d8f6a4d27405525cf67e10 100644 (file)
--- a/src/bin/auth/tests/query_unittest.cc
+++ b/src/bin/auth/tests/query_unittest.cc
@@ -32,9 +32,9 @@
 #include <dns/rdataclass.h>
 
 #include <datasrc/memory_datasrc.h>
+#include <datasrc/client_list.h>
 
 #include <auth/query.h>
-#include <auth/list.h>
 
 #include <testutils/dnsmessage_test.h>
 
@@ -49,6 +49,32 @@ using namespace isc::testutils;
 
 namespace {
 
+// Simple wrapper for a sincle data source client.
+// The list simply delegates all the answers to the single
+// client.
+class SingletonList : public ClientList {
+public:
+    SingletonList(DataSourceClient& client) :
+        client_(client)
+    {}
+    virtual FindResult find(const Name& zone, bool exact, bool) const {
+        DataSourceClient::FindResult result(client_.findZone(zone));
+        switch (result.code) {
+            case result::SUCCESS:
+                return (FindResult(&client_, result.zone_finder, true));
+            case result::PARTIALMATCH:
+                if (!exact) {
+                    return (FindResult(&client_, result.zone_finder, false));
+                }
+            default:
+                return (FindResult());
+        }
+    }
+private:
+    DataSourceClient& client_;
+};
+
+
 // This is the content of the mock zone (see below).
 // It's a sequence of textual RRs that is supposed to be parsed by
 // dns::masterLoad().  Some of the RRs are also used as the expected