Skip to content

Commit 6ed9b02

Browse files
dota17dota17
committed
remove extra offsets test
1 parent ecc5ebb commit 6ed9b02

File tree

1 file changed

+1
-103
lines changed

1 file changed

+1
-103
lines changed

‎src/test_lib_json/main.cpp

Lines changed: 1 addition & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -2662,41 +2662,20 @@ JSONTEST_FIXTURE_LOCAL(ReaderTest, parseObject) {
26622662
JSONTEST_ASSERT(reader.getFormattedErrorMessages() ==
26632663
"* Line 1, Column 12\n Missing ':' after object "
26642664
"member name\n");
2665-
std::vector<Json::Reader::StructuredError> errors =
2666-
reader.getStructuredErrors();
2667-
JSONTEST_ASSERT(errors.size() == 1);
2668-
JSONTEST_ASSERT(errors.at(0).offset_start == 11);
2669-
JSONTEST_ASSERT(errors.at(0).offset_limit == 12);
2670-
JSONTEST_ASSERT(errors.at(0).message ==
2671-
"Missing ':' after object member name");
26722665
}
26732666
{
26742667
bool ok = reader.parse("{\"property\" : \"value\" ", root);
26752668
JSONTEST_ASSERT(!ok);
26762669
JSONTEST_ASSERT(reader.getFormattedErrorMessages() ==
26772670
"* Line 1, Column 23\n Missing ',' or '}' in object "
26782671
"declaration\n");
2679-
std::vector<Json::Reader::StructuredError> errors =
2680-
reader.getStructuredErrors();
2681-
JSONTEST_ASSERT(errors.size() == 1);
2682-
JSONTEST_ASSERT(errors.at(0).offset_start == 22);
2683-
JSONTEST_ASSERT(errors.at(0).offset_limit == 22);
2684-
JSONTEST_ASSERT(errors.at(0).message ==
2685-
"Missing ',' or '}' in object declaration");
26862672
}
26872673
{
26882674
bool ok = reader.parse("{\"property\" : \"value\", ", root);
26892675
JSONTEST_ASSERT(!ok);
26902676
JSONTEST_ASSERT(reader.getFormattedErrorMessages() ==
26912677
"* Line 1, Column 24\n Missing '}' or object "
26922678
"member name\n");
2693-
std::vector<Json::Reader::StructuredError> errors =
2694-
reader.getStructuredErrors();
2695-
JSONTEST_ASSERT(errors.size() == 1);
2696-
JSONTEST_ASSERT(errors.at(0).offset_start == 23);
2697-
JSONTEST_ASSERT(errors.at(0).offset_limit == 23);
2698-
JSONTEST_ASSERT(errors.at(0).message ==
2699-
"Missing '}' or object member name");
27002679
}
27012680
}
27022681

@@ -2709,27 +2688,13 @@ JSONTEST_FIXTURE_LOCAL(ReaderTest, parseArray) {
27092688
JSONTEST_ASSERT(reader.getFormattedErrorMessages() ==
27102689
"* Line 1, Column 11\n Missing ',' or ']' in array "
27112690
"declaration\n");
2712-
std::vector<Json::Reader::StructuredError> errors =
2713-
reader.getStructuredErrors();
2714-
JSONTEST_ASSERT(errors.size() == 1);
2715-
JSONTEST_ASSERT(errors.at(0).offset_start == 10);
2716-
JSONTEST_ASSERT(errors.at(0).offset_limit == 10);
2717-
JSONTEST_ASSERT(errors.at(0).message ==
2718-
"Missing ',' or ']' in array declaration");
27192691
}
27202692
{
27212693
bool ok = reader.parse("[ \"value1\" \"value2\" ] ", root);
27222694
JSONTEST_ASSERT(!ok);
27232695
JSONTEST_ASSERT(reader.getFormattedErrorMessages() ==
27242696
"* Line 1, Column 12\n Missing ',' or ']' in array "
27252697
"declaration\n");
2726-
std::vector<Json::Reader::StructuredError> errors =
2727-
reader.getStructuredErrors();
2728-
JSONTEST_ASSERT(errors.size() == 1);
2729-
JSONTEST_ASSERT(errors.at(0).offset_start == 11);
2730-
JSONTEST_ASSERT(errors.at(0).offset_limit == 19);
2731-
JSONTEST_ASSERT(errors.at(0).message ==
2732-
"Missing ',' or ']' in array declaration");
27332698
}
27342699
}
27352700

