honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unmute and fix testSubParserArray (#40626) 

testSubParserArray failed, fixed and improved to not always have an
object as outer-level inside array.

Closes #40617
This commit is contained in:
Henning Andersen 2019-03-29 17:30:08 +01:00 committed by Henning Andersen
parent 92d07e9377
commit 14ee3d3f95
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/x-content/src/test/java/org/elasticsearch/common/xcontent/XContentParserTests.java
View File

@ -376,7 +376,7 @@ public class XContentParserTests extends ESTestCase {
builder.startArray(); builder.startArray();
int numberOfTokens = 0; int numberOfTokens = 0;
for (int i = 0; i < numberOfArrayElements; ++i) { for (int i = 0; i < numberOfArrayElements; ++i) {
numberOfTokens += generateRandomObjectForMarking(builder); numberOfTokens += generateRandomObject(builder, 0);
} }
builder.endArray(); builder.endArray();
builder.endObject(); builder.endObject();
@ -390,7 +390,7 @@ public class XContentParserTests extends ESTestCase {
assertEquals(XContentParser.Token.START_ARRAY, parser.nextToken()); // [ assertEquals(XContentParser.Token.START_ARRAY, parser.nextToken()); // [
XContentParser subParser = new XContentSubParser(parser); XContentParser subParser = new XContentSubParser(parser);
try { try {
int tokensToSkip = randomInt(numberOfTokens - 1); int tokensToSkip = randomInt(numberOfTokens);
for (int i = 0; i < tokensToSkip; i++) { for (int i = 0; i < tokensToSkip; i++) {
// Simulate incomplete parsing // Simulate incomplete parsing
assertNotNull(subParser.nextToken()); assertNotNull(subParser.nextToken());