This repository was archived by the owner on Aug 19, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 11
Add JSON Clone() Is() As() testing. #104
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
71d4b19
Add Clone() Is() As() testing
sparkprime 34e423f
Respond to comments
sparkprime 0592ff3
Respond to comments
sparkprime 60c6b30
Respond to comments
sparkprime 6f155c7
Add const to constexpr
sparkprime b5f0e5b
Whitespace fixes.
igorpeshansky File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,11 +2,24 @@ | |
| #include "gtest/gtest.h" | ||
|
|
||
| #include <functional> | ||
| #include <set> | ||
| #include <vector> | ||
|
|
||
| #define EXPECT_TOSTRING_EQ(s, v) EXPECT_EQ(s, v->ToString()) | ||
|
|
||
| namespace { | ||
|
|
||
| // Verifies that the given json parses, clones, and serializes to its original | ||
| // form. | ||
| void ExpectSerializesToSelf(const std::string& json_text) { | ||
| json::value v = json::Parser::FromString(json_text); | ||
| EXPECT_TOSTRING_EQ(json_text, v); | ||
| // May as well test a clone while we're at it. | ||
| EXPECT_TOSTRING_EQ(json_text, v->Clone()); | ||
| } | ||
|
|
||
| // If an unexpected exception was thrown, this prints the message in the test | ||
| // output. Otherwise, the test would fail with a cryptic message. | ||
| void GuardJsonException(std::function<void()> test) { | ||
| try { | ||
| test(); | ||
|
|
@@ -16,12 +29,40 @@ void GuardJsonException(std::function<void()> test) { | |
| } | ||
|
|
||
|
|
||
| // Type values are distinct. | ||
|
|
||
| TEST(Distinct, Types) { | ||
| std::vector<json::Type> all_types({ | ||
| json::NullType, json::BooleanType, json::NumberType, json::StringType, | ||
| json::ArrayType, json::ObjectType | ||
| }); | ||
| std::set<json::Type> all_types_set(all_types.begin(), all_types.end()); | ||
| EXPECT_EQ(all_types.size(), all_types_set.size()); | ||
| } | ||
|
|
||
|
|
||
| // Trival null. | ||
|
|
||
| TEST(TrivialParseTest, Null) { | ||
| GuardJsonException([](){ | ||
| json::value v = json::Parser::FromString("null"); | ||
| EXPECT_EQ(json::NullType, v->type()); | ||
|
|
||
| EXPECT_TRUE(v->Is<json::Null>()); | ||
| EXPECT_FALSE(v->Is<json::Boolean>()); | ||
| EXPECT_FALSE(v->Is<json::Number>()); | ||
| EXPECT_FALSE(v->Is<json::String>()); | ||
| EXPECT_FALSE(v->Is<json::Array>()); | ||
| EXPECT_FALSE(v->Is<json::Object>()); | ||
|
|
||
| const auto& null_value = v->As<json::Null>(); | ||
| EXPECT_THROW(v->As<json::Boolean>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Number>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::String>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Array>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Object>(), json::Exception); | ||
|
|
||
| EXPECT_EQ(json::NullType, null_value->type()); | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -37,7 +78,23 @@ TEST(TrivialToStringTest, Null) { | |
| TEST(TrivialParseTest, True) { | ||
| GuardJsonException([](){ | ||
| json::value v = json::Parser::FromString("true"); | ||
| EXPECT_EQ(true, v->As<json::Boolean>()->value()); | ||
| EXPECT_EQ(json::BooleanType, v->type()); | ||
|
|
||
| EXPECT_FALSE(v->Is<json::Null>()); | ||
| EXPECT_TRUE(v->Is<json::Boolean>()); | ||
| EXPECT_FALSE(v->Is<json::Number>()); | ||
| EXPECT_FALSE(v->Is<json::String>()); | ||
| EXPECT_FALSE(v->Is<json::Array>()); | ||
| EXPECT_FALSE(v->Is<json::Object>()); | ||
|
|
||
| EXPECT_THROW(v->As<json::Null>(), json::Exception); | ||
| const auto& boolean = v->As<json::Boolean>(); | ||
| EXPECT_THROW(v->As<json::Number>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::String>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Array>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Object>(), json::Exception); | ||
|
|
||
| EXPECT_EQ(true, boolean->value()); | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -50,7 +107,23 @@ TEST(TrivialToStringTest, True) { | |
| TEST(TrivialParseTest, False) { | ||
| GuardJsonException([](){ | ||
| json::value v = json::Parser::FromString("false"); | ||
| EXPECT_EQ(false, v->As<json::Boolean>()->value()); | ||
| EXPECT_EQ(json::BooleanType, v->type()); | ||
|
|
||
| EXPECT_FALSE(v->Is<json::Null>()); | ||
| EXPECT_TRUE(v->Is<json::Boolean>()); | ||
| EXPECT_FALSE(v->Is<json::Number>()); | ||
| EXPECT_FALSE(v->Is<json::String>()); | ||
| EXPECT_FALSE(v->Is<json::Array>()); | ||
| EXPECT_FALSE(v->Is<json::Object>()); | ||
|
|
||
| EXPECT_THROW(v->As<json::Null>(), json::Exception); | ||
| const auto& boolean = v->As<json::Boolean>(); | ||
| EXPECT_THROW(v->As<json::Number>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::String>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Array>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Object>(), json::Exception); | ||
|
|
||
| EXPECT_EQ(false, boolean->value()); | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -66,7 +139,23 @@ TEST(TrivialToStringTest, False) { | |
| TEST(TrivialParseTest, Number) { | ||
| GuardJsonException([](){ | ||
| json::value v = json::Parser::FromString("2"); | ||
| EXPECT_EQ(2.0, v->As<json::Number>()->value()); | ||
| EXPECT_EQ(json::NumberType, v->type()); | ||
|
|
||
| EXPECT_FALSE(v->Is<json::Null>()); | ||
| EXPECT_FALSE(v->Is<json::Boolean>()); | ||
| EXPECT_TRUE(v->Is<json::Number>()); | ||
| EXPECT_FALSE(v->Is<json::String>()); | ||
| EXPECT_FALSE(v->Is<json::Array>()); | ||
| EXPECT_FALSE(v->Is<json::Object>()); | ||
|
|
||
| EXPECT_THROW(v->As<json::Null>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Boolean>(), json::Exception); | ||
| const auto& num = v->As<json::Number>(); | ||
| EXPECT_THROW(v->As<json::String>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Array>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Object>(), json::Exception); | ||
|
|
||
| EXPECT_EQ(2.0, num->value()); | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -82,7 +171,23 @@ TEST(TrivialToStringTest, Number) { | |
| TEST(TrivialParseTest, StringEmpty) { | ||
| GuardJsonException([](){ | ||
| json::value v = json::Parser::FromString("\"\""); | ||
| EXPECT_EQ("", v->As<json::String>()->value()); | ||
| EXPECT_EQ(json::StringType, v->type()); | ||
|
|
||
| EXPECT_FALSE(v->Is<json::Null>()); | ||
| EXPECT_FALSE(v->Is<json::Boolean>()); | ||
| EXPECT_FALSE(v->Is<json::Number>()); | ||
| EXPECT_TRUE(v->Is<json::String>()); | ||
| EXPECT_FALSE(v->Is<json::Array>()); | ||
| EXPECT_FALSE(v->Is<json::Object>()); | ||
|
|
||
| EXPECT_THROW(v->As<json::Null>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Boolean>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Number>(), json::Exception); | ||
| const auto& str = v->As<json::String>(); | ||
| EXPECT_THROW(v->As<json::Array>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Object>(), json::Exception); | ||
|
|
||
| EXPECT_EQ("", str->value()); | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -95,7 +200,22 @@ TEST(TrivialToStringTest, StringEmpty) { | |
| TEST(TrivialParseTest, StringOneChar) { | ||
| GuardJsonException([](){ | ||
| json::value v = json::Parser::FromString("\"x\""); | ||
| EXPECT_EQ(json::StringType, v->type()); | ||
|
|
||
| EXPECT_FALSE(v->Is<json::Null>()); | ||
| EXPECT_FALSE(v->Is<json::Boolean>()); | ||
| EXPECT_FALSE(v->Is<json::Number>()); | ||
| EXPECT_TRUE(v->Is<json::String>()); | ||
| EXPECT_FALSE(v->Is<json::Array>()); | ||
| EXPECT_FALSE(v->Is<json::Object>()); | ||
|
|
||
| EXPECT_THROW(v->As<json::Null>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Boolean>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Number>(), json::Exception); | ||
| const auto& str = v->As<json::String>(); | ||
| EXPECT_THROW(v->As<json::Array>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Object>(), json::Exception); | ||
|
|
||
| EXPECT_EQ("x", str->value()); | ||
| }); | ||
| } | ||
|
|
@@ -112,7 +232,24 @@ TEST(TrivialToStringTest, StringOneChar) { | |
| TEST(TrivialParseTest, ArrayEmpty) { | ||
| GuardJsonException([](){ | ||
| json::value v = json::Parser::FromString("[]"); | ||
| EXPECT_TRUE(v->As<json::Array>()->empty()); | ||
| EXPECT_EQ(json::ArrayType, v->type()); | ||
|
|
||
| EXPECT_FALSE(v->Is<json::Null>()); | ||
| EXPECT_FALSE(v->Is<json::Boolean>()); | ||
| EXPECT_FALSE(v->Is<json::Number>()); | ||
| EXPECT_FALSE(v->Is<json::String>()); | ||
| EXPECT_TRUE(v->Is<json::Array>()); | ||
| EXPECT_FALSE(v->Is<json::Object>()); | ||
|
|
||
| EXPECT_THROW(v->As<json::Null>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Boolean>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Number>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::String>(), json::Exception); | ||
| const auto& arr = v->As<json::Array>(); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. move this line down - to just before the expect_true
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. They're in that order deliberately, as that's the order of complexity of the json types |
||
| EXPECT_THROW(v->As<json::Object>(), json::Exception); | ||
|
|
||
| EXPECT_TRUE(arr->empty()); | ||
| EXPECT_EQ(0, arr->size()); | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -125,9 +262,26 @@ TEST(TrivialToStringTest, ArrayEmpty) { | |
| TEST(TrivialParseTest, ArrayOneElement) { | ||
| GuardJsonException([](){ | ||
| json::value v = json::Parser::FromString("[2]"); | ||
| EXPECT_EQ(json::ArrayType, v->type()); | ||
|
|
||
| EXPECT_FALSE(v->Is<json::Null>()); | ||
| EXPECT_FALSE(v->Is<json::Boolean>()); | ||
| EXPECT_FALSE(v->Is<json::Number>()); | ||
| EXPECT_FALSE(v->Is<json::String>()); | ||
| EXPECT_TRUE(v->Is<json::Array>()); | ||
| EXPECT_FALSE(v->Is<json::Object>()); | ||
|
|
||
| EXPECT_THROW(v->As<json::Null>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Boolean>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Number>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::String>(), json::Exception); | ||
| const auto& arr = v->As<json::Array>(); | ||
| EXPECT_THROW(v->As<json::Object>(), json::Exception); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ditto, move the arr declaration down |
||
|
|
||
| EXPECT_FALSE(arr->empty()); | ||
| EXPECT_EQ(1, arr->size()); | ||
| EXPECT_EQ(2.0, (*arr)[0]->As<json::Number>()->value()); | ||
| EXPECT_EQ(2.0, arr->at(0)->As<json::Number>()->value()); | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -143,7 +297,25 @@ TEST(TrivialToStringTest, ArrayOneElement) { | |
| TEST(TrivialParseTest, ObjectEmpty) { | ||
| GuardJsonException([](){ | ||
| json::value v = json::Parser::FromString("{}"); | ||
| EXPECT_TRUE(v->As<json::Object>()->empty()); | ||
| EXPECT_EQ(json::ObjectType, v->type()); | ||
|
|
||
| EXPECT_FALSE(v->Is<json::Null>()); | ||
| EXPECT_FALSE(v->Is<json::Boolean>()); | ||
| EXPECT_FALSE(v->Is<json::Number>()); | ||
| EXPECT_FALSE(v->Is<json::String>()); | ||
| EXPECT_FALSE(v->Is<json::Array>()); | ||
| EXPECT_TRUE(v->Is<json::Object>()); | ||
|
|
||
| EXPECT_THROW(v->As<json::Null>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Boolean>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Number>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::String>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Array>(), json::Exception); | ||
| const auto& obj = v->As<json::Object>(); | ||
|
|
||
| EXPECT_TRUE(obj->empty()); | ||
| EXPECT_THROW(obj->Get<json::Number>("g"), json::Exception); | ||
| EXPECT_THROW(obj->at("g"), std::out_of_range); | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -156,11 +328,35 @@ TEST(TrivialToStringTest, ObjectEmpty) { | |
| TEST(TrivialParseTest, ObjectOneField) { | ||
| GuardJsonException([](){ | ||
| json::value v = json::Parser::FromString("{\"f\":2}"); | ||
| EXPECT_EQ(json::ObjectType, v->type()); | ||
|
|
||
| EXPECT_FALSE(v->Is<json::Null>()); | ||
| EXPECT_FALSE(v->Is<json::Boolean>()); | ||
| EXPECT_FALSE(v->Is<json::Number>()); | ||
| EXPECT_FALSE(v->Is<json::String>()); | ||
| EXPECT_FALSE(v->Is<json::Array>()); | ||
| EXPECT_TRUE(v->Is<json::Object>()); | ||
|
|
||
| EXPECT_THROW(v->As<json::Null>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Boolean>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Number>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::String>(), json::Exception); | ||
| EXPECT_THROW(v->As<json::Array>(), json::Exception); | ||
| const auto& obj = v->As<json::Object>(); | ||
|
|
||
| EXPECT_EQ(1, obj->size()); | ||
| EXPECT_TRUE(v->As<json::Object>()->Has("f")); | ||
| EXPECT_FALSE(v->As<json::Object>()->Has("g")); | ||
| EXPECT_TRUE(obj->Has("f")); | ||
| EXPECT_THROW(obj->Get<json::Null>("f"), json::Exception); | ||
| EXPECT_THROW(obj->Get<json::Boolean>("f"), json::Exception); | ||
| EXPECT_EQ(2.0, obj->Get<json::Number>("f")); | ||
| EXPECT_THROW(obj->Get<json::String>("f"), json::Exception); | ||
| EXPECT_THROW(obj->Get<json::Array>("f"), json::Exception); | ||
| EXPECT_THROW(obj->Get<json::Object>("f"), json::Exception); | ||
| EXPECT_EQ(2.0, obj->at("f")->As<json::Number>()->value()); | ||
|
|
||
| EXPECT_FALSE(obj->Has("g")); | ||
| EXPECT_THROW(obj->Get<json::Number>("g"), json::Exception); | ||
| EXPECT_THROW(obj->at("g"), std::out_of_range); | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -307,24 +503,26 @@ TEST(EdgeTest, NegativeNumbers) { | |
|
|
||
| // Big tests. | ||
|
|
||
| constexpr const char kComplexExample[] = | ||
| "{\n" | ||
| " \"foo\": [1.0, 2, 3],\n" | ||
| " \"bar\": {\"x\": 0, \"y\": null},\n" | ||
| " \"baz\": true,\n" | ||
| " \"str\": \"asdfasdf\"\n" | ||
| "}\n"; | ||
|
|
||
| constexpr const char kComplexExampleExpected[] = | ||
| "{" | ||
| "\"bar\":{\"x\":0.0,\"y\":null}," | ||
| "\"baz\":true," | ||
| "\"foo\":[1.0,2.0,3.0]," | ||
| "\"str\":\"asdfasdf\"" | ||
| "}"; | ||
|
|
||
| TEST(BigTest, RealisticParsing) { | ||
| GuardJsonException([](){ | ||
| json::value v = json::Parser::FromString( | ||
| "{\n" | ||
| " \"foo\": [1, 2, 3],\n" | ||
| " \"bar\": {\"x\": 0, \"y\": null},\n" | ||
| " \"baz\": true,\n" | ||
| " \"str\": \"asdfasdf\"\n" | ||
| "}\n" | ||
| ); | ||
| EXPECT_TOSTRING_EQ( | ||
| "{" | ||
| "\"bar\":{\"x\":0.0,\"y\":null}," | ||
| "\"baz\":true," | ||
| "\"foo\":[1.0,2.0,3.0]," | ||
| "\"str\":\"asdfasdf\"" | ||
| "}", | ||
| v); | ||
| json::value v = json::Parser::FromString(kComplexExample); | ||
| EXPECT_TOSTRING_EQ(kComplexExampleExpected, v); | ||
| }); | ||
| } | ||
|
|
||
|
|
@@ -347,33 +545,30 @@ TEST(BigTest, RealisticConstruction) { | |
| }); | ||
| } | ||
|
|
||
| TEST(BigTest, Clone) { | ||
| GuardJsonException([](){ | ||
| json::value v = json::Parser::FromString(kComplexExample); | ||
| json::value cloned = v->Clone(); | ||
| EXPECT_TOSTRING_EQ(kComplexExampleExpected, cloned); | ||
| }); | ||
| } | ||
|
|
||
| TEST(BigTest, LotsOfArrayNesting) { | ||
| GuardJsonException([](){ | ||
| json::value v = json::Parser::FromString( | ||
| ExpectSerializesToSelf( | ||
| "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[" | ||
| "]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"); | ||
| EXPECT_TOSTRING_EQ( | ||
| "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[" | ||
| "]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]", | ||
| v); | ||
| }); | ||
| } | ||
|
|
||
| TEST(BigTest, LotsOfObjectNesting) { | ||
| GuardJsonException([](){ | ||
| json::value v = json::Parser::FromString( | ||
| ExpectSerializesToSelf( | ||
| "{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":" | ||
| "{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":" | ||
| "{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":" | ||
| "{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":null" | ||
| "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}"); | ||
| EXPECT_TOSTRING_EQ( | ||
| "{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":" | ||
| "{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":" | ||
| "{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":" | ||
| "{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":{\"f\":null" | ||
| "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}", | ||
| v); | ||
| }); | ||
| } | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You'll want to
#include <set>for this...There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.