Commit d00042b0 authored by Michal 'vorner' Vaner's avatar Michal 'vorner' Vaner
Browse files

[1061] Rename missing names

Some "Conn" variables were left out and forgotten in previous renames,
fixing what could be found.
parent 65e4595c
......@@ -413,7 +413,7 @@ Debug information. An instance of SQLite data source is being created.
% DATASRC_SQLITE_DESTROY SQLite data source destroyed
Debug information. An instance of SQLite data source is being destroyed.
% DATASRC_SQLITE_DROPCONN SQLite3Connection is being deinitialized
% DATASRC_SQLITE_DROPCONN SQLite3Database is being deinitialized
The object around a database connection is being destroyed.
% DATASRC_SQLITE_ENCLOSURE looking for zone containing '%1'
......@@ -468,7 +468,7 @@ source.
The SQLite data source was asked to provide a NSEC3 record for given zone.
But it doesn't contain that zone.
% DATASRC_SQLITE_NEWCONN SQLite3Connection is being initialized
% DATASRC_SQLITE_NEWCONN SQLite3Database is being initialized
A wrapper object to hold database connection is being initialized.
% DATASRC_SQLITE_OPEN opening SQLite database '%1'
......
......@@ -91,7 +91,7 @@ TEST_F(DatabaseClientTest, superZone) {
checkZoneFinder(zone);
}
TEST_F(DatabaseClientTest, noConnException) {
TEST_F(DatabaseClientTest, noAccessorException) {
EXPECT_THROW(DatabaseClient(shared_ptr<DatabaseAccessor>()),
isc::InvalidParameter);
}
......
......@@ -64,13 +64,13 @@ TEST(SQLite3Open, memoryDB) {
}
// Test fixture for querying the db
class SQLite3Conn : public ::testing::Test {
class SQLite3Access : public ::testing::Test {
public:
SQLite3Conn() {
initConn(SQLITE_DBFILE_EXAMPLE, RRClass::IN());
SQLite3Access() {
initAccessor(SQLITE_DBFILE_EXAMPLE, RRClass::IN());
}
// So it can be re-created with different data
void initConn(const std::string& filename, const RRClass& rrclass) {
void initAccessor(const std::string& filename, const RRClass& rrclass) {
db.reset(new SQLite3Database(filename, rrclass));
}
// The tested db
......@@ -78,25 +78,25 @@ public:
};
// This zone exists in the data, so it should be found
TEST_F(SQLite3Conn, getZone) {
TEST_F(SQLite3Access, getZone) {
std::pair<bool, int> result(db->getZone(Name("example.com")));
EXPECT_TRUE(result.first);
EXPECT_EQ(1, result.second);
}
// But it should find only the zone, nothing below it
TEST_F(SQLite3Conn, subZone) {
TEST_F(SQLite3Access, subZone) {
EXPECT_FALSE(db->getZone(Name("sub.example.com")).first);
}
// This zone is not there at all
TEST_F(SQLite3Conn, noZone) {
TEST_F(SQLite3Access, noZone) {
EXPECT_FALSE(db->getZone(Name("example.org")).first);
}
// This zone is there, but in different class
TEST_F(SQLite3Conn, noClass) {
initConn(SQLITE_DBFILE_EXAMPLE, RRClass::CH());
TEST_F(SQLite3Access, noClass) {
initAccessor(SQLITE_DBFILE_EXAMPLE, RRClass::CH());
EXPECT_FALSE(db->getZone(Name("example.com")).first);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment