Reduced generator size. Fixed Visual Studio warnings

This commit is contained in:
Benoit Blanchon
2015-08-19 16:08:19 +02:00
parent ef2641b49b
commit 39c506b419
10 changed files with 34 additions and 37 deletions

View File

@ -13,21 +13,26 @@ TEST(JsonParser_Nested_Tests, ArrayNestedInObject) {
JsonObject &object = jsonBuffer.parseObject(jsonString);
JsonArray &array1 = object["ab"];
JsonArray &array2 = object["cd"];
const JsonArray &array2 = object["cd"];
JsonArray &array3 = object["ef"];
ASSERT_TRUE(object.success());
ASSERT_TRUE(array1.success());
ASSERT_TRUE(array2.success());
ASSERT_FALSE(array3.success());
ASSERT_EQ(2, array1.size());
ASSERT_EQ(2, array2.size());
ASSERT_EQ(0, array3.size());
EXPECT_EQ(1, array1[0].as<int>());
EXPECT_EQ(2, array1[1].as<int>());
EXPECT_EQ(3, array2[0].as<int>());
EXPECT_EQ(4, array2[1].as<int>());
EXPECT_EQ(0, array3[0].as<int>());
}
TEST(JsonParser_Nested_Tests, ObjectNestedInArray) {
@ -37,18 +42,22 @@ TEST(JsonParser_Nested_Tests, ObjectNestedInArray) {
JsonArray &array = jsonBuffer.parseArray(jsonString);
JsonObject &object1 = array[0];
JsonObject &object2 = array[1];
const JsonObject &object2 = array[1];
JsonObject &object3 = array[2];
ASSERT_TRUE(array.success());
ASSERT_TRUE(object1.success());
ASSERT_TRUE(object2.success());
ASSERT_FALSE(object3.success());
ASSERT_EQ(2, object1.size());
ASSERT_EQ(2, object2.size());
ASSERT_EQ(0, object3.size());
EXPECT_EQ(1, object1["a"].as<int>());
EXPECT_EQ(2, object1["b"].as<int>());
EXPECT_EQ(3, object2["c"].as<int>());
EXPECT_EQ(4, object2["d"].as<int>());
EXPECT_EQ(0, object3["e"].as<int>());
}