BIND 10 trac2986test, updated. d763704c84807c6efb475f1dcab8118f4deeb343 [2986test] unittest of auth counters changed to use unsigned long long int.
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Jun 17 11:12:40 UTC 2013
The branch, trac2986test has been updated
via d763704c84807c6efb475f1dcab8118f4deeb343 (commit)
from 554a52af838c0d11b93a4debba3a52f80e08ec72 (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 d763704c84807c6efb475f1dcab8118f4deeb343
Author: Kazunori Fujiwara <fujiwara at wide.ad.jp>
Date: Mon Jun 17 20:05:55 2013 +0900
[2986test] unittest of auth counters changed to use unsigned long long int.
-----------------------------------------------------------------------
Summary of changes:
src/bin/auth/tests/auth_srv_unittest.cc | 56 +++++++++++++++----------------
src/bin/auth/tests/statistics_util.cc | 13 ++++---
src/bin/auth/tests/statistics_util.h | 2 +-
src/lib/cc/data.h | 2 +-
src/lib/cc/session.cc | 4 +--
5 files changed, 40 insertions(+), 37 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/auth/tests/auth_srv_unittest.cc b/src/bin/auth/tests/auth_srv_unittest.cc
index f17d91e..99d3ffb 100644
--- a/src/bin/auth/tests/auth_srv_unittest.cc
+++ b/src/bin/auth/tests/auth_srv_unittest.cc
@@ -142,7 +142,7 @@ protected:
// Checks whether all Rcode counters are set to zero except the given
// rcode (it is checked to be set to 'value')
- void checkAllRcodeCountersZeroExcept(const Rcode& rcode, int value) const {
+ void checkAllRcodeCountersZeroExcept(const Rcode& rcode, unsigned long long value) const {
std::string target_rcode_name = rcode.toText();
std::transform(target_rcode_name.begin(), target_rcode_name.end(),
target_rcode_name.begin(), ::tolower);
@@ -157,9 +157,9 @@ protected:
++i)
{
if (i->first.compare(target_rcode_name) == 0) {
- checkRcodeCounter(i->first, i->second->intValue(), value);
+ checkRcodeCounter(i->first, i->second->uint64Value(), value);
} else {
- checkRcodeCounter(i->first, i->second->intValue(), 0);
+ checkRcodeCounter(i->first, i->second->uint64Value(), 0);
}
}
}
@@ -197,7 +197,7 @@ protected:
// Check if the counters exist and are initialized to 0.
void
checkCountersAreInitialized() {
- const std::map<std::string, int> expect;
+ const std::map<std::string, unsigned long long int> expect;
ConstElementPtr stats = server.getStatistics()->
get("zones")->get("_SERVER_");
checkStatisticsCounters(stats, expect);
@@ -314,7 +314,7 @@ TEST_F(AuthSrvTest, noClientList) {
ConstElementPtr stats_after = server.getStatistics()->get("zones")->
get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.udp"] = 1;
expect["opcode.query"] = 1;
@@ -345,7 +345,7 @@ TEST_F(AuthSrvTest, shortMessage) {
ConstElementPtr stats_after = server.getStatistics()->get("zones")->
get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.udp"] = 1;
checkStatisticsCounters(stats_after, expect);
@@ -359,7 +359,7 @@ TEST_F(AuthSrvTest, response) {
ConstElementPtr stats_after = server.getStatistics()->get("zones")->
get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 3;
expect["request.udp"] = 3;
checkStatisticsCounters(stats_after, expect);
@@ -370,7 +370,7 @@ TEST_F(AuthSrvTest, shortQuestion) {
shortQuestion();
ConstElementPtr stats_after = server.getStatistics()->get("zones")->
get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.udp"] = 1;
expect["opcode.query"] = 1;
@@ -385,7 +385,7 @@ TEST_F(AuthSrvTest, shortAnswer) {
shortAnswer();
ConstElementPtr stats_after = server.getStatistics()->get("zones")->
get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.udp"] = 1;
expect["opcode.query"] = 1;
@@ -401,7 +401,7 @@ TEST_F(AuthSrvTest, ednsBadVers) {
ConstElementPtr stats_after = server.getStatistics()->get("zones")->
get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.badednsver"] = 1;
expect["request.udp"] = 1;
@@ -431,7 +431,7 @@ TEST_F(AuthSrvTest, AXFRSuccess) {
ConstElementPtr stats_after = server.getStatistics()->get("zones")->
get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.tcp"] = 1;
expect["opcode.query"] = 1;
@@ -473,7 +473,7 @@ TEST_F(AuthSrvTest, TSIGSignedBadKey) {
checkAllRcodeCountersZeroExcept(Rcode::NOTAUTH(), 1);
ConstElementPtr stats_after = server.getStatistics()->get("zones")->
get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.tsig"] = 1;
expect["request.badsig"] = 1;
@@ -519,7 +519,7 @@ TEST_F(AuthSrvTest, TSIGBadSig) {
ConstElementPtr stats_after = server.getStatistics()->get("zones")->
get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.tsig"] = 1;
expect["request.badsig"] = 1;
@@ -568,7 +568,7 @@ TEST_F(AuthSrvTest, TSIGCheckFirst) {
ConstElementPtr stats_after = server.getStatistics()->get("zones")->
get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.tsig"] = 1;
expect["request.badsig"] = 1;
@@ -738,7 +738,7 @@ TEST_F(AuthSrvTest, notify) {
ConstElementPtr stats_after = server.getStatistics()->get("zones")->
get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.udp"] = 1;
expect["opcode.notify"] = 1;
@@ -769,7 +769,7 @@ TEST_F(AuthSrvTest, notifyForCHClass) {
ConstElementPtr stats_after = server.getStatistics()->get("zones")->
get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.udp"] = 1;
expect["opcode.notify"] = 1;
@@ -794,7 +794,7 @@ TEST_F(AuthSrvTest, notifyEmptyQuestion) {
ConstElementPtr stats_after = server.getStatistics()->get("zones")->
get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.udp"] = 1;
expect["opcode.notify"] = 1;
@@ -1032,7 +1032,7 @@ TEST_F(AuthSrvTest, TSIGSigned) {
checkAllRcodeCountersZeroExcept(Rcode::NOERROR(), 1);
ConstElementPtr stats_after = server.getStatistics()->get("zones")->
get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.tsig"] = 1;
expect["request.udp"] = 1;
@@ -1156,7 +1156,7 @@ TEST_F(AuthSrvTest, datasourceFail) {
checkAllRcodeCountersZeroExcept(Rcode::SERVFAIL(), 1);
ConstElementPtr stats = server.getStatistics()->get("zones")->
get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.udp"] = 1;
expect["opcode.query"] = 1;
@@ -1232,7 +1232,7 @@ TEST_F(AuthSrvTest, emptyZone) {
checkAllRcodeCountersZeroExcept(Rcode::SERVFAIL(), 1);
ConstElementPtr stats = server.getStatistics()->get("zones")->
get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.udp"] = 1;
expect["opcode.query"] = 1;
@@ -1309,7 +1309,7 @@ TEST_F(AuthSrvTest, queryCounterTruncTest) {
ConstElementPtr stats_after = server.getStatistics()->
get("zones")->get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.udp"] = 1;
expect["opcode.query"] = 1;
@@ -1332,7 +1332,7 @@ TEST_F(AuthSrvTest, queryCounterUDPNormal) {
ConstElementPtr stats_after = server.getStatistics()->
get("zones")->get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.udp"] = 1;
expect["opcode.query"] = 1;
@@ -1355,7 +1355,7 @@ TEST_F(AuthSrvTest, queryCounterUDPNormalWithDNSSEC) {
ConstElementPtr stats_after = server.getStatistics()->
get("zones")->get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.edns0"] = 1;
expect["request.udp"] = 1;
@@ -1383,7 +1383,7 @@ TEST_F(AuthSrvTest, queryCounterTCPNormal) {
ConstElementPtr stats_after = server.getStatistics()->
get("zones")->get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.tcp"] = 1;
expect["opcode.query"] = 1;
@@ -1407,7 +1407,7 @@ TEST_F(AuthSrvTest, queryCounterTCPAXFR) {
ConstElementPtr stats_after = server.getStatistics()->
get("zones")->get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.tcp"] = 1;
expect["opcode.query"] = 1;
@@ -1427,7 +1427,7 @@ TEST_F(AuthSrvTest, queryCounterTCPIXFR) {
ConstElementPtr stats_after = server.getStatistics()->
get("zones")->get("_SERVER_");
- std::map<std::string, int> expect;
+ std::map<std::string, unsigned long long int> expect;
expect["request.v4"] = 1;
expect["request.tcp"] = 1;
expect["opcode.query"] = 1;
@@ -1455,7 +1455,7 @@ TEST_F(AuthSrvTest, queryCounterOpcodes) {
// The counter should be initialized to expected value.
EXPECT_EQ(expected - (i + 1),
server.getStatistics()->get("zones")->get("_SERVER_")->
- get("opcode")->get(item_name)->intValue());
+ get("opcode")->get(item_name)->uint64Value());
// For each possible opcode, create a request message and send it
UnitTestUtil::createRequestMessage(request_message, Opcode(i),
@@ -1477,7 +1477,7 @@ TEST_F(AuthSrvTest, queryCounterOpcodes) {
// depends on the opcode.
EXPECT_EQ(expected,
server.getStatistics()->get("zones")->get("_SERVER_")->
- get("opcode")->get(item_name)->intValue());
+ get("opcode")->get(item_name)->uint64Value());
}
}
diff --git a/src/bin/auth/tests/statistics_util.cc b/src/bin/auth/tests/statistics_util.cc
index bb2cd5c..5a91994 100644
--- a/src/bin/auth/tests/statistics_util.cc
+++ b/src/bin/auth/tests/statistics_util.cc
@@ -21,7 +21,7 @@
namespace {
void
-flatten(std::map<std::string, int>& flat_map, const std::string& prefix,
+flatten(std::map<std::string, unsigned long long int>& flat_map, const std::string& prefix,
const isc::data::ConstElementPtr map_element)
{
std::map<std::string, isc::data::ConstElementPtr> map =
@@ -38,6 +38,9 @@ flatten(std::map<std::string, int>& flat_map, const std::string& prefix,
case isc::data::Element::integer:
flat_map[prefix + i->first] = i->second->intValue();
break;
+ case isc::data::Element::uint64:
+ flat_map[prefix + i->first] = i->second->uint64Value();
+ break;
default:
FAIL() << "Element Parse Error";
}
@@ -51,17 +54,17 @@ namespace unittest {
void
checkStatisticsCounters(const isc::data::ConstElementPtr counters,
- const std::map<std::string, int>& expect)
+ const std::map<std::string, unsigned long long int>& expect)
{
- std::map<std::string, int> stats_map;
+ std::map<std::string, unsigned long long int> stats_map;
flatten(stats_map, "", counters);
- for (std::map<std::string, int>::const_iterator
+ for (std::map<std::string, unsigned long long int>::const_iterator
i = stats_map.begin(), e = stats_map.end();
i != e;
++i)
{
- const int value =
+ const unsigned long long int value =
expect.find(i->first) == expect.end() ?
0 : expect.find(i->first)->second;
EXPECT_EQ(value, i->second) << "Expected counter "
diff --git a/src/bin/auth/tests/statistics_util.h b/src/bin/auth/tests/statistics_util.h
index b01a016..a751b7d 100644
--- a/src/bin/auth/tests/statistics_util.h
+++ b/src/bin/auth/tests/statistics_util.h
@@ -25,7 +25,7 @@ namespace unittest {
// are zero.
void
checkStatisticsCounters(const isc::data::ConstElementPtr counters,
- const std::map<std::string, int>& expect);
+ const std::map<std::string, unsigned long long int>& expect);
} // end of unittest
} // end of auth
diff --git a/src/lib/cc/data.h b/src/lib/cc/data.h
index eab0301..e5387b1 100644
--- a/src/lib/cc/data.h
+++ b/src/lib/cc/data.h
@@ -280,7 +280,7 @@ public:
static ElementPtr create();
static ElementPtr create(const int64_t i);
static ElementPtr create(const uint64_t u);
- static ElementPtr create(const long int i) { return (create(static_cast<int64_t>(i))); };
+ // static ElementPtr create(const long int i) { return (create(static_cast<int64_t>(i))); };
static ElementPtr create(const int i) { return (create(static_cast<int64_t>(i))); };
static ElementPtr create(const double d);
static ElementPtr create(const bool b);
diff --git a/src/lib/cc/session.cc b/src/lib/cc/session.cc
index cb1ca39..6e48a57 100644
--- a/src/lib/cc/session.cc
+++ b/src/lib/cc/session.cc
@@ -479,7 +479,7 @@ Session::group_sendmsg(ConstElementPtr msg, std::string group,
LOG_DEBUG(logger, DBG_TRACE_DETAILED, CC_GROUP_SEND).arg(msg->str()).
arg(group);
ElementPtr env = Element::createMap();
- const long int nseq = ++impl_->sequence_;
+ const long long int nseq = ++impl_->sequence_;
env->set(CC_HEADER_TYPE,
Element::create(CC_COMMAND_SEND));
@@ -514,7 +514,7 @@ Session::reply(ConstElementPtr envelope, ConstElementPtr newmsg) {
LOG_DEBUG(logger, DBG_TRACE_DETAILED, CC_REPLY).arg(envelope->str()).
arg(newmsg->str());
ElementPtr env = Element::createMap();
- long int nseq = ++impl_->sequence_;
+ long long int nseq = ++impl_->sequence_;
env->set(CC_HEADER_TYPE, Element::create(CC_COMMAND_SEND));
env->set(CC_HEADER_FROM, Element::create(impl_->lname_));
More information about the bind10-changes
mailing list