From a3aa021d1ab9b2a13f075abc7dab04d93f8a795b Mon Sep 17 00:00:00 2001 From: Henning Andersen Date: Tue, 25 Feb 2020 15:35:55 +0100 Subject: [PATCH 1/2] Add ReindexTaskStateDoc tests Added xcontent serialization tests for ReindexTaskStateDoc Related to #42612 Depends on #49278 (todo) --- .../index/reindex/ReindexTaskStateDoc.java | 1 - .../reindex/ReindexTaskStateDocTests.java | 107 ++++++++++++++++++ 2 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexTaskStateDocTests.java diff --git a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexTaskStateDoc.java b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexTaskStateDoc.java index c42a8419b1847..d223459f3cd18 100644 --- a/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexTaskStateDoc.java +++ b/modules/reindex/src/main/java/org/elasticsearch/index/reindex/ReindexTaskStateDoc.java @@ -31,7 +31,6 @@ import java.io.IOException; -// TODO: This class has become complicated enough that we should implement a xcontent serialization test public class ReindexTaskStateDoc implements ToXContentObject { public static final ConstructingObjectParser PARSER = diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexTaskStateDocTests.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexTaskStateDocTests.java new file mode 100644 index 0000000000000..1b833c2a73392 --- /dev/null +++ b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexTaskStateDocTests.java @@ -0,0 +1,107 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.elasticsearch.index.reindex; + +import org.elasticsearch.common.unit.TimeValue; +import org.elasticsearch.common.xcontent.XContentParser; +import org.elasticsearch.tasks.TaskId; +import org.elasticsearch.test.AbstractXContentTestCase; + +import java.io.IOException; +import java.util.Collections; + +public class ReindexTaskStateDocTests extends AbstractXContentTestCase { + @Override + protected ReindexTaskStateDoc createTestInstance() { + ReindexTaskStateDoc doc = new ReindexTaskStateDoc(new ReindexRequest().setSourceIndices("source").setDestIndex("dest"), + randomBoolean()); + + if (randomBoolean()) { + doc = doc.withNewAllocation(randomNonNegativeLong(), new TaskId(randomAlphaOfLength(10), randomNonNegativeLong())); + } + + if (randomBoolean()) { + doc = doc.withCheckpoint(new ScrollableHitSource.Checkpoint(randomNonNegativeLong()), + randomStatus()); + } + + if (randomBoolean()) { + doc = doc.withRequestsPerSecond(randomFloat()); + } + + if (randomBoolean()) { + doc = doc.withFinishedState(new BulkByScrollResponse(TimeValue.timeValueMillis(randomLong()), randomStatus(), + Collections.emptyList(), Collections.emptyList(), randomBoolean()), null); + } else if (randomBoolean()) { + // todo: need fixing once #49278 is merged. +// doc = doc.withFinishedState(null, new ElasticsearchException("test")); + } + + return doc; + } + + private BulkByScrollTask.Status randomStatus() { + return new BulkByScrollTask.Status(null, randomNonNegativeLong(), randomNonNegativeLong(), randomNonNegativeLong(), + randomNonNegativeLong(), randomIntBetween(0, 1000), randomNonNegativeLong(), randomNonNegativeLong(), + randomNonNegativeLong(), randomNonNegativeLong(), TimeValue.timeValueMillis(randomLong()), + randomFloat(), randomBoolean() ? randomAlphaOfLength(10) : null, TimeValue.timeValueMillis(randomLong())); + } + + @Override + protected ReindexTaskStateDoc doParseInstance(XContentParser parser) throws IOException { + return ReindexTaskStateDoc.fromXContent(parser); + } + + @Override + protected boolean supportsUnknownFields() { + return false; + } + + @Override + protected void assertEqualInstances(ReindexTaskStateDoc expectedInstance, ReindexTaskStateDoc newInstance) { + assertNotSame(newInstance, expectedInstance); + assertArrayEquals(expectedInstance.getReindexRequest().getSearchRequest().indices(), + newInstance.getReindexRequest().getSearchRequest().indices()); + // todo: once ReindexRequestTests are moved to reindex module, we can validate this properly. + assertEquals(expectedInstance.getReindexRequest().getDestination().index(), + newInstance.getReindexRequest().getDestination().index()); + assertEquals(expectedInstance.getAllocationId(), newInstance.getAllocationId()); + if (expectedInstance.getCheckpoint() != null) { + assertEquals(expectedInstance.getCheckpoint().getRestartFromValue(), newInstance.getCheckpoint().getRestartFromValue()); + } else { + assertNull(newInstance.getCheckpoint()); + } + assertEquals(expectedInstance.getEphemeralTaskId(), newInstance.getEphemeralTaskId()); + if (expectedInstance.getException() != null) { + assertEquals(expectedInstance.getException().getMessage(), newInstance.getException().getMessage()); + } else { + assertNull(newInstance.getException()); + } + assertEquals(expectedInstance.getFailureStatusCode(), newInstance.getFailureStatusCode()); + assertEquals(expectedInstance.getRequestsPerSecond(), newInstance.getRequestsPerSecond(), 0.0001d); + // todo: once BulkByScrollResponseTests is moved to reindex module, we can validate this properly. + if (expectedInstance.getReindexResponse() != null) { + assertEquals(expectedInstance.getReindexResponse().getCreated(), newInstance.getReindexResponse().getCreated()); + } else { + assertNull(newInstance.getReindexResponse()); + } + assertEquals(expectedInstance.isResilient(), newInstance.isResilient()); + } +} From 2ff034679592e4bce294a4dffcf2c6f01b06d0b7 Mon Sep 17 00:00:00 2001 From: Henning Andersen Date: Wed, 5 Aug 2020 12:03:14 +0200 Subject: [PATCH 2/2] Fix test after merge from master. --- .../index/reindex/ReindexTaskStateDocTests.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexTaskStateDocTests.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexTaskStateDocTests.java index 1b833c2a73392..fad23a4f65f82 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexTaskStateDocTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexTaskStateDocTests.java @@ -31,7 +31,7 @@ public class ReindexTaskStateDocTests extends AbstractXContentTestCase