mirror of
https://github.com/NixOS/nix.git
synced 2025-11-21 01:39:36 +01:00
Apply clang-format universally.
* It is tough to contribute to a project that doesn't use a formatter, * It is extra hard to contribute to a project which has configured the formatter, but ignores it for some files * Code formatting makes it harder to hide obscure / weird bugs by accident or on purpose, Let's rip the bandaid off? Note that PRs currently in flight should be able to be merged relatively easily by applying `clang-format` to their tip prior to merge.
This commit is contained in:
Graham Christensen
parent
41bf87ec70
commit
e4f62e4608
587 changed files with 23258 additions and 23135 deletions
|
|
@ -12,14 +12,16 @@ namespace nix {
|
|||
* We are specifically interested in whether we can _nest_ optionals in STL
|
||||
* containers so we that we can leverage existing adl_serializer templates. */
|
||||
|
||||
TEST(to_json, optionalInt) {
|
||||
TEST(to_json, optionalInt)
|
||||
{
|
||||
std::optional<int> val = std::make_optional(420);
|
||||
ASSERT_EQ(nlohmann::json(val), nlohmann::json(420));
|
||||
val = std::nullopt;
|
||||
ASSERT_EQ(nlohmann::json(val), nlohmann::json(nullptr));
|
||||
}
|
||||
|
||||
TEST(to_json, vectorOfOptionalInts) {
|
||||
TEST(to_json, vectorOfOptionalInts)
|
||||
{
|
||||
std::vector<std::optional<int>> vals = {
|
||||
std::make_optional(420),
|
||||
std::nullopt,
|
||||
|
|
@ -27,17 +29,20 @@ TEST(to_json, vectorOfOptionalInts) {
|
|||
ASSERT_EQ(nlohmann::json(vals), nlohmann::json::parse("[420,null]"));
|
||||
}
|
||||
|
||||
TEST(to_json, optionalVectorOfInts) {
|
||||
std::optional<std::vector<int>> val = std::make_optional(std::vector<int> {
|
||||
-420,
|
||||
420,
|
||||
});
|
||||
TEST(to_json, optionalVectorOfInts)
|
||||
{
|
||||
std::optional<std::vector<int>> val = std::make_optional(
|
||||
std::vector<int>{
|
||||
-420,
|
||||
420,
|
||||
});
|
||||
ASSERT_EQ(nlohmann::json(val), nlohmann::json::parse("[-420,420]"));
|
||||
val = std::nullopt;
|
||||
ASSERT_EQ(nlohmann::json(val), nlohmann::json(nullptr));
|
||||
}
|
||||
|
||||
TEST(from_json, optionalInt) {
|
||||
TEST(from_json, optionalInt)
|
||||
{
|
||||
nlohmann::json json = 420;
|
||||
std::optional<int> val = json;
|
||||
ASSERT_TRUE(val.has_value());
|
||||
|
|
@ -47,8 +52,9 @@ TEST(from_json, optionalInt) {
|
|||
ASSERT_FALSE(val.has_value());
|
||||
}
|
||||
|
||||
TEST(from_json, vectorOfOptionalInts) {
|
||||
nlohmann::json json = { 420, nullptr };
|
||||
TEST(from_json, vectorOfOptionalInts)
|
||||
{
|
||||
nlohmann::json json = {420, nullptr};
|
||||
std::vector<std::optional<int>> vals = json;
|
||||
ASSERT_EQ(vals.size(), 2u);
|
||||
ASSERT_TRUE(vals.at(0).has_value());
|
||||
|
|
@ -56,7 +62,8 @@ TEST(from_json, vectorOfOptionalInts) {
|
|||
ASSERT_FALSE(vals.at(1).has_value());
|
||||
}
|
||||
|
||||
TEST(valueAt, simpleObject) {
|
||||
TEST(valueAt, simpleObject)
|
||||
{
|
||||
auto simple = R"({ "hello": "world" })"_json;
|
||||
|
||||
ASSERT_EQ(valueAt(getObject(simple), "hello"), "world");
|
||||
|
|
@ -66,7 +73,8 @@ TEST(valueAt, simpleObject) {
|
|||
ASSERT_EQ(valueAt(valueAt(getObject(nested), "hello"), "world"), "");
|
||||
}
|
||||
|
||||
TEST(valueAt, missingKey) {
|
||||
TEST(valueAt, missingKey)
|
||||
{
|
||||
auto json = R"({ "hello": { "nested": "world" } })"_json;
|
||||
|
||||
auto & obj = getObject(json);
|
||||
|
|
@ -74,20 +82,22 @@ TEST(valueAt, missingKey) {
|
|||
ASSERT_THROW(valueAt(obj, "foo"), Error);
|
||||
}
|
||||
|
||||
TEST(getObject, rightAssertions) {
|
||||
TEST(getObject, rightAssertions)
|
||||
{
|
||||
auto simple = R"({ "object": {} })"_json;
|
||||
|
||||
ASSERT_EQ(getObject(valueAt(getObject(simple), "object")), (nlohmann::json::object_t {}));
|
||||
ASSERT_EQ(getObject(valueAt(getObject(simple), "object")), (nlohmann::json::object_t{}));
|
||||
|
||||
auto nested = R"({ "object": { "object": {} } })"_json;
|
||||
|
||||
auto nestedObject = getObject(valueAt(getObject(nested), "object"));
|
||||
|
||||
ASSERT_EQ(nestedObject, getObject(nlohmann::json::parse(R"({ "object": {} })")));
|
||||
ASSERT_EQ(getObject(valueAt(getObject(nestedObject), "object")), (nlohmann::json::object_t {}));
|
||||
ASSERT_EQ(getObject(valueAt(getObject(nestedObject), "object")), (nlohmann::json::object_t{}));
|
||||
}
|
||||
|
||||
TEST(getObject, wrongAssertions) {
|
||||
TEST(getObject, wrongAssertions)
|
||||
{
|
||||
auto json = R"({ "object": {}, "array": [], "string": "", "int": 0, "boolean": false })"_json;
|
||||
|
||||
auto & obj = getObject(json);
|
||||
|
|
@ -98,13 +108,15 @@ TEST(getObject, wrongAssertions) {
|
|||
ASSERT_THROW(getObject(valueAt(obj, "boolean")), Error);
|
||||
}
|
||||
|
||||
TEST(getArray, rightAssertions) {
|
||||
TEST(getArray, rightAssertions)
|
||||
{
|
||||
auto simple = R"({ "array": [] })"_json;
|
||||
|
||||
ASSERT_EQ(getArray(valueAt(getObject(simple), "array")), (nlohmann::json::array_t {}));
|
||||
ASSERT_EQ(getArray(valueAt(getObject(simple), "array")), (nlohmann::json::array_t{}));
|
||||
}
|
||||
|
||||
TEST(getArray, wrongAssertions) {
|
||||
TEST(getArray, wrongAssertions)
|
||||
{
|
||||
auto json = R"({ "object": {}, "array": [], "string": "", "int": 0, "boolean": false })"_json;
|
||||
|
||||
ASSERT_THROW(getArray(valueAt(json, "object")), Error);
|
||||
|
|
@ -113,13 +125,15 @@ TEST(getArray, wrongAssertions) {
|
|||
ASSERT_THROW(getArray(valueAt(json, "boolean")), Error);
|
||||
}
|
||||
|
||||
TEST(getString, rightAssertions) {
|
||||
TEST(getString, rightAssertions)
|
||||
{
|
||||
auto simple = R"({ "string": "" })"_json;
|
||||
|
||||
ASSERT_EQ(getString(valueAt(getObject(simple), "string")), "");
|
||||
}
|
||||
|
||||
TEST(getString, wrongAssertions) {
|
||||
TEST(getString, wrongAssertions)
|
||||
{
|
||||
auto json = R"({ "object": {}, "array": [], "string": "", "int": 0, "boolean": false })"_json;
|
||||
|
||||
ASSERT_THROW(getString(valueAt(json, "object")), Error);
|
||||
|
|
@ -128,7 +142,8 @@ TEST(getString, wrongAssertions) {
|
|||
ASSERT_THROW(getString(valueAt(json, "boolean")), Error);
|
||||
}
|
||||
|
||||
TEST(getIntegralNumber, rightAssertions) {
|
||||
TEST(getIntegralNumber, rightAssertions)
|
||||
{
|
||||
auto simple = R"({ "int": 0, "signed": -1 })"_json;
|
||||
|
||||
ASSERT_EQ(getUnsigned(valueAt(getObject(simple), "int")), 0u);
|
||||
|
|
@ -136,8 +151,10 @@ TEST(getIntegralNumber, rightAssertions) {
|
|||
ASSERT_EQ(getInteger<int8_t>(valueAt(getObject(simple), "signed")), -1);
|
||||
}
|
||||
|
||||
TEST(getIntegralNumber, wrongAssertions) {
|
||||
auto json = R"({ "object": {}, "array": [], "string": "", "int": 0, "signed": -256, "large": 128, "boolean": false })"_json;
|
||||
TEST(getIntegralNumber, wrongAssertions)
|
||||
{
|
||||
auto json =
|
||||
R"({ "object": {}, "array": [], "string": "", "int": 0, "signed": -256, "large": 128, "boolean": false })"_json;
|
||||
|
||||
ASSERT_THROW(getUnsigned(valueAt(json, "object")), Error);
|
||||
ASSERT_THROW(getUnsigned(valueAt(json, "array")), Error);
|
||||
|
|
@ -153,13 +170,15 @@ TEST(getIntegralNumber, wrongAssertions) {
|
|||
ASSERT_THROW(getInteger<int8_t>(valueAt(json, "signed")), Error);
|
||||
}
|
||||
|
||||
TEST(getBoolean, rightAssertions) {
|
||||
TEST(getBoolean, rightAssertions)
|
||||
{
|
||||
auto simple = R"({ "boolean": false })"_json;
|
||||
|
||||
ASSERT_EQ(getBoolean(valueAt(getObject(simple), "boolean")), false);
|
||||
}
|
||||
|
||||
TEST(getBoolean, wrongAssertions) {
|
||||
TEST(getBoolean, wrongAssertions)
|
||||
{
|
||||
auto json = R"({ "object": {}, "array": [], "string": "", "int": 0, "boolean": false })"_json;
|
||||
|
||||
ASSERT_THROW(getBoolean(valueAt(json, "object")), Error);
|
||||
|
|
@ -168,25 +187,29 @@ TEST(getBoolean, wrongAssertions) {
|
|||
ASSERT_THROW(getBoolean(valueAt(json, "int")), Error);
|
||||
}
|
||||
|
||||
TEST(optionalValueAt, existing) {
|
||||
TEST(optionalValueAt, existing)
|
||||
{
|
||||
auto json = R"({ "string": "ssh-rsa" })"_json;
|
||||
|
||||
ASSERT_EQ(optionalValueAt(json, "string"), std::optional { "ssh-rsa" });
|
||||
ASSERT_EQ(optionalValueAt(json, "string"), std::optional{"ssh-rsa"});
|
||||
}
|
||||
|
||||
TEST(optionalValueAt, empty) {
|
||||
TEST(optionalValueAt, empty)
|
||||
{
|
||||
auto json = R"({})"_json;
|
||||
|
||||
ASSERT_EQ(optionalValueAt(json, "string"), std::nullopt);
|
||||
}
|
||||
|
||||
TEST(getNullable, null) {
|
||||
TEST(getNullable, null)
|
||||
{
|
||||
auto json = R"(null)"_json;
|
||||
|
||||
ASSERT_EQ(getNullable(json), nullptr);
|
||||
}
|
||||
|
||||
TEST(getNullable, empty) {
|
||||
TEST(getNullable, empty)
|
||||
{
|
||||
auto json = R"({})"_json;
|
||||
|
||||
auto * p = getNullable(json);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue