BIND 10 trac2850_2, updated. 9d90db228e26173b0781d090ea2b0e078c7969f6 [2850] style cleanups: spacing, combining short lines
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue May 7 20:22:05 UTC 2013
The branch, trac2850_2 has been updated
via 9d90db228e26173b0781d090ea2b0e078c7969f6 (commit)
from d003ebd54cb9b0454e60af6270177e202c766892 (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 9d90db228e26173b0781d090ea2b0e078c7969f6
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Tue May 7 13:21:51 2013 -0700
[2850] style cleanups: spacing, combining short lines
-----------------------------------------------------------------------
Summary of changes:
.../memory/zone_table_segment_mapped_unittest.cc | 33 +++++++-------------
1 file changed, 12 insertions(+), 21 deletions(-)
-----------------------------------------------------------------------
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 198a2f6..153931b 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
@@ -33,8 +33,8 @@ using boost::scoped_ptr;
namespace {
-const char* mapped_file = TEST_DATA_BUILDDIR "/test.mapped";
-const char* mapped_file2 = TEST_DATA_BUILDDIR "/test2.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 {
protected:
@@ -89,7 +89,7 @@ createData(MemorySegment& segment) {
string name("name");
name += i;
const int value = gen();
- void* ptr = segment.allocate(sizeof (int));
+ void* ptr = segment.allocate(sizeof(int));
ASSERT_TRUE(ptr);
*static_cast<int*>(ptr) = value;
const bool grew = segment.setNamedAddress(name.c_str(), ptr);
@@ -225,8 +225,7 @@ TEST_F(ZoneTableSegmentMappedTest, reset) {
// By default, the mapped file doesn't exist, so we cannot open it
// in READ_ONLY mode (which does not create the file).
EXPECT_THROW({
- ztable_segment_->reset(ZoneTableSegment::READ_ONLY,
- config_params_);
+ ztable_segment_->reset(ZoneTableSegment::READ_ONLY, config_params_);
}, MemorySegmentOpenError);
// The following should still throw, unaffected by the failed open.
@@ -239,8 +238,7 @@ TEST_F(ZoneTableSegmentMappedTest, reset) {
// READ_WRITE mode must create the mapped file if it doesn't exist
// (and must not result in an exception).
- ztable_segment_->reset(ZoneTableSegment::READ_WRITE,
- config_params_);
+ ztable_segment_->reset(ZoneTableSegment::READ_WRITE, config_params_);
// This must not throw now.
EXPECT_TRUE(ztable_segment_->isWritable());
@@ -250,15 +248,13 @@ TEST_F(ZoneTableSegmentMappedTest, reset) {
// Let's try to re-open the mapped file in READ_ONLY mode. It should
// not fail now.
- ztable_segment_->reset(ZoneTableSegment::READ_ONLY,
- config_params_);
+ ztable_segment_->reset(ZoneTableSegment::READ_ONLY, config_params_);
EXPECT_FALSE(ztable_segment_->isWritable());
// Re-creating the mapped file should erase old data and should not
// trigger any exceptions inside reset() due to old data (such as
// named addresses).
- ztable_segment_->reset(ZoneTableSegment::CREATE,
- config_params_);
+ ztable_segment_->reset(ZoneTableSegment::CREATE, config_params_);
EXPECT_TRUE(ztable_segment_->isWritable());
// When we reset() with an invalid paramter and it fails, then the
@@ -275,8 +271,7 @@ TEST_F(ZoneTableSegmentMappedTest, reset) {
// READ_WRITE with an existing map file ought to work too. This
// would use existing named addresses. This actually re-opens the
// currently open map.
- ztable_segment_->reset(ZoneTableSegment::READ_WRITE,
- config_params_);
+ ztable_segment_->reset(ZoneTableSegment::READ_WRITE, config_params_);
EXPECT_TRUE(ztable_segment_->isWritable());
}
@@ -366,8 +361,7 @@ TEST_F(ZoneTableSegmentMappedTest, resetReadOnly) {
TEST_F(ZoneTableSegmentMappedTest, clear) {
// First, open an underlying mapped file in read+write mode (doesn't
// exist yet)
- ztable_segment_->reset(ZoneTableSegment::READ_WRITE,
- config_params_);
+ ztable_segment_->reset(ZoneTableSegment::READ_WRITE, config_params_);
EXPECT_TRUE(ztable_segment_->isWritable());
// The following method calls should no longer throw:
@@ -399,8 +393,7 @@ TEST_F(ZoneTableSegmentMappedTest, resetFailedCorruptedChecksum) {
// Opening mapped file 2 in read-write mode should fail
EXPECT_THROW({
- ztable_segment_->reset(ZoneTableSegment::READ_WRITE,
- config_params2_);
+ ztable_segment_->reset(ZoneTableSegment::READ_WRITE, config_params2_);
}, ResetFailed);
}
@@ -420,8 +413,7 @@ TEST_F(ZoneTableSegmentMappedTest, resetFailedMissingChecksum) {
// Opening mapped file 2 in read-only mode should fail
EXPECT_THROW({
- ztable_segment_->reset(ZoneTableSegment::READ_ONLY,
- config_params2_);
+ ztable_segment_->reset(ZoneTableSegment::READ_ONLY, config_params2_);
}, ResetFailed);
}
@@ -441,8 +433,7 @@ TEST_F(ZoneTableSegmentMappedTest, resetFailedMissingHeader) {
// Opening mapped file 2 in read-only mode should fail
EXPECT_THROW({
- ztable_segment_->reset(ZoneTableSegment::READ_ONLY,
- config_params2_);
+ ztable_segment_->reset(ZoneTableSegment::READ_ONLY, config_params2_);
}, ResetFailed);
}
More information about the bind10-changes
mailing list