[svn] commit: r3461 - /branches/trac374/src/lib/datasrc/tests/sqlite3_unittest.cc
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Nov 5 10:01:50 UTC 2010
Author: jinmei
Date: Fri Nov 5 10:01:49 2010
New Revision: 3461
Log:
corrected writable data source result code in unit tests
Modified:
branches/trac374/src/lib/datasrc/tests/sqlite3_unittest.cc
Modified: branches/trac374/src/lib/datasrc/tests/sqlite3_unittest.cc
==============================================================================
--- branches/trac374/src/lib/datasrc/tests/sqlite3_unittest.cc (original)
+++ branches/trac374/src/lib/datasrc/tests/sqlite3_unittest.cc Fri Nov 5 10:01:49 2010
@@ -1563,7 +1563,7 @@
RRsetIterator begin, end;
begin = ixfr_msg.beginSection(Section::ANSWER());
end = ixfr_msg.endSection(Section::ANSWER());
- EXPECT_EQ(DataSrc::SUCCESS,
+ EXPECT_EQ(DataSrc::W_SUCCESS,
data_source.doIXFR(transaction1,
callbackHelperRRsetIterator,
&begin,
@@ -1580,7 +1580,7 @@
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.startTransaction(transaction2));
begin = ixfr_msg.beginSection(Section::ANSWER());
end = ixfr_msg.endSection(Section::ANSWER());
- EXPECT_EQ(DataSrc::SUCCESS,
+ EXPECT_EQ(DataSrc::W_SUCCESS,
data_source.doIXFR(transaction2,
isc::datasrc::callbackHelperRRsetIterator,
&begin,
@@ -1597,7 +1597,7 @@
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.startTransaction(transaction3));
begin = ixfr_msg.beginSection(Section::ANSWER());
end = ixfr_msg.endSection(Section::ANSWER());
- EXPECT_EQ(DataSrc::ERROR,
+ EXPECT_EQ(DataSrc::W_ERROR,
data_source.doIXFR(transaction3,
isc::datasrc::callbackHelperRRsetIterator,
&begin,
@@ -1625,7 +1625,7 @@
size_t i = 0;
DataSrcTransaction transaction1(&data_source, zone_name, RRClass::IN());
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.startTransaction(transaction1));
- ASSERT_EQ(DataSrc::SUCCESS,
+ ASSERT_EQ(DataSrc::W_SUCCESS,
data_source.doIXFR(transaction1,
isc::datasrc::callbackHelperRRsetVector, &rrsets, &i)
);
@@ -1639,7 +1639,7 @@
i = 0;
DataSrcTransaction transaction2(&data_source, zone_name, RRClass::IN());
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.startTransaction(transaction2));
- ASSERT_EQ(DataSrc::SUCCESS,
+ ASSERT_EQ(DataSrc::W_SUCCESS,
data_source.doIXFR(transaction2,
isc::datasrc::callbackHelperRRsetVector, &rrsets, &i)
);
@@ -1653,7 +1653,7 @@
i = 0;
DataSrcTransaction transaction3(&data_source, zone_name, RRClass::IN());
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.startTransaction(transaction3));
- ASSERT_EQ(DataSrc::ERROR,
+ ASSERT_EQ(DataSrc::W_ERROR,
data_source.doIXFR(transaction3,
isc::datasrc::callbackHelperRRsetVector, &rrsets, &i)
);
@@ -1677,7 +1677,7 @@
RRsetIterator begin, end;
begin = ixfr_msg.beginSection(Section::ANSWER());
end = ixfr_msg.endSection(Section::ANSWER());
- EXPECT_EQ(DataSrc::ERROR,
+ EXPECT_EQ(DataSrc::W_ERROR,
data_source.doIXFR(transaction1,
isc::datasrc::callbackHelperRRsetIterator,
&begin,
@@ -1702,16 +1702,16 @@
// bad qtype
update_msg.setOpcode(isc::dns::Opcode::QUERY());
- ASSERT_EQ(DataSrc::ERROR, data_source.doUpdate(transaction1, update_msg));
+ ASSERT_EQ(DataSrc::W_ERROR, data_source.doUpdate(transaction1, update_msg));
update_msg.setOpcode(isc::dns::Opcode::UPDATE());
// no/bad question section
- ASSERT_EQ(DataSrc::ERROR, data_source.doUpdate(transaction1, update_msg));
+ ASSERT_EQ(DataSrc::W_ERROR, data_source.doUpdate(transaction1, update_msg));
QuestionPtr bad_question(new Question(Name("example.com"), RRClass::CH(), RRType::A()));
update_msg.addQuestion(bad_question);
- ASSERT_EQ(DataSrc::ERROR, data_source.doUpdate(transaction1, update_msg));
+ ASSERT_EQ(DataSrc::W_ERROR, data_source.doUpdate(transaction1, update_msg));
// removeQuestion not implemented, reset msg
// checks, we delete one set, one name, one rr, add a set, and add to a set
@@ -1743,7 +1743,8 @@
Name("example.com"), RRClass::IN(), RRType::NS());
ASSERT_EQ(0, updateFromFile(update_msg, TEST_DATA_DIR "/update1.packet"));
- ASSERT_EQ(DataSrc::SUCCESS, data_source.doUpdate(transaction1, update_msg));
+ ASSERT_EQ(DataSrc::W_SUCCESS,
+ data_source.doUpdate(transaction1, update_msg));
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.commitTransaction(transaction1));
checkSingleRRset(data_source,
@@ -1784,7 +1785,7 @@
update_msg.setOpcode(isc::dns::Opcode::UPDATE());
// no/bad question section
- ASSERT_EQ(DataSrc::ERROR, data_source.doUpdate(transaction1, update_msg));
+ ASSERT_EQ(DataSrc::W_ERROR, data_source.doUpdate(transaction1, update_msg));
}
@@ -1802,23 +1803,23 @@
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.startTransaction(transaction1));
ASSERT_EQ(0, updateFromFile(update_msg, TEST_DATA_DIR "/update2.packet"));
- ASSERT_EQ(DataSrc::ERROR, data_source.doUpdate(transaction1, update_msg));
+ ASSERT_EQ(DataSrc::W_ERROR, data_source.doUpdate(transaction1, update_msg));
ASSERT_EQ(Rcode::NXRRSET(), update_msg.getRcode());
ASSERT_EQ(0, updateFromFile(update_msg, TEST_DATA_DIR "/update3.packet"));
- ASSERT_EQ(DataSrc::ERROR, data_source.doUpdate(transaction1, update_msg));
+ ASSERT_EQ(DataSrc::W_ERROR, data_source.doUpdate(transaction1, update_msg));
ASSERT_EQ(Rcode::NXDOMAIN(), update_msg.getRcode());
ASSERT_EQ(0, updateFromFile(update_msg, TEST_DATA_DIR "/update4.packet"));
- ASSERT_EQ(DataSrc::ERROR, data_source.doUpdate(transaction1, update_msg));
+ ASSERT_EQ(DataSrc::W_ERROR, data_source.doUpdate(transaction1, update_msg));
ASSERT_EQ(Rcode::NXRRSET(), update_msg.getRcode());
ASSERT_EQ(0, updateFromFile(update_msg, TEST_DATA_DIR "/update5.packet"));
- ASSERT_EQ(DataSrc::ERROR, data_source.doUpdate(transaction1, update_msg));
+ ASSERT_EQ(DataSrc::W_ERROR, data_source.doUpdate(transaction1, update_msg));
ASSERT_EQ(Rcode::YXRRSET(), update_msg.getRcode());
ASSERT_EQ(0, updateFromFile(update_msg, TEST_DATA_DIR "/update6.packet"));
- ASSERT_EQ(DataSrc::ERROR, data_source.doUpdate(transaction1, update_msg));
+ ASSERT_EQ(DataSrc::W_ERROR, data_source.doUpdate(transaction1, update_msg));
ASSERT_EQ(Rcode::YXDOMAIN(), update_msg.getRcode());
}
@@ -1837,8 +1838,8 @@
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.startTransaction(transaction1));
ASSERT_EQ(0, updateFromFile(update_msg, TEST_DATA_DIR "/update7.packet"));
- ASSERT_EQ(DataSrc::ERROR, data_source.doUpdate(transaction1, update_msg));
-
-}
-
-}
+ ASSERT_EQ(DataSrc::W_ERROR, data_source.doUpdate(transaction1, update_msg));
+
+}
+
+}
More information about the bind10-changes
mailing list