Skip to content

Commit

Permalink
Migrate watcher hlrc response tests to use AbstractResponseTestCase (e…
Browse files Browse the repository at this point in the history 
…lastic#43478)

Relates to elastic#43472
  • Loading branch information
@martijnvg
martijnvg committed Jun 28, 2019
1 parent d8fe0f5 commit 9d5c66b
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 260 deletions.
6 changes: 5 additions & 1 deletion client/rest-high-level/src/test/java/org/elasticsearch/client/AbstractResponseTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public final void testFromXContent() throws IOException {
final S serverTestInstance = createServerTestInstance();

final XContentType xContentType = randomFrom(XContentType.values());
final BytesReference bytes = toShuffledXContent(serverTestInstance, xContentType, ToXContent.EMPTY_PARAMS, randomBoolean());
final BytesReference bytes = toShuffledXContent(serverTestInstance, xContentType, getParams(), randomBoolean());

final XContent xContent = XContentFactory.xContent(xContentType);
final XContentParser parser = xContent.createParser(
Expand All @@ -62,4 +62,8 @@ public final void testFromXContent() throws IOException {

protected abstract void assertInstances(S serverTestInstance, C clientInstance);

protected ToXContent.Params getParams() {
return ToXContent.EMPTY_PARAMS;
}

}
115 changes: 0 additions & 115 deletions ...-high-level/src/test/java/org/elasticsearch/client/watcher/ExecuteWatchResponseTests.java
View file

This file was deleted.

143 changes: 51 additions & 92 deletions ...rest-high-level/src/test/java/org/elasticsearch/client/watcher/GetWatchResponseTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,90 +19,34 @@
package org.elasticsearch.client.watcher;

import org.apache.lucene.util.LuceneTestCase;
import org.elasticsearch.client.AbstractResponseTestCase;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.xcontent.DeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.client.AbstractHlrcStreamableXContentTestCase;
import org.elasticsearch.xpack.core.watcher.actions.ActionStatus;
import org.elasticsearch.xpack.core.watcher.execution.ExecutionState;
import org.elasticsearch.xpack.core.watcher.support.xcontent.XContentSource;
import org.elasticsearch.xpack.core.watcher.transport.actions.get.GetWatchResponse;
import org.elasticsearch.xpack.core.watcher.watch.WatchStatus;

import java.io.IOException;
import java.io.InputStream;
import java.time.Clock;
import java.time.Instant;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Predicate;

public class GetWatchResponseTests extends
AbstractHlrcStreamableXContentTestCase<GetWatchResponse, org.elasticsearch.client.watcher.GetWatchResponse> {
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue;

private static final String[] SHUFFLE_FIELDS_EXCEPTION = new String[] { "watch" };
public class GetWatchResponseTests extends AbstractResponseTestCase<GetWatchResponse, org.elasticsearch.client.watcher.GetWatchResponse> {

@Override
protected String[] getShuffleFieldsExceptions() {
return SHUFFLE_FIELDS_EXCEPTION;
}

@Override
protected ToXContent.Params getToXContentParams() {
return new ToXContent.MapParams(Collections.singletonMap("hide_headers", "false"));
}

@Override
protected Predicate<String> getRandomFieldsExcludeFilter() {
return f -> f.contains("watch") || f.contains("actions") || f.contains("headers");
}

@Override
protected void assertEqualInstances(GetWatchResponse expectedInstance, GetWatchResponse newInstance) {
if (expectedInstance.isFound() &&
expectedInstance.getSource().getContentType() != newInstance.getSource().getContentType()) {
/**
* The {@link GetWatchResponse#getContentType()} depends on the content type that
* was used to serialize the main object so we use the same content type than the
* <code>expectedInstance</code> to translate the watch of the <code>newInstance</code>.
*/
XContent from = XContentFactory.xContent(newInstance.getSource().getContentType());
XContent to = XContentFactory.xContent(expectedInstance.getSource().getContentType());
final BytesReference newSource;
// It is safe to use EMPTY here because this never uses namedObject
try (InputStream stream = newInstance.getSource().getBytes().streamInput();
XContentParser parser = XContentFactory.xContent(from.type()).createParser(NamedXContentRegistry.EMPTY,
DeprecationHandler.THROW_UNSUPPORTED_OPERATION, stream)) {
parser.nextToken();
XContentBuilder builder = XContentFactory.contentBuilder(to.type());
builder.copyCurrentStructure(parser);
newSource = BytesReference.bytes(builder);
} catch (IOException e) {
throw new AssertionError(e);
}
newInstance = new GetWatchResponse(newInstance.getId(), newInstance.getVersion(),
newInstance.getSeqNo(), newInstance.getPrimaryTerm(),
newInstance.getStatus(), new XContentSource(newSource, expectedInstance.getSource().getContentType()));
}
super.assertEqualInstances(expectedInstance, newInstance);
}

@Override
protected GetWatchResponse createBlankInstance() {
return new GetWatchResponse();
}

@Override
protected GetWatchResponse createTestInstance() {
protected GetWatchResponse createServerTestInstance() {
String id = randomAlphaOfLength(10);
if (LuceneTestCase.rarely()) {
return new GetWatchResponse(id);
Expand All @@ -115,6 +59,34 @@ protected GetWatchResponse createTestInstance() {
return new GetWatchResponse(id, version, seqNo, primaryTerm, status, new XContentSource(source, XContentType.JSON));
}

@Override
protected org.elasticsearch.client.watcher.GetWatchResponse doParseToClientInstance(XContentParser parser) throws IOException {
return org.elasticsearch.client.watcher.GetWatchResponse.fromXContent(parser);
}

@Override
protected void assertInstances(GetWatchResponse serverTestInstance, org.elasticsearch.client.watcher.GetWatchResponse clientInstance) {
assertThat(clientInstance.getId(), equalTo(serverTestInstance.getId()));
assertThat(clientInstance.getSeqNo(), equalTo(serverTestInstance.getSeqNo()));
assertThat(clientInstance.getPrimaryTerm(), equalTo(serverTestInstance.getPrimaryTerm()));
assertThat(clientInstance.getVersion(), equalTo(serverTestInstance.getVersion()));
if (serverTestInstance.getStatus() != null) {
assertThat(convertWatchStatus(clientInstance.getStatus()), equalTo(serverTestInstance.getStatus()));
} else {
assertThat(clientInstance.getStatus(), nullValue());
}
if (serverTestInstance.getSource() != null) {
assertThat(clientInstance.getSourceAsMap(), equalTo(serverTestInstance.getSource().getAsMap()));
} else {
assertThat(clientInstance.getSource(), nullValue());
}
}

@Override
protected ToXContent.Params getParams() {
return new ToXContent.MapParams(Collections.singletonMap("hide_headers", "false"));
}

private static BytesReference simpleWatch() {
try {
XContentBuilder builder = XContentBuilder.builder(XContentType.JSON.xContent());
Expand Down Expand Up @@ -181,66 +153,53 @@ private static ActionStatus.Execution randomExecution() {
}
}

@Override
public org.elasticsearch.client.watcher.GetWatchResponse doHlrcParseInstance(XContentParser parser) throws IOException {
return org.elasticsearch.client.watcher.GetWatchResponse.fromXContent(parser);
}

@Override
public GetWatchResponse convertHlrcToInternal(org.elasticsearch.client.watcher.GetWatchResponse instance) {
if (instance.isFound()) {
return new GetWatchResponse(instance.getId(), instance.getVersion(), instance.getSeqNo(), instance.getPrimaryTerm(),
convertHlrcToInternal(instance.getStatus()), new XContentSource(instance.getSource(), instance.getContentType()));
} else {
return new GetWatchResponse(instance.getId());
}
}

private static WatchStatus convertHlrcToInternal(org.elasticsearch.client.watcher.WatchStatus status) {
private static WatchStatus convertWatchStatus(org.elasticsearch.client.watcher.WatchStatus status) {
final Map<String, ActionStatus> actions = new HashMap<>();
for (Map.Entry<String, org.elasticsearch.client.watcher.ActionStatus> entry : status.getActions().entrySet()) {
actions.put(entry.getKey(), convertHlrcToInternal(entry.getValue()));
actions.put(entry.getKey(), convertActionStatus(entry.getValue()));
}
return new WatchStatus(status.version(),
convertHlrcToInternal(status.state()),
status.getExecutionState() == null ? null : convertHlrcToInternal(status.getExecutionState()),
convertWatchStatusState(status.state()),
status.getExecutionState() == null ? null : convertWatchStatus(status.getExecutionState()),
status.lastChecked(), status.lastMetCondition(), actions, status.getHeaders()
);
}

private static ActionStatus convertHlrcToInternal(org.elasticsearch.client.watcher.ActionStatus actionStatus) {
return new ActionStatus(convertHlrcToInternal(actionStatus.ackStatus()),
actionStatus.lastExecution() == null ? null : convertHlrcToInternal(actionStatus.lastExecution()),
actionStatus.lastSuccessfulExecution() == null ? null : convertHlrcToInternal(actionStatus.lastSuccessfulExecution()),
actionStatus.lastThrottle() == null ? null : convertHlrcToInternal(actionStatus.lastThrottle())
private static ActionStatus convertActionStatus(org.elasticsearch.client.watcher.ActionStatus actionStatus) {
return new ActionStatus(convertAckStatus(actionStatus.ackStatus()),
actionStatus.lastExecution() == null ? null : convertActionStatusExecution(actionStatus.lastExecution()),
actionStatus.lastSuccessfulExecution() == null ? null : convertActionStatusExecution(actionStatus.lastSuccessfulExecution()),
actionStatus.lastThrottle() == null ? null : convertActionStatusThrottle(actionStatus.lastThrottle())
);
}

private static ActionStatus.AckStatus convertHlrcToInternal(org.elasticsearch.client.watcher.ActionStatus.AckStatus ackStatus) {
return new ActionStatus.AckStatus(ackStatus.timestamp(), convertHlrcToInternal(ackStatus.state()));
private static ActionStatus.AckStatus convertAckStatus(org.elasticsearch.client.watcher.ActionStatus.AckStatus ackStatus) {
return new ActionStatus.AckStatus(ackStatus.timestamp(), convertAckStatusState(ackStatus.state()));
}

private static ActionStatus.AckStatus.State convertHlrcToInternal(org.elasticsearch.client.watcher.ActionStatus.AckStatus.State state) {
private static ActionStatus.AckStatus.State convertAckStatusState(
org.elasticsearch.client.watcher.ActionStatus.AckStatus.State state) {
return ActionStatus.AckStatus.State.valueOf(state.name());
}

private static WatchStatus.State convertHlrcToInternal(org.elasticsearch.client.watcher.WatchStatus.State state) {
private static WatchStatus.State convertWatchStatusState(org.elasticsearch.client.watcher.WatchStatus.State state) {
return new WatchStatus.State(state.isActive(), state.getTimestamp());
}

private static ExecutionState convertHlrcToInternal(org.elasticsearch.client.watcher.ExecutionState executionState) {
private static ExecutionState convertWatchStatus(org.elasticsearch.client.watcher.ExecutionState executionState) {
return ExecutionState.valueOf(executionState.name());
}

private static ActionStatus.Execution convertHlrcToInternal(org.elasticsearch.client.watcher.ActionStatus.Execution execution) {
private static ActionStatus.Execution convertActionStatusExecution(
org.elasticsearch.client.watcher.ActionStatus.Execution execution) {
if (execution.successful()) {
return ActionStatus.Execution.successful(execution.timestamp());
} else {
return ActionStatus.Execution.failure(execution.timestamp(), execution.reason());
}
}

private static ActionStatus.Throttle convertHlrcToInternal(org.elasticsearch.client.watcher.ActionStatus.Throttle throttle) {
private static ActionStatus.Throttle convertActionStatusThrottle(org.elasticsearch.client.watcher.ActionStatus.Throttle throttle) {
return new ActionStatus.Throttle(throttle.timestamp(), throttle.reason());
}

Expand Down
Loading

0 comments on commit 9d5c66b

Please sign in to comment.