From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 11 Jun 2012 11:30:36 +0000 (+0200)
Subject: [1955] Corrections to timestamp unit tests in dhcp::PktN.
X-Git-Tag: trac2351_base~226^2~58^2~6^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0235da81624be30ea2aeadaf1c93fde1ba1bd057;p=thirdparty%2Fkea.git

[1955] Corrections to timestamp unit tests in dhcp::PktN.
---

diff --git a/src/lib/dhcp/tests/pkt4_unittest.cc b/src/lib/dhcp/tests/pkt4_unittest.cc
index 1ac8477337..e443b65815 100644
--- a/src/lib/dhcp/tests/pkt4_unittest.cc
+++ b/src/lib/dhcp/tests/pkt4_unittest.cc
@@ -599,7 +599,10 @@ TEST(Pkt4Test, metaFields) {
 }
 
 TEST(Pkt4Test, Timestamp) {
-    Pkt4* pkt = new Pkt4(DHCPOFFER, 1234);
+    scoped_ptr<Pkt4> pkt(new Pkt4(DHCPOFFER, 1234));
+
+    // Just after construction timestamp is invalid
+    ASSERT_TRUE(pkt->getTimestamp().is_not_a_date_time());
 
     // Update packet time.
     pkt->updateTimestamp();
@@ -619,8 +622,6 @@ TEST(Pkt4Test, Timestamp) {
 
     // Duration should be positive or zero.
     EXPECT_TRUE(ts_period.length().total_microseconds() >= 0);
-
-    delete pkt;
 }
 
 
diff --git a/src/lib/dhcp/tests/pkt6_unittest.cc b/src/lib/dhcp/tests/pkt6_unittest.cc
index fdc9733bb2..d6ca9b106f 100644
--- a/src/lib/dhcp/tests/pkt6_unittest.cc
+++ b/src/lib/dhcp/tests/pkt6_unittest.cc
@@ -206,7 +206,11 @@ TEST_F(Pkt6Test, addGetDelOptions) {
 }
 
 TEST_F(Pkt6Test, Timestamp) {
-    Pkt6* pkt = new Pkt6(DHCPV6_SOLICIT, 0x020304);
+    boost::scoped_ptr<Pkt6> pkt(new Pkt6(DHCPV6_SOLICIT, 0x020304));
+
+    // Just after construction timestamp is invalid
+    ASSERT_TRUE(pkt->getTimestamp().is_not_a_date_time());
+
     // Update packet time.
     pkt->updateTimestamp();
 
@@ -225,8 +229,6 @@ TEST_F(Pkt6Test, Timestamp) {
 
     // Duration should be positive or zero.
     EXPECT_TRUE(ts_period.length().total_microseconds() >= 0);
-
-    delete pkt;
 }
 
 }