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
Sebastian Schrader
Kea
Commits
e135eb79
Commit
e135eb79
authored
Oct 22, 2013
by
Marcin Siodelski
Browse files
[3200] Pass error message as a parameter of AssertionFailure.
parent
1bbab8c3
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp4/tests/dhcp4_test_utils.cc
View file @
e135eb79
...
...
@@ -137,19 +137,24 @@ Dhcpv4SrvTest::basicOptionsPresent(const Pkt4Ptr& pkt) {
std
::
ostringstream
errmsg
;
errmsg
<<
"option missing in the response"
;
if
(
!
pkt
->
getOption
(
DHO_DOMAIN_NAME
))
{
return
(
::
testing
::
AssertionFailure
()
<<
"domain-name "
<<
errmsg
);
return
(
::
testing
::
AssertionFailure
(
::
testing
::
Message
()
<<
"domain-name "
<<
errmsg
));
}
else
if
(
!
pkt
->
getOption
(
DHO_DOMAIN_NAME_SERVERS
))
{
return
(
::
testing
::
AssertionFailure
()
<<
"dns-servers "
<<
errmsg
);
return
(
::
testing
::
AssertionFailure
(
::
testing
::
Message
()
<<
"dns-servers "
<<
errmsg
));
}
else
if
(
!
pkt
->
getOption
(
DHO_SUBNET_MASK
))
{
return
(
::
testing
::
AssertionFailure
()
<<
"subnet-mask "
<<
errmsg
);
return
(
::
testing
::
AssertionFailure
(
::
testing
::
Message
()
<<
"subnet-mask "
<<
errmsg
));
}
else
if
(
!
pkt
->
getOption
(
DHO_ROUTERS
))
{
return
(
::
testing
::
AssertionFailure
()
<<
"routers "
<<
errmsg
);
return
(
::
testing
::
AssertionFailure
(
::
testing
::
Message
()
<<
"routers "
<<
errmsg
));
}
else
if
(
!
pkt
->
getOption
(
DHO_DHCP_LEASE_TIME
))
{
return
(
::
testing
::
AssertionFailure
()
<<
"dhcp-lease-time "
<<
errmsg
);
return
(
::
testing
::
AssertionFailure
(
::
testing
::
Message
()
<<
"dhcp-lease-time "
<<
errmsg
));
}
return
(
::
testing
::
AssertionSuccess
());
...
...
@@ -161,19 +166,24 @@ Dhcpv4SrvTest::noBasicOptions(const Pkt4Ptr& pkt) {
std
::
ostringstream
errmsg
;
errmsg
<<
"option present in the response"
;
if
(
pkt
->
getOption
(
DHO_DOMAIN_NAME
))
{
return
(
::
testing
::
AssertionFailure
()
<<
"domain-name "
<<
errmsg
);
return
(
::
testing
::
AssertionFailure
(
::
testing
::
Message
()
<<
"domain-name "
<<
errmsg
));
}
else
if
(
pkt
->
getOption
(
DHO_DOMAIN_NAME_SERVERS
))
{
return
(
::
testing
::
AssertionFailure
()
<<
"dns-servers "
<<
errmsg
);
return
(
::
testing
::
AssertionFailure
(
::
testing
::
Message
()
<<
"dns-servers "
<<
errmsg
));
}
else
if
(
pkt
->
getOption
(
DHO_SUBNET_MASK
))
{
return
(
::
testing
::
AssertionFailure
()
<<
"subnet-mask "
<<
errmsg
);
return
(
::
testing
::
AssertionFailure
(
::
testing
::
Message
()
<<
"subnet-mask "
<<
errmsg
));
}
else
if
(
pkt
->
getOption
(
DHO_ROUTERS
))
{
return
(
::
testing
::
AssertionFailure
()
<<
"routers "
<<
errmsg
);
return
(
::
testing
::
AssertionFailure
(
::
testing
::
Message
()
<<
"routers "
<<
errmsg
));
}
else
if
(
pkt
->
getOption
(
DHO_DHCP_LEASE_TIME
))
{
return
(
::
testing
::
AssertionFailure
()
<<
"dhcp-lease-time "
<<
errmsg
);
return
(
::
testing
::
AssertionFailure
(
::
testing
::
Message
()
<<
"dhcp-lease-time "
<<
errmsg
));
}
return
(
::
testing
::
AssertionSuccess
());
...
...
@@ -184,10 +194,12 @@ Dhcpv4SrvTest::requestedOptionsPresent(const Pkt4Ptr& pkt) {
std
::
ostringstream
errmsg
;
errmsg
<<
"option missing in the response"
;
if
(
!
pkt
->
getOption
(
DHO_LOG_SERVERS
))
{
return
(
::
testing
::
AssertionFailure
()
<<
"log-servers "
<<
errmsg
);
return
(
::
testing
::
AssertionFailure
(
::
testing
::
Message
()
<<
"log-servers "
<<
errmsg
));
}
else
if
(
!
pkt
->
getOption
(
DHO_COOKIE_SERVERS
))
{
return
(
::
testing
::
AssertionFailure
()
<<
"cookie-servers "
<<
errmsg
);
return
(
::
testing
::
AssertionFailure
(
::
testing
::
Message
()
<<
"cookie-servers "
<<
errmsg
));
}
return
(
::
testing
::
AssertionSuccess
());
...
...
@@ -198,10 +210,12 @@ Dhcpv4SrvTest::noRequestedOptions(const Pkt4Ptr& pkt) {
std
::
ostringstream
errmsg
;
errmsg
<<
"option present in the response"
;
if
(
pkt
->
getOption
(
DHO_LOG_SERVERS
))
{
return
(
::
testing
::
AssertionFailure
()
<<
"log-servers "
<<
errmsg
);
return
(
::
testing
::
AssertionFailure
(
::
testing
::
Message
()
<<
"log-servers "
<<
errmsg
));
}
else
if
(
pkt
->
getOption
(
DHO_COOKIE_SERVERS
))
{
return
(
::
testing
::
AssertionFailure
()
<<
"cookie-servers "
<<
errmsg
);
return
(
::
testing
::
AssertionFailure
(
::
testing
::
Message
()
<<
"cookie-servers "
<<
errmsg
));
}
return
(
::
testing
::
AssertionSuccess
());
...
...
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