Merge branch 'master' into mapper_plugin_api

1 files changed, 9 insertions, 6 deletions

diff --git a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java
index 617e7e9eb4..a3eac59ac2 100644
--- a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java
+++ b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java
@@ -134,13 +134,16 @@ public class SearchSourceBuilderTests extends ESTestCase {
                 (b) -> {
                     b.bind(Environment.class).toInstance(new Environment(settings));
                     b.bind(ThreadPool.class).toInstance(threadPool);
-                }, settingsModule,
-                scriptModule, new IndicesModule(namedWriteableRegistry, Collections.emptyList()) {
+                    b.bind(ScriptService.class).toInstance(scriptModule.getScriptService());
+                },
+                settingsModule,
+                new IndicesModule(namedWriteableRegistry, Collections.emptyList()) {
                     @Override
                     protected void configure() {
                         bindMapperExtension();
                     }
-                }, new SearchModule(settings, namedWriteableRegistry) {
+                },
+                new SearchModule(settings, namedWriteableRegistry) {
                     @Override
                     protected void configureSearch() {
                         // Skip me
@@ -216,12 +219,12 @@ public class SearchSourceBuilderTests extends ESTestCase {
             for (int i = 0; i < fieldsSize; i++) {
                 fields.add(randomAsciiOfLengthBetween(5, 50));
             }
-            builder.fields(fields);
+            builder.storedFields(fields);
         }
         if (randomBoolean()) {
             int fieldDataFieldsSize = randomInt(25);
             for (int i = 0; i < fieldDataFieldsSize; i++) {
-                builder.fieldDataField(randomAsciiOfLengthBetween(5, 50));
+                builder.docValueField(randomAsciiOfLengthBetween(5, 50));
             }
         }
         if (randomBoolean()) {
@@ -391,7 +394,7 @@ public class SearchSourceBuilderTests extends ESTestCase {
         }
         if (randomBoolean()) {
             String field = randomBoolean() ? null : randomAsciiOfLengthBetween(5, 20);
-            int max = randomInt(1000);
+            int max = between(2, 1000);
             int id = randomInt(max-1);
             if (field == null) {
                 builder.slice(new SliceBuilder(id, max));