Reset tests

romseygeek · romseygeek · commit 68d9ff15cfd6 · 2019-05-24T16:21:30.000+01:00
diff --git a/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/ConstructingObjectParser.java b/libs/x-content/src/main/java/org/elasticsearch/common/xcontent/ConstructingObjectParser.java
@@ -149,6 +149,7 @@ public ConstructingObjectParser(String name, boolean ignoreUnknownFields, Functi
     public ConstructingObjectParser(String name, boolean ignoreUnknownFields, BiFunction<Object[], Context, Value> builder) {
         objectParser = new ObjectParser<>(name, ignoreUnknownFields, null);
         this.builder = builder;
+
     }
 
     /**
diff --git a/server/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java b/server/src/test/java/org/elasticsearch/action/update/UpdateRequestTests.java
@@ -288,7 +288,7 @@ public void testUnknownFieldParsing() throws Exception {
                 .endObject());
 
         XContentParseException ex = expectThrows(XContentParseException.class, () -> request.fromXContent(contentParser));
-        assertEquals("[1:18] [UpdateRequest] unknown field [unknown_field], parser not found", ex.getMessage());
+        assertEquals("[1:2] [UpdateRequest] unknown field [unknown_field], parser not found", ex.getMessage());
 
         UpdateRequest request2 = new UpdateRequest("test", "type", "1");
         XContentParser unknownObject = createParser(XContentFactory.jsonBuilder()
@@ -299,7 +299,7 @@ public void testUnknownFieldParsing() throws Exception {
                     .endObject()
                 .endObject());
         ex = expectThrows(XContentParseException.class, () -> request2.fromXContent(unknownObject));
-        assertEquals("[1:85] [UpdateRequest] unknown field [params], parser not found", ex.getMessage());
+        assertEquals("[1:76] [UpdateRequest] unknown field [params], parser not found", ex.getMessage());
     }
 
     public void testFetchSourceParsing() throws Exception {
diff --git a/server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/highlight/HighlightBuilderTests.java
@@ -162,7 +162,7 @@ public void testUnknownArrayNameExpection() throws IOException {
             XContentParseException e = expectParseThrows(XContentParseException.class, "{\n" +
                     "    \"bad_fieldname\" : [ \"field1\" 1 \"field2\" ]\n" +
                     "}\n");
-            assertEquals("[2:23] [highlight] unknown field [bad_fieldname], parser not found", e.getMessage());
+            assertEquals("[2:5] [highlight] unknown field [bad_fieldname], parser not found", e.getMessage());
         }
 
         {
@@ -175,7 +175,7 @@ public void testUnknownArrayNameExpection() throws IOException {
                     "}\n");
             assertThat(e.getMessage(), containsString("[highlight] failed to parse field [fields]"));
             assertThat(e.getCause().getMessage(), containsString("[fields] failed to parse field [body]"));
-            assertEquals("[4:27] [highlight_field] unknown field [bad_fieldname], parser not found", e.getCause().getCause().getMessage());
+            assertEquals("[4:9] [highlight_field] unknown field [bad_fieldname], parser not found", e.getCause().getCause().getMessage());
         }
     }
 
@@ -193,7 +193,7 @@ public void testUnknownFieldnameExpection() throws IOException {
             XContentParseException e = expectParseThrows(XContentParseException.class, "{\n" +
                     "    \"bad_fieldname\" : \"value\"\n" +
                     "}\n");
-            assertEquals("[2:23] [highlight] unknown field [bad_fieldname], parser not found", e.getMessage());
+            assertEquals("[2:5] [highlight] unknown field [bad_fieldname], parser not found", e.getMessage());
         }
 
         {
@@ -206,7 +206,7 @@ public void testUnknownFieldnameExpection() throws IOException {
                     "}\n");
             assertThat(e.getMessage(), containsString("[highlight] failed to parse field [fields]"));
             assertThat(e.getCause().getMessage(), containsString("[fields] failed to parse field [body]"));
-            assertEquals("[4:27] [highlight_field] unknown field [bad_fieldname], parser not found", e.getCause().getCause().getMessage());
+            assertEquals("[4:9] [highlight_field] unknown field [bad_fieldname], parser not found", e.getCause().getCause().getMessage());
         }
     }
 
@@ -218,7 +218,7 @@ public void testUnknownObjectFieldnameExpection() throws IOException {
             XContentParseException e = expectParseThrows(XContentParseException.class, "{\n" +
                     "    \"bad_fieldname\" :  { \"field\" : \"value\" }\n \n" +
                     "}\n");
-            assertEquals("[2:24] [highlight] unknown field [bad_fieldname], parser not found", e.getMessage());
+            assertEquals("[2:5] [highlight] unknown field [bad_fieldname], parser not found", e.getMessage());
         }
 
         {
@@ -231,7 +231,7 @@ public void testUnknownObjectFieldnameExpection() throws IOException {
                     "}\n");
             assertThat(e.getMessage(), containsString("[highlight] failed to parse field [fields]"));
             assertThat(e.getCause().getMessage(), containsString("[fields] failed to parse field [body]"));
-            assertEquals("[4:27] [highlight_field] unknown field [bad_fieldname], parser not found", e.getCause().getCause().getMessage());
+            assertEquals("[4:9] [highlight_field] unknown field [bad_fieldname], parser not found", e.getCause().getCause().getMessage());
         }
     }
 
diff --git a/server/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java b/server/src/test/java/org/elasticsearch/search/rescore/QueryRescorerBuilderTests.java
@@ -251,7 +251,7 @@ public void testUnknownFieldsExpection() throws IOException {
             "}\n";
         try (XContentParser parser = createParser(rescoreElement)) {
             XContentParseException e = expectThrows(XContentParseException.class, () -> RescorerBuilder.parseFromXContent(parser));
-            assertEquals("[3:35] [query] unknown field [bad_fieldname], parser not found", e.getMessage());
+            assertEquals("[3:17] [query] unknown field [bad_fieldname], parser not found", e.getMessage());
         }
 
         rescoreElement = "{\n" +
diff --git a/server/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/FieldSortBuilderTests.java
@@ -318,7 +318,7 @@ public void testUnknownOptionFails() throws IOException {
             parser.nextToken();
 
             XContentParseException e = expectThrows(XContentParseException.class, () -> FieldSortBuilder.fromXContent(parser, ""));
-            assertEquals("[1:30] [field_sort] unknown field [reverse], parser not found", e.getMessage());
+            assertEquals("[1:18] [field_sort] unknown field [reverse], parser not found", e.getMessage());
         }
     }
 
diff --git a/server/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java b/server/src/test/java/org/elasticsearch/search/sort/ScriptSortBuilderTests.java
@@ -227,7 +227,7 @@ public void testParseBadFieldNameExceptions() throws IOException {
             parser.nextToken();
 
             XContentParseException e = expectThrows(XContentParseException.class, () -> ScriptSortBuilder.fromXContent(parser, null));
-            assertEquals("[1:29] [_script] unknown field [bad_field], parser not found", e.getMessage());
+            assertEquals("[1:15] [_script] unknown field [bad_field], parser not found", e.getMessage());
         }
     }
 
@@ -240,7 +240,7 @@ public void testParseBadFieldNameExceptionsOnStartObject() throws IOException {
             parser.nextToken();
 
             XContentParseException e = expectThrows(XContentParseException.class, () -> ScriptSortBuilder.fromXContent(parser, null));
-            assertEquals("[1:29] [_script] unknown field [bad_field], parser not found", e.getMessage());
+            assertEquals("[1:15] [_script] unknown field [bad_field], parser not found", e.getMessage());
         }
     }
 
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfigTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/datafeed/DatafeedConfigTests.java
@@ -268,7 +268,7 @@ public void testFutureConfigParse() throws IOException {
                 .createParser(xContentRegistry(), DeprecationHandler.THROW_UNSUPPORTED_OPERATION, FUTURE_DATAFEED);
         XContentParseException e = expectThrows(XContentParseException.class,
                 () -> DatafeedConfig.STRICT_PARSER.apply(parser, null).build());
-        assertEquals("[6:35] [datafeed_config] unknown field [tomorrows_technology_today], parser not found", e.getMessage());
+        assertEquals("[6:5] [datafeed_config] unknown field [tomorrows_technology_today], parser not found", e.getMessage());
     }
 
     public void testPastQueryConfigParse() throws IOException {
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/config/JobTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/job/config/JobTests.java
@@ -81,7 +81,7 @@ public void testFutureConfigParse() throws IOException {
                 .createParser(NamedXContentRegistry.EMPTY, DeprecationHandler.THROW_UNSUPPORTED_OPERATION, FUTURE_JOB);
         XContentParseException e = expectThrows(XContentParseException.class,
                 () -> Job.STRICT_PARSER.apply(parser, null).build());
-        assertEquals("[4:35] [job_details] unknown field [tomorrows_technology_today], parser not found", e.getMessage());
+        assertEquals("[4:5] [job_details] unknown field [tomorrows_technology_today], parser not found", e.getMessage());
     }
 
     public void testFutureMetadataParse() throws IOException {
diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/output/AutodetectResultsParserTests.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/process/autodetect/output/AutodetectResultsParserTests.java
@@ -390,7 +390,7 @@ public void testParse_GivenUnknownObject() throws ElasticsearchParseException, I
             XContentParseException e = expectThrows(XContentParseException.class,
                 () -> parser.parseResults(inputStream).forEachRemaining(a -> {
                 }));
-            assertEquals("[1:13] [autodetect_result] unknown field [unknown], parser not found", e.getMessage());
+            assertEquals("[1:3] [autodetect_result] unknown field [unknown], parser not found", e.getMessage());
         }
     }
 
diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/common/text/TextTemplateTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/common/text/TextTemplateTests.java
@@ -210,7 +210,7 @@ public void testParserInvalidUnknownScriptType() throws Exception {
         XContentParser parser = createParser(JsonXContent.jsonXContent, bytes);
         parser.nextToken();
         XContentParseException ex = expectThrows(XContentParseException.class, () -> TextTemplate.parse(parser));
-        assertEquals("[1:13] [script] unknown field [template], parser not found", ex.getMessage());
+        assertEquals("[1:2] [script] unknown field [template], parser not found", ex.getMessage());
     }
 
     public void testParserInvalidMissingText() throws Exception {
@@ -222,7 +222,7 @@ public void testParserInvalidMissingText() throws Exception {
         XContentParser parser = createParser(JsonXContent.jsonXContent, bytes);
         parser.nextToken();
         XContentParseException ex = expectThrows(XContentParseException.class, () -> TextTemplate.parse(parser));
-        assertEquals("[1:9] [script] unknown field [type], parser not found", ex.getMessage());
+        assertEquals("[1:2] [script] unknown field [type], parser not found", ex.getMessage());
     }
 
     public void testNullObject() throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ public ConstructingObjectParser(String name, boolean ignoreUnknownFields, Functi`
`149`	`149`	`public ConstructingObjectParser(String name, boolean ignoreUnknownFields, BiFunction<Object[], Context, Value> builder) {`
`150`	`150`	`objectParser = new ObjectParser<>(name, ignoreUnknownFields, null);`
`151`	`151`	`this.builder = builder;`
	`152`	`+`
`152`	`153`	`}`
`153`	`154`
`154`	`155`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public void testUnknownArrayNameExpection() throws IOException {`
`162`	`162`	`XContentParseException e = expectParseThrows(XContentParseException.class, "{\n" +`
`163`	`163`	`" \"bad_fieldname\" : [ \"field1\" 1 \"field2\" ]\n" +`
`164`	`164`	`"}\n");`
`165`		`- assertEquals("[2:23] [highlight] unknown field [bad_fieldname], parser not found", e.getMessage());`
	`165`	`+ assertEquals("[2:5] [highlight] unknown field [bad_fieldname], parser not found", e.getMessage());`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`{`
`@@ -175,7 +175,7 @@ public void testUnknownArrayNameExpection() throws IOException {`
`175`	`175`	`"}\n");`
`176`	`176`	`assertThat(e.getMessage(), containsString("[highlight] failed to parse field [fields]"));`
`177`	`177`	`assertThat(e.getCause().getMessage(), containsString("[fields] failed to parse field [body]"));`
`178`		`- assertEquals("[4:27] [highlight_field] unknown field [bad_fieldname], parser not found", e.getCause().getCause().getMessage());`
	`178`	`+ assertEquals("[4:9] [highlight_field] unknown field [bad_fieldname], parser not found", e.getCause().getCause().getMessage());`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`
`@@ -193,7 +193,7 @@ public void testUnknownFieldnameExpection() throws IOException {`
`193`	`193`	`XContentParseException e = expectParseThrows(XContentParseException.class, "{\n" +`
`194`	`194`	`" \"bad_fieldname\" : \"value\"\n" +`
`195`	`195`	`"}\n");`
`196`		`- assertEquals("[2:23] [highlight] unknown field [bad_fieldname], parser not found", e.getMessage());`
	`196`	`+ assertEquals("[2:5] [highlight] unknown field [bad_fieldname], parser not found", e.getMessage());`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`{`
`@@ -206,7 +206,7 @@ public void testUnknownFieldnameExpection() throws IOException {`
`206`	`206`	`"}\n");`
`207`	`207`	`assertThat(e.getMessage(), containsString("[highlight] failed to parse field [fields]"));`
`208`	`208`	`assertThat(e.getCause().getMessage(), containsString("[fields] failed to parse field [body]"));`
`209`		`- assertEquals("[4:27] [highlight_field] unknown field [bad_fieldname], parser not found", e.getCause().getCause().getMessage());`
	`209`	`+ assertEquals("[4:9] [highlight_field] unknown field [bad_fieldname], parser not found", e.getCause().getCause().getMessage());`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`
`@@ -218,7 +218,7 @@ public void testUnknownObjectFieldnameExpection() throws IOException {`
`218`	`218`	`XContentParseException e = expectParseThrows(XContentParseException.class, "{\n" +`
`219`	`219`	`" \"bad_fieldname\" : { \"field\" : \"value\" }\n \n" +`
`220`	`220`	`"}\n");`
`221`		`- assertEquals("[2:24] [highlight] unknown field [bad_fieldname], parser not found", e.getMessage());`
	`221`	`+ assertEquals("[2:5] [highlight] unknown field [bad_fieldname], parser not found", e.getMessage());`
`222`	`222`	`}`
`223`	`223`
`224`	`224`	`{`
`@@ -231,7 +231,7 @@ public void testUnknownObjectFieldnameExpection() throws IOException {`
`231`	`231`	`"}\n");`
`232`	`232`	`assertThat(e.getMessage(), containsString("[highlight] failed to parse field [fields]"));`
`233`	`233`	`assertThat(e.getCause().getMessage(), containsString("[fields] failed to parse field [body]"));`
`234`		`- assertEquals("[4:27] [highlight_field] unknown field [bad_fieldname], parser not found", e.getCause().getCause().getMessage());`
	`234`	`+ assertEquals("[4:9] [highlight_field] unknown field [bad_fieldname], parser not found", e.getCause().getCause().getMessage());`
`235`	`235`	`}`
`236`	`236`	`}`
`237`	`237`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ public void testUnknownFieldsExpection() throws IOException {`
`251`	`251`	`"}\n";`
`252`	`252`	`try (XContentParser parser = createParser(rescoreElement)) {`
`253`	`253`	`XContentParseException e = expectThrows(XContentParseException.class, () -> RescorerBuilder.parseFromXContent(parser));`
`254`		`- assertEquals("[3:35] [query] unknown field [bad_fieldname], parser not found", e.getMessage());`
	`254`	`+ assertEquals("[3:17] [query] unknown field [bad_fieldname], parser not found", e.getMessage());`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`rescoreElement = "{\n" +`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ public void testUnknownOptionFails() throws IOException {`
`318`	`318`	`parser.nextToken();`
`319`	`319`
`320`	`320`	`XContentParseException e = expectThrows(XContentParseException.class, () -> FieldSortBuilder.fromXContent(parser, ""));`
`321`		`- assertEquals("[1:30] [field_sort] unknown field [reverse], parser not found", e.getMessage());`
	`321`	`+ assertEquals("[1:18] [field_sort] unknown field [reverse], parser not found", e.getMessage());`
`322`	`322`	`}`
`323`	`323`	`}`
`324`	`324`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ public void testParseBadFieldNameExceptions() throws IOException {`
`227`	`227`	`parser.nextToken();`
`228`	`228`
`229`	`229`	`XContentParseException e = expectThrows(XContentParseException.class, () -> ScriptSortBuilder.fromXContent(parser, null));`
`230`		`- assertEquals("[1:29] [_script] unknown field [bad_field], parser not found", e.getMessage());`
	`230`	`+ assertEquals("[1:15] [_script] unknown field [bad_field], parser not found", e.getMessage());`
`231`	`231`	`}`
`232`	`232`	`}`
`233`	`233`
`@@ -240,7 +240,7 @@ public void testParseBadFieldNameExceptionsOnStartObject() throws IOException {`
`240`	`240`	`parser.nextToken();`
`241`	`241`
`242`	`242`	`XContentParseException e = expectThrows(XContentParseException.class, () -> ScriptSortBuilder.fromXContent(parser, null));`
`243`		`- assertEquals("[1:29] [_script] unknown field [bad_field], parser not found", e.getMessage());`
	`243`	`+ assertEquals("[1:15] [_script] unknown field [bad_field], parser not found", e.getMessage());`
`244`	`244`	`}`
`245`	`245`	`}`
`246`	`246`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ public void testFutureConfigParse() throws IOException {`
`268`	`268`	`.createParser(xContentRegistry(), DeprecationHandler.THROW_UNSUPPORTED_OPERATION, FUTURE_DATAFEED);`
`269`	`269`	`XContentParseException e = expectThrows(XContentParseException.class,`
`270`	`270`	`() -> DatafeedConfig.STRICT_PARSER.apply(parser, null).build());`
`271`		`- assertEquals("[6:35] [datafeed_config] unknown field [tomorrows_technology_today], parser not found", e.getMessage());`
	`271`	`+ assertEquals("[6:5] [datafeed_config] unknown field [tomorrows_technology_today], parser not found", e.getMessage());`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`public void testPastQueryConfigParse() throws IOException {`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public void testFutureConfigParse() throws IOException {`
`81`	`81`	`.createParser(NamedXContentRegistry.EMPTY, DeprecationHandler.THROW_UNSUPPORTED_OPERATION, FUTURE_JOB);`
`82`	`82`	`XContentParseException e = expectThrows(XContentParseException.class,`
`83`	`83`	`() -> Job.STRICT_PARSER.apply(parser, null).build());`
`84`		`- assertEquals("[4:35] [job_details] unknown field [tomorrows_technology_today], parser not found", e.getMessage());`
	`84`	`+ assertEquals("[4:5] [job_details] unknown field [tomorrows_technology_today], parser not found", e.getMessage());`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`public void testFutureMetadataParse() throws IOException {`
Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ public void testParse_GivenUnknownObject() throws ElasticsearchParseException, I`
`390`	`390`	`XContentParseException e = expectThrows(XContentParseException.class,`
`391`	`391`	`() -> parser.parseResults(inputStream).forEachRemaining(a -> {`
`392`	`392`	`}));`
`393`		`- assertEquals("[1:13] [autodetect_result] unknown field [unknown], parser not found", e.getMessage());`
	`393`	`+ assertEquals("[1:3] [autodetect_result] unknown field [unknown], parser not found", e.getMessage());`
`394`	`394`	`}`
`395`	`395`	`}`
`396`	`396`