diff options
Diffstat (limited to 'core/src/test/java/org/elasticsearch/ingest/IngestMetadataTests.java')
| -rw-r--r-- | core/src/test/java/org/elasticsearch/ingest/IngestMetadataTests.java | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestMetadataTests.java b/core/src/test/java/org/elasticsearch/ingest/IngestMetadataTests.java index e2fca8b411..518b775d7f 100644 --- a/core/src/test/java/org/elasticsearch/ingest/IngestMetadataTests.java +++ b/core/src/test/java/org/elasticsearch/ingest/IngestMetadataTests.java @@ -42,10 +42,10 @@ public class IngestMetadataTests extends ESTestCase { public void testFromXContent() throws IOException { PipelineConfiguration pipeline = new PipelineConfiguration( - "1",new BytesArray("{\"processors\": [{\"set\" : {\"field\": \"_field\", \"value\": \"_value\"}}]}") + "1", new BytesArray("{\"processors\": [{\"set\" : {\"field\": \"_field\", \"value\": \"_value\"}}]}"), XContentType.JSON ); PipelineConfiguration pipeline2 = new PipelineConfiguration( - "2",new BytesArray("{\"processors\": [{\"set\" : {\"field\": \"_field1\", \"value\": \"_value1\"}}]}") + "2", new BytesArray("{\"processors\": [{\"set\" : {\"field\": \"_field1\", \"value\": \"_value1\"}}]}"), XContentType.JSON ); Map<String, PipelineConfiguration> map = new HashMap<>(); map.put(pipeline.getId(), pipeline); @@ -72,14 +72,14 @@ public class IngestMetadataTests extends ESTestCase { BytesReference pipelineConfig = new BytesArray("{}"); Map<String, PipelineConfiguration> pipelines = new HashMap<>(); - pipelines.put("1", new PipelineConfiguration("1", pipelineConfig)); - pipelines.put("2", new PipelineConfiguration("2", pipelineConfig)); + pipelines.put("1", new PipelineConfiguration("1", pipelineConfig, XContentType.JSON)); + pipelines.put("2", new PipelineConfiguration("2", pipelineConfig, XContentType.JSON)); IngestMetadata ingestMetadata1 = new IngestMetadata(pipelines); pipelines = new HashMap<>(); - pipelines.put("1", new PipelineConfiguration("1", pipelineConfig)); - pipelines.put("3", new PipelineConfiguration("3", pipelineConfig)); - pipelines.put("4", new PipelineConfiguration("4", pipelineConfig)); + pipelines.put("1", new PipelineConfiguration("1", pipelineConfig, XContentType.JSON)); + pipelines.put("3", new PipelineConfiguration("3", pipelineConfig, XContentType.JSON)); + pipelines.put("4", new PipelineConfiguration("4", pipelineConfig, XContentType.JSON)); IngestMetadata ingestMetadata2 = new IngestMetadata(pipelines); IngestMetadata.IngestMetadataDiff diff = (IngestMetadata.IngestMetadataDiff) ingestMetadata2.diff(ingestMetadata1); @@ -92,13 +92,13 @@ public class IngestMetadataTests extends ESTestCase { IngestMetadata endResult = (IngestMetadata) diff.apply(ingestMetadata2); assertThat(endResult, not(equalTo(ingestMetadata1))); assertThat(endResult.getPipelines().size(), equalTo(3)); - assertThat(endResult.getPipelines().get("1"), equalTo(new PipelineConfiguration("1", pipelineConfig))); - assertThat(endResult.getPipelines().get("3"), equalTo(new PipelineConfiguration("3", pipelineConfig))); - assertThat(endResult.getPipelines().get("4"), equalTo(new PipelineConfiguration("4", pipelineConfig))); + assertThat(endResult.getPipelines().get("1"), equalTo(new PipelineConfiguration("1", pipelineConfig, XContentType.JSON))); + assertThat(endResult.getPipelines().get("3"), equalTo(new PipelineConfiguration("3", pipelineConfig, XContentType.JSON))); + assertThat(endResult.getPipelines().get("4"), equalTo(new PipelineConfiguration("4", pipelineConfig, XContentType.JSON))); pipelines = new HashMap<>(); - pipelines.put("1", new PipelineConfiguration("1", new BytesArray("{}"))); - pipelines.put("2", new PipelineConfiguration("2", new BytesArray("{}"))); + pipelines.put("1", new PipelineConfiguration("1", new BytesArray("{}"), XContentType.JSON)); + pipelines.put("2", new PipelineConfiguration("2", new BytesArray("{}"), XContentType.JSON)); IngestMetadata ingestMetadata3 = new IngestMetadata(pipelines); diff = (IngestMetadata.IngestMetadataDiff) ingestMetadata3.diff(ingestMetadata1); @@ -108,12 +108,12 @@ public class IngestMetadataTests extends ESTestCase { endResult = (IngestMetadata) diff.apply(ingestMetadata3); assertThat(endResult, equalTo(ingestMetadata1)); assertThat(endResult.getPipelines().size(), equalTo(2)); - assertThat(endResult.getPipelines().get("1"), equalTo(new PipelineConfiguration("1", pipelineConfig))); - assertThat(endResult.getPipelines().get("2"), equalTo(new PipelineConfiguration("2", pipelineConfig))); + assertThat(endResult.getPipelines().get("1"), equalTo(new PipelineConfiguration("1", pipelineConfig, XContentType.JSON))); + assertThat(endResult.getPipelines().get("2"), equalTo(new PipelineConfiguration("2", pipelineConfig, XContentType.JSON))); pipelines = new HashMap<>(); - pipelines.put("1", new PipelineConfiguration("1", new BytesArray("{}"))); - pipelines.put("2", new PipelineConfiguration("2", new BytesArray("{\"key\" : \"value\"}"))); + pipelines.put("1", new PipelineConfiguration("1", new BytesArray("{}"), XContentType.JSON)); + pipelines.put("2", new PipelineConfiguration("2", new BytesArray("{\"key\" : \"value\"}"), XContentType.JSON)); IngestMetadata ingestMetadata4 = new IngestMetadata(pipelines); diff = (IngestMetadata.IngestMetadataDiff) ingestMetadata4.diff(ingestMetadata1); @@ -123,7 +123,8 @@ public class IngestMetadataTests extends ESTestCase { endResult = (IngestMetadata) diff.apply(ingestMetadata4); assertThat(endResult, not(equalTo(ingestMetadata1))); assertThat(endResult.getPipelines().size(), equalTo(2)); - assertThat(endResult.getPipelines().get("1"), equalTo(new PipelineConfiguration("1", pipelineConfig))); - assertThat(endResult.getPipelines().get("2"), equalTo(new PipelineConfiguration("2", new BytesArray("{\"key\" : \"value\"}")))); + assertThat(endResult.getPipelines().get("1"), equalTo(new PipelineConfiguration("1", pipelineConfig, XContentType.JSON))); + assertThat(endResult.getPipelines().get("2"), + equalTo(new PipelineConfiguration("2", new BytesArray("{\"key\" : \"value\"}"), XContentType.JSON))); } } |