@@ -2750,14 +2715,6 @@ JSONTEST_FIXTURE_LOCAL(ReaderTest, parseString) {
27502715
" additional six characters expected to "
27512716
"parse unicode surrogate pair.\n"
27522717
"See Line 1, Column 10 for detail.\n");
2753-
std::vector<Json::Reader::StructuredError> errors =
2754-
reader.getStructuredErrors();
2755-
JSONTEST_ASSERT(errors.size() == 1);
2756-
JSONTEST_ASSERT(errors.at(0).offset_start == 2);
2757-
JSONTEST_ASSERT(errors.at(0).offset_limit == 10);
2758-
JSONTEST_ASSERT(errors.at(0).message ==
2759-
"additional six characters expected to "
2760-
"parse unicode surrogate pair.");
27612718
}
27622719
{
27632720
bool ok = reader.parse("[ \"\\uD801\\d1234\" ]", root);
@@ -2767,14 +2724,6 @@ JSONTEST_FIXTURE_LOCAL(ReaderTest, parseString) {
27672724
" expecting another \\u token to begin the "
27682725
"second half of a unicode surrogate pair\n"
27692726
"See Line 1, Column 12 for detail.\n");
2770-
std::vector<Json::Reader::StructuredError> errors =
2771-
reader.getStructuredErrors();
2772-
JSONTEST_ASSERT(errors.size() == 1);
2773-
JSONTEST_ASSERT(errors.at(0).offset_start == 2);
2774-
JSONTEST_ASSERT(errors.at(0).offset_limit == 16);
2775-
JSONTEST_ASSERT(errors.at(0).message ==
2776-
"expecting another \\u token to begin the "
2777-
"second half of a unicode surrogate pair");
27782727
}
27792728
{
27802729
bool ok = reader.parse("[ \"\\ua3t@\" ]", root);
@@ -2784,14 +2733,6 @@ JSONTEST_FIXTURE_LOCAL(ReaderTest, parseString) {
27842733
" Bad unicode escape sequence in string: "
27852734
"hexadecimal digit expected.\n"
27862735
"See Line 1, Column 9 for detail.\n");
2787-
std::vector<Json::Reader::StructuredError> errors =
2788-
reader.getStructuredErrors();
2789-
JSONTEST_ASSERT(errors.size() == 1);
2790-
JSONTEST_ASSERT(errors.at(0).offset_start == 2);
2791-
JSONTEST_ASSERT(errors.at(0).offset_limit == 10);
2792-
JSONTEST_ASSERT(errors.at(0).message ==
2793-
"Bad unicode escape sequence in string: "
2794-
"hexadecimal digit expected.");
27952736
}
27962737
{
27972738
bool ok = reader.parse("[ \"\\ua3t\" ]", root);
@@ -2801,14 +2742,6 @@ JSONTEST_FIXTURE_LOCAL(ReaderTest, parseString) {
28012742
"* Line 1, Column 3\n"
28022743
" Bad unicode escape sequence in string: four digits expected.\n"
28032744
"See Line 1, Column 6 for detail.\n");
2804-
std::vector<Json::Reader::StructuredError> errors =
2805-
reader.getStructuredErrors();
2806-
JSONTEST_ASSERT(errors.size() == 1);
2807-
JSONTEST_ASSERT(errors.at(0).offset_start == 2);
2808-
JSONTEST_ASSERT(errors.at(0).offset_limit == 9);
2809-
JSONTEST_ASSERT(
2810-
errors.at(0).message ==
2811-
"Bad unicode escape sequence in string: four digits expected.");
28122745
}
28132746
}
28142747

@@ -2883,7 +2816,7 @@ JSONTEST_FIXTURE_LOCAL(ReaderTest, parseWithNoErrorsTestingOffsets) {
28832816
JSONTEST_ASSERT(root.getOffsetLimit() == 115);
28842817
}
28852818

