From: Mukund Sivaraman <muks@isc.org>
Date: Wed, 8 May 2013 11:00:17 +0000 (+0530)
Subject: [2850] Fix address name generation
X-Git-Tag: bind10-1.2.0beta1-release~467^2~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56d109e8a0c5d46ac542870723ba324aa2425b88;p=thirdparty%2Fkea.git

[2850] Fix address name generation
---

diff --git a/src/lib/datasrc/tests/memory/zone_table_segment_mapped_unittest.cc b/src/lib/datasrc/tests/memory/zone_table_segment_mapped_unittest.cc
index 153931b7da..1c68d61f5f 100644
--- a/src/lib/datasrc/tests/memory/zone_table_segment_mapped_unittest.cc
+++ b/src/lib/datasrc/tests/memory/zone_table_segment_mapped_unittest.cc
@@ -18,6 +18,7 @@
 #include <util/unittests/check_valgrind.h>
 
 #include <gtest/gtest.h>
+#include <boost/format.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/interprocess/file_mapping.hpp>
 
@@ -33,7 +34,7 @@ using boost::scoped_ptr;
 
 namespace {
 
-const char* const  mapped_file = TEST_DATA_BUILDDIR "/test.mapped";
+const char* const mapped_file  = TEST_DATA_BUILDDIR "/test.mapped";
 const char* const mapped_file2 = TEST_DATA_BUILDDIR "/test2.mapped";
 
 class ZoneTableSegmentMappedTest : public ::testing::Test {
@@ -86,8 +87,7 @@ createData(MemorySegment& segment) {
     // to keep the size of test data reasonably small.
     UniformRandomIntegerGenerator gen(0, INT_MAX, getpid());
     for (int i = 0; i < 256; ++i) {
-        string name("name");
-        name += i;
+        const string name(boost::str(boost::format("name%d") % i));
         const int value = gen();
         void* ptr = segment.allocate(sizeof(int));
         ASSERT_TRUE(ptr);
@@ -101,8 +101,7 @@ bool
 verifyData(const MemorySegment& segment) {
     UniformRandomIntegerGenerator gen(0, INT_MAX, getpid());
     for (int i = 0; i < 256; ++i) {
-        string name("name");
-        name += i;
+        const string name(boost::str(boost::format("name%d") % i));
         const int value = gen();
         const MemorySegment::NamedAddressResult result =
             segment.getNamedAddress(name.c_str());