From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Thu, 11 Oct 2012 17:08:56 +0000 (+0200)
Subject: [2207] Tests for the zone updater
X-Git-Tag: trac2402_base~12^2~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e70da63e4aa5a075928c5cdef4fed11d15eeaa5a;p=thirdparty%2Fkea.git

[2207] Tests for the zone updater

Doesn't compile, there's no (not even empty) implementation of many
methods of the updater.
---

diff --git a/src/lib/datasrc/memory/zone_updater.h b/src/lib/datasrc/memory/zone_updater.h
index cce07b93a3..9658866125 100644
--- a/src/lib/datasrc/memory/zone_updater.h
+++ b/src/lib/datasrc/memory/zone_updater.h
@@ -79,7 +79,23 @@ public:
 // TODO: Fully define this. It is supposed to be passed to the install_action
 // callback, but what does it actually represent? Is it the actuall zone data
 // there?
-class ZoneSegment {};
+//
+// The current interface is temporary, so the tests work. It will probably
+// change (and we may even fold this class to some other, because there
+// seem to be too many classes around holding zone already).
+//
+// FIXME: Who is responsible for releasing of the segment itself?
+class ZoneSegment {
+public:
+    explicit ZoneSegment(ZoneData* data) :
+        data_(data)
+    {}
+    ZoneData* getZoneData() {
+        return (data_);
+    }
+private:
+    ZoneData* data_;
+};
 // TODO: Somehow specify what the ID is
 class ZoneSegmentID {};
 
@@ -98,7 +114,8 @@ typedef boost::function<void(ZoneData*)> LoadAction;
 ///
 /// Upon successful completion, the ownership of the new zone is passed
 /// to the callback and the old to the updater.
-typedef boost::function<ZoneData* (ZoneSegmentID, ZoneSegment*)> InstallAction;
+typedef boost::function<ZoneData* (const ZoneSegmentID&,
+                                   ZoneSegment*)> InstallAction;
 
 /// \brief Updater implementation which loads data locally.
 ///
diff --git a/src/lib/datasrc/tests/memory/Makefile.am b/src/lib/datasrc/tests/memory/Makefile.am
index 37e9043523..ba922a648d 100644
--- a/src/lib/datasrc/tests/memory/Makefile.am
+++ b/src/lib/datasrc/tests/memory/Makefile.am
@@ -33,6 +33,7 @@ run_unittests_SOURCES += memory_segment_test.h
 run_unittests_SOURCES += segment_object_holder_unittest.cc
 run_unittests_SOURCES += memory_client_unittest.cc
 run_unittests_SOURCES += zone_table_segment_unittest.cc
+run_unittests_SOURCES += zone_updater_unittest.cc
 
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS  = $(AM_LDFLAGS)  $(GTEST_LDFLAGS)