BIND 10 trac3239, updated. 135e8dd110e5df75658cf5bf2e95bc76372f6fe5 [3239] Wrap long lines
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Dec 4 10:56:26 UTC 2013
The branch, trac3239 has been updated
via 135e8dd110e5df75658cf5bf2e95bc76372f6fe5 (commit)
from 9aad3742c573ad2f16a9b8bf07400e9c0b247e7e (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 135e8dd110e5df75658cf5bf2e95bc76372f6fe5
Author: Mukund Sivaraman <muks at isc.org>
Date: Wed Dec 4 16:22:03 2013 +0530
[3239] Wrap long lines
-----------------------------------------------------------------------
Summary of changes:
src/lib/cc/tests/data_unittests.cc | 59 +++++++++++++++++++++++++-----------
1 file changed, 41 insertions(+), 18 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/cc/tests/data_unittests.cc b/src/lib/cc/tests/data_unittests.cc
index fa8e5fc..96e18ad 100644
--- a/src/lib/cc/tests/data_unittests.cc
+++ b/src/lib/cc/tests/data_unittests.cc
@@ -157,13 +157,16 @@ TEST(Element, from_and_to_json) {
EXPECT_EQ("-100", Element::fromJSON("-1e2")->str());
EXPECT_NO_THROW({
- EXPECT_EQ("9223372036854775807", Element::fromJSON("9223372036854775807")->str());
+ EXPECT_EQ("9223372036854775807",
+ Element::fromJSON("9223372036854775807")->str());
});
EXPECT_NO_THROW({
- EXPECT_EQ("-9223372036854775808", Element::fromJSON("-9223372036854775808")->str());
+ EXPECT_EQ("-9223372036854775808",
+ Element::fromJSON("-9223372036854775808")->str());
});
EXPECT_THROW({
- EXPECT_NE("9223372036854775808", Element::fromJSON("9223372036854775808")->str());
+ EXPECT_NE("9223372036854775808",
+ Element::fromJSON("9223372036854775808")->str());
}, JSONError);
EXPECT_EQ("0.01", Element::fromJSON("1e-2")->str());
@@ -183,19 +186,22 @@ TEST(Element, from_and_to_json) {
EXPECT_EQ("false", Element::fromJSON("FALSE")->str());
EXPECT_EQ("true", Element::fromJSON("True")->str());
EXPECT_EQ("true", Element::fromJSON("TRUE")->str());
- EXPECT_EQ("\"\"", Element::fromJSON(" \n \t \r \f \b \"\" \n \f \t \r \b")->str());
+ EXPECT_EQ("\"\"",
+ Element::fromJSON(" \n \t \r \f \b \"\" \n \f \t \r \b")->str());
EXPECT_EQ("{ }", Element::fromJSON("{ \n \r \t \b \f }")->str());
EXPECT_EQ("[ ]", Element::fromJSON("[ \n \r \f \t \b ]")->str());
// number overflows
EXPECT_THROW(Element::fromJSON("12345678901234567890")->str(), JSONError);
- EXPECT_THROW(Element::fromJSON("1.1e12345678901234567890")->str(), JSONError);
- EXPECT_THROW(Element::fromJSON("-1.1e12345678901234567890")->str(), JSONError);
+ EXPECT_THROW(Element::fromJSON("1.1e12345678901234567890")->str(),
+ JSONError);
+ EXPECT_THROW(Element::fromJSON("-1.1e12345678901234567890")->str(),
+ JSONError);
EXPECT_THROW(Element::fromJSON("1e12345678901234567890")->str(), JSONError);
EXPECT_THROW(Element::fromJSON("1e50000")->str(), JSONError);
// number underflow
- // EXPECT_THROW(Element::fromJSON("1.1e-12345678901234567890")->str(), JSONError);
-
+ // EXPECT_THROW(Element::fromJSON("1.1e-12345678901234567890")->str(),
+ // JSONError);
}
template <typename T>
@@ -592,7 +598,9 @@ TEST(Element, ListElement) {
TEST(Element, MapElement) {
// this function checks the specific functions for ListElements
- ElementPtr el = Element::fromJSON("{ \"name\": \"foo\", \"value1\": \"bar\", \"value2\": { \"number\": 42 } }");
+ ElementPtr el = Element::fromJSON("{ \"name\": \"foo\", "
+ "\"value1\": \"bar\", "
+ "\"value2\": { \"number\": 42 } }");
ConstElementPtr el2;
EXPECT_EQ(el->get("name")->stringValue(), "foo");
@@ -648,8 +656,10 @@ TEST(Element, to_and_from_wire) {
EXPECT_EQ("false", Element::create(false)->toWire());
EXPECT_EQ("null", Element::create()->toWire());
EXPECT_EQ("\"a string\"", Element::create("a string")->toWire());
- EXPECT_EQ("[ \"a\", \"list\" ]", Element::fromJSON("[ \"a\", \"list\" ]")->toWire());
- EXPECT_EQ("{ \"a\": \"map\" }", Element::fromJSON("{ \"a\": \"map\" }")->toWire());
+ EXPECT_EQ("[ \"a\", \"list\" ]",
+ Element::fromJSON("[ \"a\", \"list\" ]")->toWire());
+ EXPECT_EQ("{ \"a\": \"map\" }",
+ Element::fromJSON("{ \"a\": \"map\" }")->toWire());
EXPECT_EQ("1", Element::fromWire("1")->str());
@@ -715,8 +725,10 @@ TEST(Element, equals) {
EXPECT_EQ(*efs("[]"), *efs("[]"));
EXPECT_EQ(*efs("[ 1, 2, 3 ]"), *efs("[ 1, 2, 3 ]"));
- EXPECT_EQ(*efs("[ \"a\", [ True, 1], 2.2 ]"), *efs("[ \"a\", [ True, 1], 2.2 ]"));
- EXPECT_NE(*efs("[ \"a\", [ True, 1], 2.2 ]"), *efs("[ \"a\", [ True, 2], 2.2 ]"));
+ EXPECT_EQ(*efs("[ \"a\", [ True, 1], 2.2 ]"),
+ *efs("[ \"a\", [ True, 1], 2.2 ]"));
+ EXPECT_NE(*efs("[ \"a\", [ True, 1], 2.2 ]"),
+ *efs("[ \"a\", [ True, 2], 2.2 ]"));
EXPECT_NE(*efs("[]"), *efs("[1]"));
EXPECT_NE(*efs("[]"), *efs("1"));
EXPECT_NE(*efs("[]"), *efs("\"1\""));
@@ -724,14 +736,24 @@ TEST(Element, equals) {
EXPECT_EQ(*efs("{}"), *efs("{}"));
EXPECT_EQ(*efs("{ \"foo\": \"bar\" }"), *efs("{ \"foo\": \"bar\" }"));
- EXPECT_EQ(*efs("{ \"item1\": 1, \"item2\": [ \"a\", \"list\" ], \"item3\": { \"foo\": \"bar\" } }"), *efs("{ \"item1\": 1, \"item2\": [ \"a\", \"list\" ], \"item3\": { \"foo\": \"bar\" } }"));
- EXPECT_NE(*efs("{ \"item1\": 1, \"item2\": [ \"a\", \"list\" ], \"item3\": { \"foo\": \"bar\" } }"), *efs("{ \"item1\": 1, \"item2\": [ \"a\", \"list\" ], \"item3\": { \"foo\": \"bar2\" } }"));
- EXPECT_NE(*efs("{ \"item1\": 1, \"item2\": [ \"a\", \"list\" ], \"item3\": { \"foo\": \"bar\" } }"), *efs("{ \"item1\": 1, \"item2\": [ \"a\", \"list\", 1 ], \"item3\": { \"foo\": \"bar\" } }"));
+ EXPECT_EQ(*efs("{ \"item1\": 1, \"item2\": [ \"a\", \"list\" ], "
+ "\"item3\": { \"foo\": \"bar\" } }"),
+ *efs("{ \"item1\": 1, \"item2\": [ \"a\", \"list\" ], "
+ "\"item3\": { \"foo\": \"bar\" } }"));
+ EXPECT_NE(*efs("{ \"item1\": 1, \"item2\": [ \"a\", \"list\" ], "
+ "\"item3\": { \"foo\": \"bar\" } }"),
+ *efs("{ \"item1\": 1, \"item2\": [ \"a\", \"list\" ], "
+ "\"item3\": { \"foo\": \"bar2\" } }"));
+ EXPECT_NE(*efs("{ \"item1\": 1, \"item2\": [ \"a\", \"list\" ], "
+ "\"item3\": { \"foo\": \"bar\" } }"),
+ *efs("{ \"item1\": 1, \"item2\": [ \"a\", \"list\", 1 ], "
+ "\"item3\": { \"foo\": \"bar\" } }"));
EXPECT_NE(*efs("{ \"foo\": \"bar\" }"), *efs("1"));
EXPECT_NE(*efs("{ \"foo\": \"bar\" }"), *efs("\"1\""));
EXPECT_NE(*efs("{ \"foo\": \"bar\" }"), *efs("[]"));
EXPECT_NE(*efs("{ \"foo\": \"bar\" }"), *efs("{}"));
- EXPECT_NE(*efs("{ \"foo\": \"bar\" }"), *efs("{ \"something\": \"different\" }"));
+ EXPECT_NE(*efs("{ \"foo\": \"bar\" }"),
+ *efs("{ \"something\": \"different\" }"));
EXPECT_EQ(*efs("null"), *Element::create());
}
@@ -791,7 +813,8 @@ TEST(Element, removeIdentical) {
removeIdentical(a, b);
EXPECT_EQ(*a, *c);
- EXPECT_THROW(removeIdentical(Element::create(1), Element::create(2)), TypeError);
+ EXPECT_THROW(removeIdentical(Element::create(1), Element::create(2)),
+ TypeError);
}
TEST(Element, constRemoveIdentical) {
More information about the bind10-changes
mailing list