BIND 10 trac2850_2, updated. db8cec0cd9505bd0ab091e6258822dcb2891338c [2850] Change style of code to fix buildbot failures
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri May 10 03:01:30 UTC 2013
The branch, trac2850_2 has been updated
via db8cec0cd9505bd0ab091e6258822dcb2891338c (commit)
from bc3d482930fad8d97305f07e116093ace8110e9c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit db8cec0cd9505bd0ab091e6258822dcb2891338c
Author: Mukund Sivaraman <muks at isc.org>
Date: Fri May 10 08:31:04 2013 +0530
[2850] Change style of code to fix buildbot failures
-----------------------------------------------------------------------
Summary of changes:
.../util/tests/memory_segment_common_unittest.cc | 18 ++++++++++--------
.../util/tests/memory_segment_mapped_unittest.cc | 7 ++++---
2 files changed, 14 insertions(+), 11 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/util/tests/memory_segment_common_unittest.cc b/src/lib/util/tests/memory_segment_common_unittest.cc
index 4ad9c50..fac0559 100644
--- a/src/lib/util/tests/memory_segment_common_unittest.cc
+++ b/src/lib/util/tests/memory_segment_common_unittest.cc
@@ -43,18 +43,19 @@ checkSegmentNamedAddress(MemorySegment& segment, bool out_of_segment_ok) {
EXPECT_THROW(segment.setNamedAddress(NULL, ptr32), InvalidParameter);
// we can now get it; the stored value should be intact.
- EXPECT_EQ(MemorySegment::NamedAddressResult(true, ptr32),
- segment.getNamedAddress("test address"));
- EXPECT_EQ(test_val, *static_cast<const uint32_t*>(ptr32));
+ MemorySegment::NamedAddressResult result =
+ segment.getNamedAddress("test address");
+ EXPECT_TRUE(result.first);
+ EXPECT_EQ(test_val, *static_cast<const uint32_t*>(result.second));
// Override it.
void* ptr16 = segment.allocate(sizeof(uint16_t));
const uint16_t test_val16 = 4200;
*static_cast<uint16_t*>(ptr16) = test_val16;
EXPECT_FALSE(segment.setNamedAddress("test address", ptr16));
- EXPECT_EQ(MemorySegment::NamedAddressResult(true, ptr16),
- segment.getNamedAddress("test address"));
- EXPECT_EQ(test_val16, *static_cast<const uint16_t*>(ptr16));
+ result = segment.getNamedAddress("test address");
+ EXPECT_TRUE(result.first);
+ EXPECT_EQ(test_val16, *static_cast<const uint16_t*>(result.second));
// Clear it. Then we won't be able to find it any more.
EXPECT_TRUE(segment.clearNamedAddress("test address"));
@@ -65,8 +66,9 @@ checkSegmentNamedAddress(MemorySegment& segment, bool out_of_segment_ok) {
// Setting NULL is okay.
EXPECT_FALSE(segment.setNamedAddress("null address", NULL));
- EXPECT_EQ(MemorySegment::NamedAddressResult(true, NULL),
- segment.getNamedAddress("null address"));
+ result = segment.getNamedAddress("null address");
+ EXPECT_TRUE(result.first);
+ EXPECT_FALSE(result.second);
// If the underlying implementation performs explicit check against
// out-of-segment address, confirm the behavior.
diff --git a/src/lib/util/tests/memory_segment_mapped_unittest.cc b/src/lib/util/tests/memory_segment_mapped_unittest.cc
index 98e2a3e..f8eeb5b 100644
--- a/src/lib/util/tests/memory_segment_mapped_unittest.cc
+++ b/src/lib/util/tests/memory_segment_mapped_unittest.cc
@@ -311,7 +311,7 @@ TEST_F(MemorySegmentMappedTest, namedAddress) {
segment_.reset(); // close it before opening another one
segment_.reset(new MemorySegmentMapped(mapped_file));
- const MemorySegment::NamedAddressResult result =
+ MemorySegment::NamedAddressResult result =
segment_->getNamedAddress("test address");
ASSERT_TRUE(result.first);
EXPECT_EQ(test_val16, *static_cast<const uint16_t*>(result.second));
@@ -325,8 +325,9 @@ TEST_F(MemorySegmentMappedTest, namedAddress) {
const std::string long_name(1025, 'x'); // definitely larger than segment
// setNamedAddress should return true, indicating segment has grown.
EXPECT_TRUE(segment_->setNamedAddress(long_name.c_str(), NULL));
- EXPECT_EQ(MemorySegment::NamedAddressResult(true, NULL),
- segment_->getNamedAddress(long_name.c_str()));
+ result = segment_->getNamedAddress(long_name.c_str());
+ EXPECT_TRUE(result.first);
+ EXPECT_FALSE(result.second);
// Check contents pointed by named addresses survive growing and
// shrinking segment.
More information about the bind10-changes
mailing list