[svn] commit: r3460 - in /branches/trac374/src/lib/datasrc: data_source.cc data_source.h sqlite3_datasrc.cc sqlite3_datasrc.h tests/sqlite3_unittest.cc
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Nov 5 09:38:19 UTC 2010
Author: jinmei
Date: Fri Nov 5 09:38:18 2010
New Revision: 3460
Log:
made trivial editorial changes:
- remove redundant white spaces
- fixed brace positions according to the coding guidelines
- removed unnecessary static keyword
- removed an unused and commented-out test case
Modified:
branches/trac374/src/lib/datasrc/data_source.cc
branches/trac374/src/lib/datasrc/data_source.h
branches/trac374/src/lib/datasrc/sqlite3_datasrc.cc
branches/trac374/src/lib/datasrc/sqlite3_datasrc.h
branches/trac374/src/lib/datasrc/tests/sqlite3_unittest.cc
Modified: branches/trac374/src/lib/datasrc/data_source.cc
==============================================================================
--- branches/trac374/src/lib/datasrc/data_source.cc (original)
+++ branches/trac374/src/lib/datasrc/data_source.cc Fri Nov 5 09:38:18 2010
@@ -1264,14 +1264,12 @@
}
DataSrc::WriteResult
-DataSrc::commitTransaction(DataSrcTransaction& transaction UNUSED_PARAM)
-{
+DataSrc::commitTransaction(DataSrcTransaction& transaction UNUSED_PARAM) {
return (W_NOT_IMPLEMENTED);
}
DataSrc::WriteResult
-DataSrc::rollbackTransaction(DataSrcTransaction& transaction UNUSED_PARAM)
-{
+DataSrc::rollbackTransaction(DataSrcTransaction& transaction UNUSED_PARAM) {
return (W_NOT_IMPLEMENTED);
}
@@ -1290,8 +1288,7 @@
}
DataSrc::WriteResult
-DataSrc::delZone(DataSrcTransaction& transaction UNUSED_PARAM)
-{
+DataSrc::delZone(DataSrcTransaction& transaction UNUSED_PARAM) {
return (W_NOT_IMPLEMENTED);
}
@@ -1325,7 +1322,8 @@
bool
DataSrc::haveRRset(DataSrcTransaction& transaction UNUSED_PARAM,
- ConstRRsetPtr rrset) {
+ ConstRRsetPtr rrset)
+{
RRsetList rrset_list;
Result result;
uint32_t flags = 0;
@@ -1387,7 +1385,7 @@
} else {
return (Rcode::FORMERR());
}
-
+
return (Rcode::NOERROR());
}
@@ -1399,7 +1397,7 @@
// we can roll back, we can process the RRsets one at a time
// TODO, NOTZONE check
-
+
RRType update_type = update->getType();
if (update->getClass() != RRClass::ANY()) {
// do we have a direct check in rrtype to see if a specific
@@ -1467,8 +1465,7 @@
}
isc::dns::RRsetPtr
-callbackHelperRRsetIterator(void* arg1, void* arg2)
-{
+callbackHelperRRsetIterator(void* arg1, void* arg2) {
RRsetIterator* cur = static_cast<RRsetIterator*>(arg1);
RRsetIterator* end = static_cast<RRsetIterator*>(arg2);
@@ -1482,9 +1479,7 @@
}
isc::dns::RRsetPtr
-callbackHelperRRsetVector(void *arg1,
- void *arg2)
-{
+callbackHelperRRsetVector(void *arg1, void *arg2) {
std::vector<RRsetPtr>* v = static_cast<std::vector<RRsetPtr>* >(arg1);
size_t* i = static_cast<size_t*>(arg2);
@@ -1502,7 +1497,7 @@
void* arg1, void* arg2)
{
WriteResult result;
-
+
if (transaction.getState() != DataSrcTransaction::RUNNING) {
return (W_ERROR);
}
@@ -1528,7 +1523,7 @@
if (result != W_SUCCESS) {
return (result);
}
-
+
while (next_rrset = nextRRset(arg1, arg2)) {
result = addRRset(transaction, next_rrset);
if (result != W_SUCCESS) {
@@ -1540,11 +1535,10 @@
bool deleting = true;
while (next_rrset = nextRRset(arg1, arg2)) {
-
// If we see a SOA, it means we are switching operations (either
// we start deleting or adding depending on what we were doing
// before.
- // We don't delete the actual SOA itself,
+ // We don't delete the actual SOA itself,
if (next_rrset->getType() == RRType::SOA()) {
// TODO: check if serial has increased compared to the last soa we saw
deleting = !deleting;
@@ -1588,7 +1582,8 @@
DataSrc::WriteResult
DataSrc::doUpdate(DataSrcTransaction& transaction UNUSED_PARAM,
- isc::dns::Message& msg UNUSED_PARAM) {
+ isc::dns::Message& msg UNUSED_PARAM)
+{
if (msg.getOpcode() != isc::dns::Opcode::UPDATE()) {
return (W_ERROR);
}
@@ -1634,7 +1629,7 @@
}
// do we need to do anything with additional?
-
+
return (W_SUCCESS);
}
@@ -1715,8 +1710,7 @@
}
DataSrc::WriteResult
-MetaDataSrc::commitTransaction(DataSrcTransaction& transaction UNUSED_PARAM)
-{
+MetaDataSrc::commitTransaction(DataSrcTransaction& transaction UNUSED_PARAM) {
return (W_NOT_IMPLEMENTED);
}
Modified: branches/trac374/src/lib/datasrc/data_source.h
==============================================================================
--- branches/trac374/src/lib/datasrc/data_source.h (original)
+++ branches/trac374/src/lib/datasrc/data_source.h Fri Nov 5 09:38:18 2010
@@ -90,7 +90,7 @@
/// (for instance for DataSrc::replaceZone and DataSrc::doIXFR)
/// This function takes a pointer to an std::vector<RRsetPtr> (arg1)
/// and a pointer to a size_t value (arg2).
-/// On each call, the RRsetPtr in the vector at arg1 at the position
+/// On each call, the RRsetPtr in the vector at arg1 at the position
/// at arg2 is returned, and arg2 is incremented with 1.
/// If the size_t value at arg2 is is equal to or greater than the
/// size of the vector, an empty ElementPtr() is returned.
@@ -230,7 +230,7 @@
/// commands later. When this transaction object is destroyed, and
/// the transaction has been started, but not committed (with
/// commitTransaction()), rollbackTransaction() in the
-/// data source is called. That way, we can make sure unfinished
+/// data source is called. That way, we can make sure unfinished
/// transactions do not linger.
///
/// To help prevent logic errors in the use of the transaction object,
@@ -247,10 +247,10 @@
/// that transaction. One example is that for the Sqlite3-data source,
/// it stores the zone_id value. Datasources can store arbitrary data
/// in the ElementPtr() returned by getData().
-///
-/// This class always stores some basic information, given at
-/// instantiation time. Apart from the getters and setters for these,
-/// and the desctructor, this class should not have any methods that
+///
+/// This class always stores some basic information, given at
+/// instantiation time. Apart from the getters and setters for these,
+/// and the desctructor, this class should not have any methods that
/// contain logic.
///
class DataSrcTransaction {
@@ -305,7 +305,7 @@
/// by the data source, in the startTransaction() method.
/// \param data The ElementPtr containing data
void setData(isc::data::ElementPtr data) { _data = data; };
-
+
/// \brief Returns the name of the zone this transaction is about
/// \return zone name
const isc::dns::Name getZoneName() { return (_zone_name); };
@@ -424,7 +424,7 @@
/// \param transaction to be committed.
/// \return W_SUCCESS on success, error value otherwise
virtual WriteResult commitTransaction(DataSrcTransaction& transaction);
-
+
/// \brief Roll back the changes made in the given transaction
/// The transaction object must be in state RUNNING.
/// On successs, the transaction will be in state DONE.
@@ -439,7 +439,6 @@
/// \param W_SUCCESS on success.
virtual WriteResult addRRset(DataSrcTransaction& transaction,
isc::dns::ConstRRsetPtr rrset);
-
/// \brief Delete an RRset from the zone.
/// If the given RRset contains no Rdata parts, all RRs with
/// the name, type and class of the given rrset are deleted.
@@ -450,7 +449,7 @@
/// \param W_SUCCESS on success.
virtual WriteResult delRRset(DataSrcTransaction& transaction,
isc::dns::ConstRRsetPtr rrset);
-
+
/// \brief Remove an entire zone from the data source
/// Removes all records for the zone, and the zone itself from
/// the datasource.
@@ -487,7 +486,7 @@
/// These functions have a default implementation, and do not
/// need to be overridden. They can be, if the data source can make
/// use of specific knowledge about the backend.
-
+
//@{
/// \brief Checks whether an RRset exists
/// If the given RRset is of class NONE or ANY, it will check if
@@ -577,7 +576,7 @@
void addDataSrc(ConstDataSrcPtr data_src);
void removeDataSrc(ConstDataSrcPtr data_src);
size_t dataSrcCount() { return (data_sources.size()); }
-
+
void findClosestEnclosure(DataSrcMatch& match) const;
// Actual queries for data should not be sent to a MetaDataSrc object,
@@ -629,7 +628,7 @@
const bool create_zone);
virtual WriteResult commitTransaction(DataSrcTransaction& transaction);
virtual WriteResult rollbackTransaction(DataSrcTransaction& transaction);
-
+
virtual WriteResult addRRset(DataSrcTransaction& transaction,
isc::dns::ConstRRsetPtr rrset);
virtual WriteResult delRRset(DataSrcTransaction& transaction,
@@ -700,7 +699,7 @@
/// \brief Returns the best enclosing zone name found for the given
// name and RR class so far.
- ///
+ ///
/// \return A pointer to the zone apex \c Name, NULL if none found yet.
///
/// This method never throws an exception.
Modified: branches/trac374/src/lib/datasrc/sqlite3_datasrc.cc
==============================================================================
--- branches/trac374/src/lib/datasrc/sqlite3_datasrc.cc (original)
+++ branches/trac374/src/lib/datasrc/sqlite3_datasrc.cc Fri Nov 5 09:38:18 2010
@@ -704,7 +704,6 @@
initializer->params_.w_del_rr_ = prepare(db, w_del_rr_str);
initializer->params_.w_del_all_ = prepare(db, w_del_all_str);
initializer->params_.w_del_zone_ = prepare(db, w_del_zone_str);
-
}
}
@@ -800,7 +799,7 @@
int zone_id = hasExactZone(transaction.getZoneName().toText().c_str());
if (zone_id <= 0) {
if (new_zone) {
- DataSrc::WriteResult add_zone_res =
+ DataSrc::WriteResult add_zone_res =
addZone(transaction.getZoneName(),
isc::dns::RRClass::IN());
if (add_zone_res != DataSrc::W_SUCCESS) {
@@ -836,8 +835,9 @@
return (DataSrc::W_ERROR);
}
- int result = sqlite3_exec(dbparameters->db_, w_commit_transaction_str, NULL, NULL, NULL);
-
+ int result = sqlite3_exec(dbparameters->db_, w_commit_transaction_str,
+ NULL, NULL, NULL);
+
if (result == SQLITE_OK) {
transaction.setState(DataSrcTransaction::DONE);
return (DataSrc::W_SUCCESS);
@@ -847,8 +847,7 @@
}
DataSrc::WriteResult
-Sqlite3DataSrc::rollbackTransaction(DataSrcTransaction& transaction)
-{
+Sqlite3DataSrc::rollbackTransaction(DataSrcTransaction& transaction) {
if (transaction.getState() != DataSrcTransaction::RUNNING) {
return (DataSrc::W_ERROR);
}
@@ -867,7 +866,7 @@
const isc::dns::RRClass& rrclass)
{
sqlite3_stmt* query = dbparameters->w_add_zone_;
-
+
sqlite3_reset(query);
sqlite3_clear_bindings(query);
@@ -878,7 +877,7 @@
isc_throw(Sqlite3Error, "Could not bind name " << s_name <<
" to SQL statement (query)");
}
-
+
rc = sqlite3_bind_text(query, 2, rrclass.toText().c_str(), -1,
SQLITE_TRANSIENT);
if (rc != SQLITE_OK) {
@@ -904,9 +903,8 @@
const isc::dns::RRTTL& rrttl,
const isc::dns::rdata::Rdata& rdata)
{
-
sqlite3_stmt* query = dbparameters->w_add_rr_;
-
+
sqlite3_reset(query);
sqlite3_clear_bindings(query);
@@ -998,7 +996,7 @@
const isc::dns::RRType& rrtype)
{
sqlite3_stmt* query = dbparameters->w_del_rr_;
-
+
sqlite3_reset(query);
sqlite3_clear_bindings(query);
@@ -1057,7 +1055,7 @@
const isc::dns::rdata::Rdata& rdata)
{
sqlite3_stmt* query = dbparameters->w_del_rr_;
-
+
sqlite3_reset(query);
sqlite3_clear_bindings(query);
@@ -1105,10 +1103,9 @@
}
DataSrc::WriteResult
-Sqlite3DataSrc::delAll(int zone_id)
-{
+Sqlite3DataSrc::delAll(int zone_id) {
sqlite3_stmt* query = dbparameters->w_del_all_;
-
+
sqlite3_reset(query);
sqlite3_clear_bindings(query);
@@ -1161,8 +1158,7 @@
}
DataSrc::WriteResult
-Sqlite3DataSrc::delZone(DataSrcTransaction& transaction)
-{
+Sqlite3DataSrc::delZone(DataSrcTransaction& transaction) {
if (transaction.getState() != DataSrcTransaction::RUNNING) {
return (DataSrc::W_ERROR);
}
@@ -1175,7 +1171,7 @@
}
sqlite3_stmt* query = dbparameters->w_del_zone_;
-
+
sqlite3_reset(query);
sqlite3_clear_bindings(query);
@@ -1206,7 +1202,7 @@
}
int zone_id = transaction.getData()->get("zone_id")->intValue();
-
+
DataSrc::WriteResult result = DataSrc::W_SUCCESS;
if (rrset->getRdataCount() > 0) {
Modified: branches/trac374/src/lib/datasrc/sqlite3_datasrc.h
==============================================================================
--- branches/trac374/src/lib/datasrc/sqlite3_datasrc.h (original)
+++ branches/trac374/src/lib/datasrc/sqlite3_datasrc.h Fri Nov 5 09:38:18 2010
@@ -111,7 +111,7 @@
bool create_zone = false);
WriteResult commitTransaction(DataSrcTransaction& transaction);
WriteResult rollbackTransaction(DataSrcTransaction& transaction);
-
+
WriteResult addRRset(DataSrcTransaction& transaction,
isc::dns::ConstRRsetPtr rrset);
WriteResult delRRset(DataSrcTransaction& transaction,
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 09:38:18 2010
@@ -973,10 +973,10 @@
// use our copied writable datasource db
ASSERT_EQ(DataSrc::SUCCESS, data_source.close());
ASSERT_EQ(DataSrc::SUCCESS, data_source.init(SQLITE_DBFILE_WRITE));
-
+
DataSrcTransaction transaction(&data_source, zone_name, RRClass::IN());
EXPECT_EQ(DataSrcTransaction::INIT, transaction.getState());
-
+
// start doing things without calling startTransaction()
EXPECT_EQ(DataSrc::W_ERROR,
data_source.commitTransaction(transaction));
@@ -1037,7 +1037,7 @@
data_source.addRRset(transaction1, new_rrset));
EXPECT_EQ(DataSrc::W_SUCCESS,
data_source.rollbackTransaction(transaction1));
-
+
// check whether our new record does not exist
EXPECT_EQ(DataSrc::SUCCESS,
data_source.findAddrs(new_rrset->getName(), new_rrset->getClass(),
@@ -1139,7 +1139,7 @@
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.startTransaction(transaction2));
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.replaceZone(transaction2, NULL));
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.commitTransaction(transaction2));
-
+
// check whether it's gone now
EXPECT_EQ(DataSrc::SUCCESS,
data_source.findRRset(www_name, RRClass::IN(), RRType::A(),
@@ -1188,7 +1188,7 @@
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.startTransaction(transaction2));
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.replaceZone(transaction2, getRRsetCallback_empty));
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.commitTransaction(transaction2));
-
+
// check whether it's gone now
EXPECT_EQ(DataSrc::SUCCESS,
data_source.findRRset(www_name, RRClass::IN(), RRType::A(),
@@ -1234,7 +1234,7 @@
// Replace them, commit
size_t i = 0;
-
+
DataSrcTransaction transaction2(&data_source, soa_rrset->getName(), RRClass::IN());
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.startTransaction(transaction2, true));
ASSERT_EQ(DataSrc::W_SUCCESS,
@@ -1242,7 +1242,7 @@
isc::datasrc::callbackHelperRRsetVector,
&rrsets, &i));
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.commitTransaction(transaction2));
-
+
// and check if the new record exists
EXPECT_EQ(DataSrc::SUCCESS,
data_source.findExactRRset(a_rrset->getName(), a_rrset->getClass(), a_rrset->getType(),
@@ -1285,7 +1285,7 @@
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.startTransaction(transaction2));
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.delZone(transaction2));
ASSERT_EQ(DataSrc::W_SUCCESS, data_source.commitTransaction(transaction2));
-
+
// check whether it's gone now
EXPECT_EQ(DataSrc::SUCCESS,
data_source.findRRset(www_name, RRClass::IN(), RRType::A(),
@@ -1296,13 +1296,10 @@
// try to start a transaction for the zone that is now gone
DataSrcTransaction transaction3(&data_source, zone_name, RRClass::IN());
EXPECT_EQ(DataSrc::W_NO_SUCH_ZONE, data_source.startTransaction(transaction3));
-
-}
-
-
-static QuestionPtr
-questionFromFile(ifstream& file)
-{
+}
+
+QuestionPtr
+questionFromFile(ifstream& file) {
string s;
file >> s;
if (s == "") {
@@ -1325,9 +1322,8 @@
return (question);
}
-static RRsetPtr
-rrsetFromFile(ifstream& file)
-{
+RRsetPtr
+rrsetFromFile(ifstream& file) {
string s;
file >> s;
if (s == "") {
@@ -1389,8 +1385,7 @@
// returns 0 if eof reached
int
-rrsetsFromFile(ifstream& file, Message& msg, Section section)
-{
+rrsetsFromFile(ifstream& file, Message& msg, Section section) {
RRsetPtr prev_rrset = RRsetPtr();
while (! file.eof() ) {
RRsetPtr rrset = rrsetFromFile(file);
@@ -1423,8 +1418,7 @@
}
int
-rrsetsFromFile(ifstream& file, std::vector<RRsetPtr>& container)
-{
+rrsetsFromFile(ifstream& file, std::vector<RRsetPtr>& container) {
RRsetPtr prev_rrset = RRsetPtr();
while (! file.eof() ) {
RRsetPtr rrset = rrsetFromFile(file);
@@ -1457,8 +1451,7 @@
}
int
-rrsetsFromFile(const char* file_name, std::vector<RRsetPtr>& container)
-{
+rrsetsFromFile(const char* file_name, std::vector<RRsetPtr>& container) {
ifstream myfile(file_name);
if (myfile.is_open()) {
rrsetsFromFile(myfile, container);
@@ -1469,7 +1462,7 @@
return (0);
}
-static int
+int
ixfrFromFile(Message& m, const char* file_name) {
ifstream myfile(file_name);
@@ -1487,7 +1480,7 @@
return (0);
}
-static int
+int
updateFromFile(Message& m, const char* file_name) {
ifstream myfile(file_name);
@@ -1521,7 +1514,7 @@
}
// check a single rrset for exact match including rdata
-static void
+void
checkSingleRRset(const DataSrc& data_source,
const std::string& expected,
const Name& name,
@@ -1549,7 +1542,6 @@
}
}
-/*
TEST_F(Sqlite3DataSourceTest, ixfr_ok_message) {
// reset database
ASSERT_EQ(0, install_writable_database());
@@ -1561,62 +1553,7 @@
checkSingleRRset(data_source,
"www.example.com. 3600 IN A 192.0.2.1\n",
www_name, RRClass::IN(), RRType::A());
-
- Message ixfr_msg(Message::RENDER);
- ASSERT_EQ(0, ixfrFromFile(ixfr_msg, TEST_DATA_DIR "/ixfr_ok.rrs"));
-
- // do IXFR, roll back
- DataSrcTransaction transaction1(&data_source, zone_name, RRClass::IN());
- ASSERT_EQ(DataSrc::W_SUCCESS, data_source.startTransaction(transaction1));
- EXPECT_EQ(DataSrc::SUCCESS,
- data_source.doIXFR(transaction1,
- ixfr_msg.beginSection(Section::ANSWER()),
- ixfr_msg.endSection(Section::ANSWER()))
- );
- ASSERT_EQ(DataSrc::W_SUCCESS, data_source.rollbackTransaction(transaction1));
-
- checkSingleRRset(data_source,
- "www.example.com. 3600 IN A 192.0.2.1\n",
- www_name, RRClass::IN(), RRType::A());
-
- // do IXFR, commit
- DataSrcTransaction transaction2(&data_source, zone_name, RRClass::IN());
- ASSERT_EQ(DataSrc::W_SUCCESS, data_source.startTransaction(transaction2));
- EXPECT_EQ(DataSrc::SUCCESS,
- data_source.doIXFR(transaction2,
- ixfr_msg.beginSection(Section::ANSWER()),
- ixfr_msg.endSection(Section::ANSWER()))
- );
- ASSERT_EQ(DataSrc::W_SUCCESS, data_source.commitTransaction(transaction2));
-
- checkSingleRRset(data_source,
- "www.example.com. 3600 IN A 192.0.2.3\n",
- www_name, RRClass::IN(), RRType::A());
-
- // same IXFR should now fail, because the start serial doesn't match
- DataSrcTransaction transaction3(&data_source, zone_name, RRClass::IN());
- ASSERT_EQ(DataSrc::W_SUCCESS, data_source.startTransaction(transaction3));
- EXPECT_EQ(DataSrc::ERROR,
- data_source.doIXFR(transaction3,
- ixfr_msg.beginSection(Section::ANSWER()),
- ixfr_msg.endSection(Section::ANSWER()))
- );
- ASSERT_EQ(DataSrc::W_SUCCESS, data_source.rollbackTransaction(transaction3));
-}
-*/
-
-TEST_F(Sqlite3DataSourceTest, ixfr_ok_message) {
- // reset database
- ASSERT_EQ(0, install_writable_database());
-
- // use our copied writable datasource db
- ASSERT_EQ(DataSrc::SUCCESS, data_source.close());
- ASSERT_EQ(DataSrc::SUCCESS, data_source.init(SQLITE_DBFILE_WRITE));
-
- checkSingleRRset(data_source,
- "www.example.com. 3600 IN A 192.0.2.1\n",
- www_name, RRClass::IN(), RRType::A());
-
+
Message ixfr_msg(Message::RENDER);
ASSERT_EQ(0, ixfrFromFile(ixfr_msg, TEST_DATA_DIR "/ixfr_ok.rrs"));
@@ -1752,7 +1689,7 @@
TEST_F(Sqlite3DataSourceTest, dynamic_update) {
// reset database
ASSERT_EQ(0, install_writable_database());
-
+
// use our copied writable datasource db
ASSERT_EQ(DataSrc::SUCCESS, data_source.close());
ASSERT_EQ(DataSrc::SUCCESS, data_source.init(SQLITE_DBFILE_WRITE));
@@ -1779,7 +1716,7 @@
// removeQuestion not implemented, reset msg
// checks, we delete one set, one name, one rr, add a set, and add to a set
// delete ip46 A rrset
- // delete all from www.example.com
+ // delete all from www.example.com
// delete 1 mx record
// add newaddr.example.com 192.0.2.21
// add dns04.example.com
@@ -1828,13 +1765,12 @@
"example.com. 3600 IN NS dns04.example.com.\n"
,
Name("example.com"), RRClass::IN(), RRType::NS());
-
}
TEST_F(Sqlite3DataSourceTest, dynamic_update_bad_class) {
// reset database
ASSERT_EQ(0, install_writable_database());
-
+
// use our copied writable datasource db
ASSERT_EQ(DataSrc::SUCCESS, data_source.close());
ASSERT_EQ(DataSrc::SUCCESS, data_source.init(SQLITE_DBFILE_WRITE));
@@ -1855,7 +1791,7 @@
TEST_F(Sqlite3DataSourceTest, dynamic_update_prereq_fails) {
// reset database
ASSERT_EQ(0, install_writable_database());
-
+
// use our copied writable datasource db
ASSERT_EQ(DataSrc::SUCCESS, data_source.close());
ASSERT_EQ(DataSrc::SUCCESS, data_source.init(SQLITE_DBFILE_WRITE));
@@ -1890,7 +1826,7 @@
TEST_F(Sqlite3DataSourceTest, dynamic_update_bad_update) {
// reset database
ASSERT_EQ(0, install_writable_database());
-
+
// use our copied writable datasource db
ASSERT_EQ(DataSrc::SUCCESS, data_source.close());
ASSERT_EQ(DataSrc::SUCCESS, data_source.init(SQLITE_DBFILE_WRITE));
More information about the bind10-changes
mailing list