Commit 52707b19 authored by Michal 'vorner' Vaner's avatar Michal 'vorner' Vaner
Browse files

[1793] Minor editorial fixes

parent f782145e
...@@ -270,7 +270,7 @@ private: ...@@ -270,7 +270,7 @@ private:
// Unfortunately, we need to walk the list to find the correct data // Unfortunately, we need to walk the list to find the correct data
// source. // source.
// TODO: Make it named sets. These lists are uncomfortable. // TODO: Make it named sets. These lists are uncomfortable.
for (size_t i(0); i < config->size(); ++ i) { for (size_t i(0); i < config->size(); ++i) {
// We use the getValue to get defaults as well // We use the getValue to get defaults as well
const ConstElementPtr dsrc_config(config->get(i)); const ConstElementPtr dsrc_config(config->get(i));
const ConstElementPtr class_config(dsrc_config->get("class")); const ConstElementPtr class_config(dsrc_config->get("class"));
...@@ -294,7 +294,7 @@ private: ...@@ -294,7 +294,7 @@ private:
} }
// Now we need to walk the zones and find the correct one. // Now we need to walk the zones and find the correct one.
for (size_t i(0); i < zone_list->size(); ++ i) { for (size_t i(0); i < zone_list->size(); ++i) {
const ConstElementPtr zone_config(zone_list->get(i)); const ConstElementPtr zone_config(zone_list->get(i));
if (Name(zone_config->get("origin")->stringValue()) == origin_) { if (Name(zone_config->get("origin")->stringValue()) == origin_) {
// The origins are the same, so we consider this config to be // The origins are the same, so we consider this config to be
......
...@@ -56,8 +56,6 @@ using namespace isc::auth::unittest; ...@@ -56,8 +56,6 @@ using namespace isc::auth::unittest;
namespace { namespace {
const char* const SPEC_FILE = AUTH_OBJ_DIR "/auth.spec";
class AuthCommandTest : public ::testing::Test { class AuthCommandTest : public ::testing::Test {
protected: protected:
AuthCommandTest() : AuthCommandTest() :
...@@ -262,6 +260,8 @@ TEST_F(AuthCommandTest, ...@@ -262,6 +260,8 @@ TEST_F(AuthCommandTest,
#endif #endif
) )
{ {
const char* const SPEC_FILE = AUTH_OBJ_DIR "/auth.spec";
// Prepare the database first // Prepare the database first
const string test_db = TEST_DATA_BUILDDIR "/auth_test.sqlite3.copied"; const string test_db = TEST_DATA_BUILDDIR "/auth_test.sqlite3.copied";
const string bad_db = TEST_DATA_BUILDDIR "/does-not-exist.sqlite3"; const string bad_db = TEST_DATA_BUILDDIR "/does-not-exist.sqlite3";
...@@ -319,6 +319,7 @@ TEST_F(AuthCommandTest, ...@@ -319,6 +319,7 @@ TEST_F(AuthCommandTest,
Element::fromJSON("{\"origin\": \"example.com\"}")); Element::fromJSON("{\"origin\": \"example.com\"}"));
checkAnswer(1); checkAnswer(1);
// The previous zone is not hurt in any way
EXPECT_EQ(ZoneFinder::SUCCESS, server_.getInMemoryClient(RRClass::IN())-> EXPECT_EQ(ZoneFinder::SUCCESS, server_.getInMemoryClient(RRClass::IN())->
findZone(Name("example.org")).zone_finder-> findZone(Name("example.org")).zone_finder->
find(Name("example.org"), RRType::SOA())->code); find(Name("example.org"), RRType::SOA())->code);
......
Supports Markdown
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