From: Razvan Becheriu Date: Sat, 25 Jun 2022 08:36:39 +0000 (+0300) Subject: [#2266] fixed indentation X-Git-Tag: Kea-2.1.7~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f64d765885f2255eb04535fb662a2e35b6039646;p=thirdparty%2Fkea.git [#2266] fixed indentation --- diff --git a/src/lib/cc/tests/data_unittests.cc b/src/lib/cc/tests/data_unittests.cc index e973640b59..e247603bf7 100644 --- a/src/lib/cc/tests/data_unittests.cc +++ b/src/lib/cc/tests/data_unittests.cc @@ -1748,9 +1748,9 @@ TEST(Element, mergeDiffAdd) { ASSERT_FALSE(isc::data::isEquivalent(left, right)); mergeDiffAdd(left, right, hierarchy, "root"); std::string expected_str("{ \"elements\": { \"elements\": \"right\", \"id\": 0, \"new-elements\": \"new\", \"other-elements\": \"other\" }, " - "\"left-other-elements\": { \"elements\": \"other-left\", \"id\": 1 }, " - "\"other\": [ \"left-other-left\", \"left-other-left-other\", \"other-other\", \"right-other-right\", \"right-other-right-other\", \"other-other\" ], " - "\"right-other-elements\": { \"elements\": \"other-right\", \"id\": 2 } }"); + "\"left-other-elements\": { \"elements\": \"other-left\", \"id\": 1 }, " + "\"other\": [ \"left-other-left\", \"left-other-left-other\", \"other-other\", \"right-other-right\", \"right-other-right-other\", \"other-other\" ], " + "\"right-other-elements\": { \"elements\": \"other-right\", \"id\": 2 } }"); ElementPtr expected = Element::fromJSON(expected_str); EXPECT_TRUE(isc::data::isEquivalent(left, expected)) << "Actual: " << left->str() @@ -1804,10 +1804,10 @@ TEST(Element, mergeDiffAdd) { ASSERT_FALSE(isc::data::isEquivalent(left, right)); mergeDiffAdd(left, right, hierarchy, "root"); std::string expected_str("[ { \"elements\": \"right\", \"id\": 0, \"new-elements\": \"new\", " - "\"other\": [ \"left-other-left\", \"left-other-left-other\", \"other-other\", \"right-other-right\", \"right-other-right-other\", \"other-other\" ], " - "\"other-elements\": \"other\" }, " - "{ \"elements\": \"other-left\", \"id\": 1 }, " - "{ \"elements\": \"other-right\", \"id\": 2 } ]"); + "\"other\": [ \"left-other-left\", \"left-other-left-other\", \"other-other\", \"right-other-right\", \"right-other-right-other\", \"other-other\" ], " + "\"other-elements\": \"other\" }, " + "{ \"elements\": \"other-left\", \"id\": 1 }, " + "{ \"elements\": \"other-right\", \"id\": 2 } ]"); ElementPtr expected = Element::fromJSON(expected_str); EXPECT_TRUE(isc::data::isEquivalent(left, expected)) << "Actual: " << left->str() @@ -1999,9 +1999,9 @@ TEST(Element, mergeDiffDel) { ASSERT_FALSE(isc::data::isEquivalent(left, right)); mergeDiffDel(left, right, hierarchy, "root"); std::string expected_str("{ \"elements\": { \"id\": 0, \"other-elements\": \"other\" }, " - "\"elements-other\": { \"elements\": \"new-left\", \"id\": 3, \"other-elements\": \"new-other\" }, " - "\"left-other-elements\": { \"elements\": \"other-left\", \"id\": 1 }, " - "\"other\": [ \"left-other-left\", \"left-other-left-other\" ] }"); + "\"elements-other\": { \"elements\": \"new-left\", \"id\": 3, \"other-elements\": \"new-other\" }, " + "\"left-other-elements\": { \"elements\": \"other-left\", \"id\": 1 }, " + "\"other\": [ \"left-other-left\", \"left-other-left-other\" ] }"); ElementPtr expected = Element::fromJSON(expected_str); EXPECT_TRUE(isc::data::isEquivalent(left, expected)) << "Actual: " << left->str() @@ -2069,7 +2069,7 @@ TEST(Element, mergeDiffDel) { ASSERT_FALSE(isc::data::isEquivalent(left, right)); mergeDiffDel(left, right, hierarchy, "root"); std::string expected_str("[ { \"id\": 0, \"other\": [ \"left-other-left\", \"left-other-left-other\" ], \"other-elements\": \"other\" }, " - "{ \"elements\": \"other-left\", \"id\": 1 } ]"); + "{ \"elements\": \"other-left\", \"id\": 1 } ]"); ElementPtr expected = Element::fromJSON(expected_str); EXPECT_TRUE(isc::data::isEquivalent(left, expected)) << "Actual: " << left->str()