2886-
JSONTEST_FIXTURE_LOCAL(ReaderTest, parseWithOneError) {
2819+
JSONTEST_FIXTURE_LOCAL(ReaderTest, parseWithOneErrorTestingOffsets) {
28872820
Json::Reader reader;
28882821
Json::Value root;
28892822
{
@@ -2928,13 +2861,6 @@ JSONTEST_FIXTURE_LOCAL(ReaderTest, parseSpecialFloat) {
29282861
reader.getFormattedErrorMessages() ==
29292862
"* Line 1, Column 9\n Syntax error: value, object or array "
29302863
"expected.\n");
2931-
std::vector<Json::Reader::StructuredError> errors =
2932-
reader.getStructuredErrors();
2933-
JSONTEST_ASSERT(errors.size() == 1);
2934-
JSONTEST_ASSERT(errors.at(0).offset_start == 8);
2935-
JSONTEST_ASSERT(errors.at(0).offset_limit == 9);
2936-
JSONTEST_ASSERT(errors.at(0).message ==
2937-
"Syntax error: value, object or array expected.");
29382864
}
29392865
{
29402866
bool ok = reader.parse("{ \"a\" : Infiniaa }", root);
@@ -2943,13 +2869,6 @@ JSONTEST_FIXTURE_LOCAL(ReaderTest, parseSpecialFloat) {
29432869
reader.getFormattedErrorMessages() ==
29442870
"* Line 1, Column 9\n Syntax error: value, object or array "
29452871
"expected.\n");
2946-
std::vector<Json::Reader::StructuredError> errors =
2947-
reader.getStructuredErrors();
2948-
JSONTEST_ASSERT(errors.size() == 1);
2949-
JSONTEST_ASSERT(errors.at(0).offset_start == 8);
2950-
JSONTEST_ASSERT(errors.at(0).offset_limit == 9);
2951-
JSONTEST_ASSERT(errors.at(0).message ==
2952-
"Syntax error: value, object or array expected.");
29532872
}
29542873
}
29552874

@@ -2963,14 +2882,6 @@ JSONTEST_FIXTURE_LOCAL(ReaderTest, strictModeParseNumber) {
29632882
"* Line 1, Column 1\n"
29642883
" A valid JSON document must be either an array or"
29652884
" an object value.\n");
2966-
std::vector<Json::Reader::StructuredError> errors =
2967-
reader.getStructuredErrors();
2968-
JSONTEST_ASSERT(errors.size() == 1);
2969-
JSONTEST_ASSERT(errors.at(0).offset_start == 0);
2970-
JSONTEST_ASSERT(errors.at(0).offset_limit == 3);
2971-
JSONTEST_ASSERT(errors.at(0).message ==
2972-
"A valid JSON document must be either an array or"
2973-
" an object value.");
29742885
}
29752886

29762887
JSONTEST_FIXTURE_LOCAL(ReaderTest, parseChineseWithOneError) {
@@ -2981,13 +2892,6 @@ JSONTEST_FIXTURE_LOCAL(ReaderTest, parseChineseWithOneError) {
29812892
JSONTEST_ASSERT(reader.getFormattedErrorMessages() ==
29822893
"* Line 1, Column 19\n Syntax error: value, object or array "
29832894
"expected.\n");
2984-
std::vector<Json::Reader::StructuredError> errors =
2985-
reader.getStructuredErrors();
2986-
JSONTEST_ASSERT(errors.size() == 1);
2987-
JSONTEST_ASSERT(errors.at(0).offset_start == 18);
2988-
JSONTEST_ASSERT(errors.at(0).offset_limit == 19);
2989-
JSONTEST_ASSERT(errors.at(0).message ==
2990-
"Syntax error: value, object or array expected.");
29912895
}
29922896

29932897
JSONTEST_FIXTURE_LOCAL(ReaderTest, parseWithDetailError) {
@@ -2998,12 +2902,6 @@ JSONTEST_FIXTURE_LOCAL(ReaderTest, parseWithDetailError) {
29982902
JSONTEST_ASSERT(reader.getFormattedErrorMessages() ==
29992903
"* Line 1, Column 16\n Bad escape sequence in string\nSee "
30002904
"Line 1, Column 20 for detail.\n");
3001-
std::vector<Json::Reader::StructuredError> errors =
3002-
reader.getStructuredErrors();
3003-
JSONTEST_ASSERT(errors.size() == 1);
3004-
JSONTEST_ASSERT(errors.at(0).offset_start == 15);
3005-
JSONTEST_ASSERT(errors.at(0).offset_limit == 23);
3006-
JSONTEST_ASSERT(errors.at(0).message == "Bad escape sequence in string");
30072905
}
30082906

30092907
JSONTEST_FIXTURE_LOCAL(ReaderTest, pushErrorTest) {

0 commit comments

Comments
 (0)