BIND 10 trac1967, updated. bb73dd2fdeff8da3a3923541495e14e18556b76a [1967] DHCPv6 tests now use boost::scoped_ptr<>
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu May 17 11:35:08 UTC 2012
The branch, trac1967 has been updated
via bb73dd2fdeff8da3a3923541495e14e18556b76a (commit)
from edad8ee1e80c5b35c2f5b3eafe82d56cd0d6e5e9 (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 bb73dd2fdeff8da3a3923541495e14e18556b76a
Author: Tomek Mrugalski <tomasz at isc.org>
Date: Thu May 17 13:30:52 2012 +0200
[1967] DHCPv6 tests now use boost::scoped_ptr<>
-----------------------------------------------------------------------
Summary of changes:
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index f21366d..f4cae66 100644
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -25,6 +25,7 @@
#include <dhcp6/dhcp6_srv.h>
#include <util/buffer.h>
#include <util/range_utilities.h>
+#include <boost/scoped_ptr.hpp>
using namespace std;
using namespace isc;
@@ -85,9 +86,9 @@ TEST_F(Dhcpv6SrvTest, basic) {
TEST_F(Dhcpv6SrvTest, DUID) {
// tests that DUID is generated properly
- Dhcpv6Srv* srv = NULL;
+ boost::scoped_ptr<Dhcpv6Srv> srv;
ASSERT_NO_THROW( {
- srv = new Dhcpv6Srv(DHCP6_SERVER_PORT + 10000);
+ srv.reset(new Dhcpv6Srv(DHCP6_SERVER_PORT + 10000));
});
OptionPtr srvid = srv->getServerID();
@@ -156,12 +157,11 @@ TEST_F(Dhcpv6SrvTest, DUID) {
ADD_FAILURE() << "Not supported duid type=" << duid_type << endl;
break;
}
- delete srv; // destructor will close sockets, causing next test to succeed
}
TEST_F(Dhcpv6SrvTest, Solicit_basic) {
- NakedDhcpv6Srv* srv = NULL;
- ASSERT_NO_THROW( srv = new NakedDhcpv6Srv(); );
+ boost::scoped_ptr<NakedDhcpv6Srv> srv;
+ ASSERT_NO_THROW( srv.reset(new NakedDhcpv6Srv()) );
// a dummy content for client-id
OptionBuffer clntDuid(32);
@@ -230,8 +230,6 @@ TEST_F(Dhcpv6SrvTest, Solicit_basic) {
EXPECT_TRUE(tmp->getData() == srv->getServerID()->getData());
// more checks to be implemented
- delete srv;
-
}
}
More information about the bind10-changes
mailing list