Browse Source

[1332] fixed a bug in the previous update to the test: termination condtion
was wrong.

JINMEI Tatuya 13 years ago
parent
commit
fdefb47da0
1 changed files with 3 additions and 5 deletions
  1. 3 5
      src/lib/datasrc/tests/database_unittest.cc

+ 3 - 5
src/lib/datasrc/tests/database_unittest.cc

@@ -1072,7 +1072,9 @@ public:
             ASSERT_TRUE(jnl_reader);
             ConstRRsetPtr rrset;
             vector<JournalEntry>::const_iterator it = expected.begin();
-            while ((rrset = jnl_reader->getNextDiff()) != NULL) {
+            for (rrset = jnl_reader->getNextDiff();
+                 rrset && it != expected.end();
+                 rrset = jnl_reader->getNextDiff(), ++it) {
                 typedef DatabaseAccessor Accessor;
                 RRsetPtr expected_rrset(
                     new RRset(Name((*it).data_[Accessor::DIFF_NAME]),
@@ -1084,10 +1086,6 @@ public:
                                        expected_rrset->getClass(),
                                        (*it).data_[Accessor::DIFF_RDATA]));
                 isc::testutils::rrsetCheck(expected_rrset, rrset);
-                ++it;
-                if (it == expected.end()) {
-                    break;
-                }
             }
             // We should have examined all entries of both expected and
             // actual data.