BIND 10 trac1183, updated. bdebd1afa4bf82120c66d9ee8d8cab500ab0b606 [1183] remove some unused code and fix a test

[BIND 10 source code commits]

The branch, trac1183 has been updated
       via  bdebd1afa4bf82120c66d9ee8d8cab500ab0b606 (commit)
      from  451086b203ef3e4611487630225a7650ad9322e7 (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 bdebd1afa4bf82120c66d9ee8d8cab500ab0b606
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Aug 18 16:43:36 2011 +0200

    [1183] remove some unused code and fix a test

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

Summary of changes:
 src/lib/datasrc/sqlite3_accessor.cc        |    2 +-
 src/lib/datasrc/tests/database_unittest.cc |   10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/sqlite3_accessor.cc b/src/lib/datasrc/sqlite3_accessor.cc
index 22473ea..78c5c78 100644
--- a/src/lib/datasrc/sqlite3_accessor.cc
+++ b/src/lib/datasrc/sqlite3_accessor.cc
@@ -429,7 +429,7 @@ private:
         ITT_NAME
     };
 
-    void copyColumn(std::string data[], int column) {
+    void copyColumn(std::string (&data)[COLUMN_COUNT], int column) {
         data[column] = convertToPlainChar(sqlite3_column_text(statement_,
                                                               column),
                                           database_->dbparameters_);
diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc
index f558598..e8998a5 100644
--- a/src/lib/datasrc/tests/database_unittest.cc
+++ b/src/lib/datasrc/tests/database_unittest.cc
@@ -238,12 +238,6 @@ public:
     virtual IteratorContextPtr getRecords(const Name& name, int id) const {
         if (id == 42) {
             return (IteratorContextPtr(new MockNameIteratorContext(*this, id, name)));
-        } else if (id == 13) {
-            return (IteratorContextPtr());
-        } else if (id == 0) {
-            return (IteratorContextPtr(new EmptyIteratorContext()));
-        } else if (id == -1) {
-            return (IteratorContextPtr(new BadIteratorContext()));
         } else {
             isc_throw(isc::Unexpected, "Unknown zone ID");
         }
@@ -890,7 +884,7 @@ TEST_F(DatabaseClientTest, find) {
     EXPECT_THROW(finder->find(isc::dns::Name("iscexception.in.search."),
                                               isc::dns::RRType::A(),
                                               NULL, ZoneFinder::FIND_DEFAULT),
-                 DataSourceError);
+                 isc::Exception);
     EXPECT_THROW(finder->find(isc::dns::Name("basicexception.in.search."),
                                               isc::dns::RRType::A(),
                                               NULL, ZoneFinder::FIND_DEFAULT),
@@ -903,7 +897,7 @@ TEST_F(DatabaseClientTest, find) {
     EXPECT_THROW(finder->find(isc::dns::Name("iscexception.in.getnext."),
                                               isc::dns::RRType::A(),
                                               NULL, ZoneFinder::FIND_DEFAULT),
-                 DataSourceError);
+                 isc::Exception);
     EXPECT_THROW(finder->find(isc::dns::Name("basicexception.in.getnext."),
                                               isc::dns::RRType::A(),
                                               NULL, ZoneFinder::FIND_DEFAULT),