[#4282] Unified can't messages

diff --git a/src/hooks/dhcp/radius/client_attribute.cc b/src/hooks/dhcp/radius/client_attribute.cc
index 6ed67534b47a24d036ee4cd378ce8373e03e5802..5800f436a51e913eeb800467a22060898cee811e 100644 (file)
--- a/src/hooks/dhcp/radius/client_attribute.cc
+++ b/src/hooks/dhcp/radius/client_attribute.cc
@@ -661,7 +661,7 @@ AttrVsa::AttrVsa(const uint8_t type, const uint32_t vendor,
 
 AttributePtr
 AttrVsa::fromText(const uint8_t /* type */, const string& /* repr */) {
-    isc_throw(NotImplemented, "Can't decode vsa from text");
+    isc_throw(NotImplemented, "can't decode vsa from text");
 }
 
 AttributePtr

diff --git a/src/hooks/dhcp/radius/client_message.cc b/src/hooks/dhcp/radius/client_message.cc
index 0977f465359d79344ce6b6cb66b5bae7b83be54c..8e40c8226b8702a54716d810a6c2d7c3ba0b3cdb 100644 (file)
--- a/src/hooks/dhcp/radius/client_message.cc
+++ b/src/hooks/dhcp/radius/client_message.cc
@@ -328,7 +328,7 @@ Message::encodeUserPassword(const ConstAttributePtr& attr) {
     if (!attr || (attr->getValueType() != PW_TYPE_STRING) ||
         (attr->getValueLen() == 0) ||
         (auth_.size() != AUTH_VECTOR_LEN)) {
-        isc_throw(Unexpected, "Can't encode User-Password");
+        isc_throw(Unexpected, "can't encode User-Password");
     }
 
     // Get padded password.
@@ -428,7 +428,7 @@ Message::signMessageAuthenticator(size_t ptr) {
     if ((ptr < AUTH_HDR_LEN) || (ptr > buffer_.size() - 2 - AUTH_VECTOR_LEN) ||
         (buffer_[ptr + 1] != 2 + AUTH_VECTOR_LEN) ||
         (auth_.size() != AUTH_VECTOR_LEN)) {
-        isc_throw(Unexpected, "Can't sign Message-Authenticator");
+        isc_throw(Unexpected, "can't sign Message-Authenticator");
     }
 
     boost::scoped_ptr<HMAC> hmac(
@@ -448,7 +448,7 @@ Message::verifyMessageAuthenticator(size_t ptr) {
     if ((ptr < AUTH_HDR_LEN) || (ptr > buffer_.size() - 2 - AUTH_VECTOR_LEN) ||
         (buffer_[ptr + 1] != 2 + AUTH_VECTOR_LEN) ||
         (auth_.size() != AUTH_VECTOR_LEN)) {
-        isc_throw(BadValue, "Can't verify Message-Authenticator");
+        isc_throw(BadValue, "can't verify Message-Authenticator");
     }
 
     vector<uint8_t> sign;

diff --git a/src/hooks/dhcp/radius/tests/config_unittests.cc b/src/hooks/dhcp/radius/tests/config_unittests.cc
index 7b2f587bdef6d7c16bfc905ad787fac07bd94ee9..9bd214abf94bc87eada2a860761136dae33e6d79 100644 (file)
--- a/src/hooks/dhcp/radius/tests/config_unittests.cc
+++ b/src/hooks/dhcp/radius/tests/config_unittests.cc
@@ -909,7 +909,7 @@ TEST_F(ConfigTest, attribute) {
     attr->set("data", Element::create("foobar"));
     attr->set("type", Element::create(26));
     expected = "can't create Vendor-Specific attribute from [foobar]: ";
-    expected += "Can't decode vsa from text";
+    expected += "can't decode vsa from text";
     EXPECT_THROW_MSG(parser.parse(srv, attr), ConfigError, expected);
 
     // One of expr, data, raw

diff --git a/src/hooks/dhcp/radius/tests/message_unittests.cc b/src/hooks/dhcp/radius/tests/message_unittests.cc
index e3b8f81c8c7b7548a219490ebaa0c6bbbb27acc8..ade148c228692ee8ac46a9d605234d6ee1f72e21 100644 (file)
--- a/src/hooks/dhcp/radius/tests/message_unittests.cc
+++ b/src/hooks/dhcp/radius/tests/message_unittests.cc
@@ -702,7 +702,7 @@ TEST_F(MessageTest, badEncode) {
                                        attrs));
         ASSERT_TRUE(message);
         EXPECT_THROW_MSG(message->encode(), Unexpected,
-                         "Can't encode User-Password");
+                         "can't encode User-Password");
     }
     {
         SCOPED_TRACE("Two Message-Authenticators");
@@ -956,7 +956,7 @@ TEST_F(MessageTest, badDecode) {
         MessagePtr message(new Message(buffer, auth, "foo"));
         ASSERT_TRUE(message);
         EXPECT_THROW_MSG(message->decode(), BadValue,
-                         "Can't verify Message-Authenticator");
+                         "can't verify Message-Authenticator");
     }
     {
         SCOPED_TRACE("too long Message-Authenticator");
@@ -976,7 +976,7 @@ TEST_F(MessageTest, badDecode) {
         MessagePtr message(new Message(buffer, auth, "foo"));
         ASSERT_TRUE(message);
         EXPECT_THROW_MSG(message->decode(), BadValue,
-                         "Can't verify Message-Authenticator");
+                         "can't verify Message-Authenticator");
     }
     {
         SCOPED_TRACE("bad Message-Authenticator");