BIND 10 trac449, updated. a02e4f3441285f10958b72e2337aa1b6e290fb56 [trac449] add test to check ttl does not wrap when dropping to 0

[BIND 10 source code commits]

The branch, trac449 has been updated
       via  a02e4f3441285f10958b72e2337aa1b6e290fb56 (commit)
      from  16bbee505681b46ef60febb8067765704afdeb24 (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 a02e4f3441285f10958b72e2337aa1b6e290fb56
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Feb 11 11:24:13 2011 +0100

    [trac449] add test to check ttl does not wrap when dropping to 0

-----------------------------------------------------------------------

Summary of changes:
 src/lib/cache/tests/resolver_cache_unittest.cc |   14 +++++---------
 src/lib/cache/tests/rrset_entry_unittest.cc    |   11 +++++++++++
 2 files changed, 16 insertions(+), 9 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/cache/tests/resolver_cache_unittest.cc b/src/lib/cache/tests/resolver_cache_unittest.cc
index 2ad05fc..6621df0 100644
--- a/src/lib/cache/tests/resolver_cache_unittest.cc
+++ b/src/lib/cache/tests/resolver_cache_unittest.cc
@@ -50,11 +50,9 @@ TEST_F(ResolverCacheTest, testUpdateMessage) {
     cache->update(msg);
 
     Name qname("example.com.");
-    RRType qtype(6);
-    RRClass klass(1);
 
     msg.makeResponse();
-    EXPECT_TRUE(cache->lookup(qname, qtype, klass, msg));
+    EXPECT_TRUE(cache->lookup(qname, RRType::SOA(), RRClass::IN(), msg));
     EXPECT_TRUE(msg.getHeaderFlag(Message::HEADERFLAG_AA));
 
     // Test whether the old message can be updated
@@ -63,7 +61,7 @@ TEST_F(ResolverCacheTest, testUpdateMessage) {
     cache->update(new_msg);
 
     new_msg.makeResponse();
-    EXPECT_TRUE(cache->lookup(qname, qtype, klass, new_msg));
+    EXPECT_TRUE(cache->lookup(qname, RRType::SOA(), RRClass::IN(), new_msg));
     EXPECT_FALSE(new_msg.getHeaderFlag(Message::HEADERFLAG_AA));
 }
 #if 0
@@ -73,14 +71,12 @@ TEST_F(ResolverCacheTest, testUpdateRRset) {
     cache->update(msg);
 
     Name qname("example.com.");
-    RRType qtype(6);
-    RRClass klass(1);
 
     msg.makeResponse();
-    EXPECT_TRUE(cache->lookup(qname, qtype, klass, msg));
+    EXPECT_TRUE(cache->lookup(qname, RRType::SOA(), RRClass::IN(), msg));
 
     Message except_msg(Message::RENDER);
-    EXPECT_THROW(cache->lookup(qname, qtype, klass, except_msg), 
+    EXPECT_THROW(cache->lookup(qname, RRType::SOA(), RRClass::IN(), except_msg), 
                  MessageNoQuestionSection);
 
     // Get one rrset in the message, then use it to 
@@ -93,7 +89,7 @@ TEST_F(ResolverCacheTest, testUpdateRRset) {
     Message new_msg(Message::RENDER);
     Question question(qname, klass, RRType::NS());
     new_msg.addQuestion(question);
-    EXPECT_TRUE(cache->lookup(qname, RRType::NS(), klass, new_msg));
+    EXPECT_TRUE(cache->lookup(qname, RRType::NS(), RRClass::IN(), new_msg));
     EXPECT_EQ(0, sectionRRsetCount(new_msg, Message::SECTION_AUTHORITY));
     EXPECT_EQ(0, sectionRRsetCount(new_msg, Message::SECTION_ADDITIONAL));
 }
diff --git a/src/lib/cache/tests/rrset_entry_unittest.cc b/src/lib/cache/tests/rrset_entry_unittest.cc
index ceb66c9..ce6238f 100644
--- a/src/lib/cache/tests/rrset_entry_unittest.cc
+++ b/src/lib/cache/tests/rrset_entry_unittest.cc
@@ -86,6 +86,17 @@ TEST_F(RRsetEntryTest, updateTTL) {
     EXPECT_TRUE(rrset_entry.getTTL() < ttl);
 }
 
+TEST_F(RRsetEntryTest, TTLExpire) {
+    RRset exp_rrset(name, RRClass::IN(), RRType::A(), RRTTL(1));
+    RRsetEntry rrset_entry(exp_rrset, RRSET_TRUST_ANSWER_AA);
+    sleep(1);
+    uint32_t ttl = rrset_entry.getTTL();
+    EXPECT_LT(ttl, 1);
+    sleep(1);
+    ttl = rrset_entry.getTTL();
+    EXPECT_LT(ttl, 1);
+}
+
 TEST_F(RRsetEntryTest, getExpireTime){
     uint32_t exp_time = time(NULL) + TEST_TTL;
     EXPECT_EQ(exp_time, rrset_entry.getExpireTime());