Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
cfd6c7ab
Commit
cfd6c7ab
authored
May 08, 2015
by
Tomek Mrugalski
🛰
Browse files
[3793] Unit-test corrections.
parent
2b016852
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/lib/stats/context.cc
View file @
cfd6c7ab
...
...
@@ -32,7 +32,7 @@ void StatContext::add(const ObservationPtr& obs) {
if
(
existing
==
stats_
.
end
())
{
stats_
.
insert
(
make_pair
(
obs
->
getName
()
,
obs
));
}
else
{
isc_throw
(
InvalidStatType
,
"Statistic named "
<<
obs
->
getName
()
isc_throw
(
DuplicateStat
,
"Statistic named "
<<
obs
->
getName
()
<<
" already exists."
);
}
...
...
src/lib/stats/tests/stats_mgr_unittest.cc
View file @
cfd6c7ab
...
...
@@ -62,8 +62,8 @@ TEST_F(StatsMgrTest, integerStat) {
EXPECT_NO_THROW
(
alpha
=
StatsMgr
::
instance
().
getObservation
(
"alpha"
));
EXPECT_TRUE
(
alpha
);
std
::
string
exp
=
"
\"
alpha
\"
: [ [ 1234,
\"
"
+
Observation
::
ptimeToText
(
alpha
->
getInteger
().
second
)
+
"
\"
] ]"
;
std
::
string
exp
=
"
{
\"
alpha
\"
: [ [ 1234,
\"
"
+
Observation
::
ptimeToText
(
alpha
->
getInteger
().
second
)
+
"
\"
] ]
}
"
;
EXPECT_EQ
(
exp
,
StatsMgr
::
instance
().
get
(
"alpha"
)
->
str
());
}
...
...
@@ -77,8 +77,8 @@ TEST_F(StatsMgrTest, floatStat) {
EXPECT_NO_THROW
(
beta
=
StatsMgr
::
instance
().
getObservation
(
"beta"
));
EXPECT_TRUE
(
beta
);
std
::
string
exp
=
"
\"
beta
\"
: [ [ 12.34,
\"
"
+
Observation
::
ptimeToText
(
beta
->
getFloat
().
second
)
+
"
\"
] ]"
;
std
::
string
exp
=
"
{
\"
beta
\"
: [ [ 12.34,
\"
"
+
Observation
::
ptimeToText
(
beta
->
getFloat
().
second
)
+
"
\"
] ]
}
"
;
EXPECT_EQ
(
exp
,
StatsMgr
::
instance
().
get
(
"beta"
)
->
str
());
}
...
...
@@ -90,11 +90,11 @@ TEST_F(StatsMgrTest, durationStat) {
microsec
::
time_duration
(
1
,
2
,
3
,
4
)));
ObservationPtr
gamma
;
EXPECT_NO_THROW
(
gamma
=
StatsMgr
::
instance
().
getObservation
(
"
bet
a"
));
EXPECT_NO_THROW
(
gamma
=
StatsMgr
::
instance
().
getObservation
(
"
gamm
a"
));
EXPECT_TRUE
(
gamma
);
std
::
string
exp
=
"
\"
gamma
\"
: [ [
\"
01:02:03.000004
\"
,
\"
"
+
Observation
::
ptimeToText
(
gamma
->
getDuration
().
second
)
+
"
\"
] ]"
;
std
::
string
exp
=
"
{
\"
gamma
\"
: [ [
\"
01:02:03.000004
\"
,
\"
"
+
Observation
::
ptimeToText
(
gamma
->
getDuration
().
second
)
+
"
\"
] ]
}
"
;
EXPECT_EQ
(
exp
,
StatsMgr
::
instance
().
get
(
"gamma"
)
->
str
());
}
...
...
@@ -109,8 +109,8 @@ TEST_F(StatsMgrTest, stringStat) {
EXPECT_NO_THROW
(
delta
=
StatsMgr
::
instance
().
getObservation
(
"delta"
));
EXPECT_TRUE
(
delta
);
std
::
string
exp
=
"
\"
delta
\"
: [ [
\"
Lorem i
m
psum
\"
,
\"
"
+
Observation
::
ptimeToText
(
delta
->
getString
().
second
)
+
"
\"
] ]"
;
std
::
string
exp
=
"
{
\"
delta
\"
: [ [
\"
Lorem ipsum
\"
,
\"
"
+
Observation
::
ptimeToText
(
delta
->
getString
().
second
)
+
"
\"
] ]
}
"
;
EXPECT_EQ
(
exp
,
StatsMgr
::
instance
().
get
(
"delta"
)
->
str
());
}
...
...
@@ -156,37 +156,45 @@ TEST_F(StatsMgrTest, getGetAll) {
ASSERT_TRUE
(
rep_gamma
);
ASSERT_TRUE
(
rep_delta
);
std
::
string
exp_str_alpha
=
"
\"
alpha
\"
: [ [ 1234
,
\"
"
std
::
string
exp_str_alpha
=
"
[ [ 6912
,
\"
"
+
Observation
::
ptimeToText
(
StatsMgr
::
instance
().
getObservation
(
"alpha"
)
->
getInteger
().
second
)
+
"
\"
] ]"
;
std
::
string
exp_str_beta
=
"
\"
beta
\"
: [ [ 12.34
,
\"
"
std
::
string
exp_str_beta
=
"
[ [ 69.12
,
\"
"
+
Observation
::
ptimeToText
(
StatsMgr
::
instance
().
getObservation
(
"beta"
)
->
getFloat
().
second
)
+
"
\"
] ]"
;
std
::
string
exp_str_gamma
=
"
\"
gamma
\"
:
[ [
\"
0
1
:0
2:03
.0000
04
\"
,
\"
"
std
::
string
exp_str_gamma
=
"[ [
\"
0
6
:0
8:10
.0000
12
\"
,
\"
"
+
Observation
::
ptimeToText
(
StatsMgr
::
instance
().
getObservation
(
"gamma"
)
->
getDuration
().
second
)
+
"
\"
] ]"
;
std
::
string
exp_str_delta
=
"
\"
delta
\"
:
[ [
\"
Lorem i
m
psum
\"
,
\"
"
std
::
string
exp_str_delta
=
"[ [
\"
Lorem ipsum
\"
,
\"
"
+
Observation
::
ptimeToText
(
StatsMgr
::
instance
().
getObservation
(
"delta"
)
->
getString
().
second
)
+
"
\"
] ]"
;
// Check that individual stats are reported properly
EXPECT_EQ
(
exp_str_alpha
,
rep_alpha
->
str
());
EXPECT_EQ
(
exp_str_beta
,
rep_beta
->
str
());
EXPECT_EQ
(
exp_str_gamma
,
rep_gamma
->
str
());
EXPECT_EQ
(
exp_str_delta
,
rep_delta
->
str
());
EXPECT_EQ
(
"{
\"
alpha
\"
: "
+
exp_str_alpha
+
" }"
,
rep_alpha
->
str
());
EXPECT_EQ
(
"{
\"
beta
\"
: "
+
exp_str_beta
+
" }"
,
rep_beta
->
str
());
EXPECT_EQ
(
"{
\"
gamma
\"
: "
+
exp_str_gamma
+
" }"
,
rep_gamma
->
str
());
EXPECT_EQ
(
"{
\"
delta
\"
: "
+
exp_str_delta
+
" }"
,
rep_delta
->
str
());
// Check that non-existent metric is not reported.
EXPECT_
FALSE
(
StatsMgr
::
instance
().
get
(
"epsilon"
));
EXPECT_
EQ
(
"{ }"
,
StatsMgr
::
instance
().
get
(
"epsilon"
)
->
str
()
);
// Check that all of them can be reported at once
ConstElementPtr
rep_all
=
StatsMgr
::
instance
().
getAll
();
ASSERT_TRUE
(
rep_all
);
// This may not be the best verification. There's no guarantee that the
// statistics will be reported in this specific order.
std
::
string
exp_all
=
exp_str_alpha
+
", "
+
exp_str_beta
+
", "
+
exp_str_gamma
+
", "
+
exp_str_delta
;
EXPECT_EQ
(
exp_all
,
rep_all
->
str
());
// Verifying this is a bit more involved, as we don't know whether the
// order would be preserved or not.
EXPECT_EQ
(
4
,
rep_all
->
size
());
ASSERT_TRUE
(
rep_all
->
get
(
"alpha"
));
ASSERT_TRUE
(
rep_all
->
get
(
"beta"
));
ASSERT_TRUE
(
rep_all
->
get
(
"delta"
));
ASSERT_TRUE
(
rep_all
->
get
(
"gamma"
));
EXPECT_FALSE
(
rep_all
->
get
(
"epsilon"
));
EXPECT_EQ
(
exp_str_alpha
,
rep_all
->
get
(
"alpha"
)
->
str
());
EXPECT_EQ
(
exp_str_beta
,
rep_all
->
get
(
"beta"
)
->
str
());
EXPECT_EQ
(
exp_str_gamma
,
rep_all
->
get
(
"gamma"
)
->
str
());
EXPECT_EQ
(
exp_str_delta
,
rep_all
->
get
(
"delta"
)
->
str
());
}
// This test checks whether existing statistics can be reset.
...
...
@@ -264,10 +272,10 @@ TEST_F(StatsMgrTest, removeAll) {
EXPECT_EQ
(
0
,
StatsMgr
::
instance
().
count
());
// There should be no such statistics anymore
EXPECT_
FALSE
(
StatsMgr
::
instance
().
get
(
"alpha"
));
EXPECT_
FALSE
(
StatsMgr
::
instance
().
get
(
"beta"
));
EXPECT_
FALSE
(
StatsMgr
::
instance
().
get
(
"gamma"
));
EXPECT_
FALSE
(
StatsMgr
::
instance
().
get
(
"delta"
));
EXPECT_
EQ
(
"{ }"
,
StatsMgr
::
instance
().
get
(
"alpha"
)
->
str
()
);
EXPECT_
EQ
(
"{ }"
,
StatsMgr
::
instance
().
get
(
"beta"
)
->
str
()
);
EXPECT_
EQ
(
"{ }"
,
StatsMgr
::
instance
().
get
(
"gamma"
)
->
str
()
);
EXPECT_
EQ
(
"{ }"
,
StatsMgr
::
instance
().
get
(
"delta"
)
->
str
()
);
// There should be no such statistics anymore
EXPECT_FALSE
(
StatsMgr
::
instance
().
getObservation
(
"alpha"
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment