Improve test times for tests using RandomObjects::addFields (#31556)

Currently RandomObjects::addFields can potentially generate a large number of fields This commit decreases the chances that a new object or array is added as a new branch of an object, which lowers the probability of ending up with very big documents generated. It also reduces the number of documents generated for the SimulatePipelineResponseTests from 10 to 5 to reduce the testing time required for parsing.
elastic · Jun 26, 2018 · ca4c857 · ca4c857
1 parent be9292c
commit ca4c857
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/server/src/test/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResultTests.java b/server/src/test/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResultTests.java
@@ -31,7 +31,7 @@
 public class SimulateDocumentVerboseResultTests extends AbstractXContentTestCase<SimulateDocumentVerboseResult> {
 
     static SimulateDocumentVerboseResult createTestInstance(boolean withFailures) {
-        int numDocs = randomIntBetween(0, 10);
+        int numDocs = randomIntBetween(0, 5);
         List<SimulateProcessorResult> results = new ArrayList<>();
         for (int i = 0; i<numDocs; i++) {
             boolean isSuccessful = !(withFailures && randomBoolean());

diff --git a/server/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineResponseTests.java b/server/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineResponseTests.java
@@ -94,7 +94,7 @@ public void testSerialization() throws IOException {
     }
 
     static SimulatePipelineResponse createInstance(String pipelineId, boolean isVerbose, boolean withFailure) {
-        int numResults = randomIntBetween(1, 10);
+        int numResults = randomIntBetween(1, 5);
         List<SimulateDocumentResult> results = new ArrayList<>(numResults);
         for (int i = 0; i < numResults; i++) {
             if (isVerbose) {

diff --git a/test/framework/src/main/java/org/elasticsearch/test/RandomObjects.java b/test/framework/src/main/java/org/elasticsearch/test/RandomObjects.java
@@ -187,9 +187,9 @@ public static BytesReference randomSource(Random random, XContentType xContentTy
      * Randomly adds fields, objects, or arrays to the provided builder. The maximum depth is 5.
      */
     private static void addFields(Random random, XContentBuilder builder, int minNumFields, int currentDepth) throws IOException {
-        int numFields = randomIntBetween(random, minNumFields, 10);
+        int numFields = randomIntBetween(random, minNumFields, 5);
         for (int i = 0; i < numFields; i++) {
-            if (currentDepth < 5 && random.nextBoolean()) {
+            if (currentDepth < 5 && random.nextInt(100) >= 70) {
                 if (random.nextBoolean()) {
                     builder.startObject(RandomStrings.randomAsciiOfLengthBetween(random, 6, 10));
                     addFields(random, builder, minNumFields, currentDepth + 1);