honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[TEST] fix template comparisons in watcher tests 

Original commit: elastic/x-pack-elasticsearch@8edc47089b
This commit is contained in:
Colin Goodheart-Smithe 2015-10-16 13:29:58 +01:00
parent acec3c9216
commit 4f1f535937
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
watcher/src/main/java/org/elasticsearch/watcher/support/WatcherUtils.java
View File

@ -82,10 +82,11 @@ public final class WatcherUtils {
// Here we convert watcher template into a ES core templates. Due to the different format we use, we // Here we convert watcher template into a ES core templates. Due to the different format we use, we
// convert to the template format used in ES core // convert to the template format used in ES core
Template template = requestPrototype.template(); Template template = requestPrototype.template();
Map<String, Object> params = new HashMap<>(); if (template.getParams() != null) {
params.putAll(watcherContextParams); watcherContextParams.putAll(template.getParams());
params.putAll(template.getParams()); }
template = new Template(template.getScript(), template.getType(), template.getLang(), template.getContentType(), params); template = new Template(template.getScript(), template.getType(), template.getLang(), template.getContentType(),
watcherContextParams);
request.template(template); request.template(template);
// } // }
} }

14
watcher/src/test/java/org/elasticsearch/watcher/input/search/SearchInputTests.java
View File

@ -38,6 +38,7 @@ import org.elasticsearch.watcher.watch.Payload;
import org.elasticsearch.watcher.watch.Watch; import org.elasticsearch.watcher.watch.Watch;
import org.elasticsearch.watcher.watch.WatchStatus; import org.elasticsearch.watcher.watch.WatchStatus;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.chrono.ISOChronology;
import org.junit.Test; import org.junit.Test;
import java.io.IOException; import java.io.IOException;
@ -143,21 +144,20 @@ public class SearchInputTests extends ESIntegTestCase {
WatchExecutionContext ctx = createContext(); WatchExecutionContext ctx = createContext();
final String expectedTemplateString = "{\"query\":{\"filtered\":{\"query\":{\"match\":{\"event_type\":{\"query\":\"a\"," final String expectedTemplateString = "{\"query\":{\"filtered\":{\"query\":{\"match\":{\"event_type\":{\"query\":\"a\","
+ + "\"type\":\"boolean\"}}},\"filter\":{\"range\":{\"_timestamp\":"
"\"type\":\"boolean\"}}},\"filter\":{\"range\":{\"_timestamp\":" + + "{\"from\":\"{{ctx.trigger.scheduled_time}}||-{{seconds_param}}\",\"to\":\"{{ctx.trigger.scheduled_time}}\","
"{\"from\":\"{{ctx.trigger.scheduled_time}}||-{{seconds_param}}\",\"to\":\"{{ctx.trigger.scheduled_time}}\"," + + "\"include_lower\":true,\"include_upper\":true}}}}}}";
"\"include_lower\":true,\"include_upper\":true}}}}}}";
Map<String, Object> triggerParams = new HashMap<String, Object>(); Map<String, Object> triggerParams = new HashMap<String, Object>();
triggerParams.put("triggered_time", "1970-01-01T00:01:00.000Z"); triggerParams.put("triggered_time", new DateTime(1970, 01, 01, 00, 01, 00, 000, ISOChronology.getInstanceUTC()));
triggerParams.put("scheduled_time", "1970-01-01T00:01:00.000Z"); triggerParams.put("scheduled_time", new DateTime(1970, 01, 01, 00, 01, 00, 000, ISOChronology.getInstanceUTC()));
Map<String, Object> ctxParams = new HashMap<String, Object>(); Map<String, Object> ctxParams = new HashMap<String, Object>();
ctxParams.put("id", ctx.id().value()); ctxParams.put("id", ctx.id().value());
ctxParams.put("metadata", null); ctxParams.put("metadata", null);
ctxParams.put("vars", new HashMap<String, Object>()); ctxParams.put("vars", new HashMap<String, Object>());
ctxParams.put("watch_id", "test-watch"); ctxParams.put("watch_id", "test-watch");
ctxParams.put("trigger", triggerParams); ctxParams.put("trigger", triggerParams);
ctxParams.put("execution_time", "1970-01-01T00:01:00.000Z"); ctxParams.put("execution_time", new DateTime(1970, 01, 01, 00, 01, 00, 000, ISOChronology.getInstanceUTC()));
Map<String, Object> expectedParams = new HashMap<String, Object>(); Map<String, Object> expectedParams = new HashMap<String, Object>();
expectedParams.put("seconds_param", "30s"); expectedParams.put("seconds_param", "30s");
expectedParams.put("ctx", ctxParams); expectedParams.put("ctx", ctxParams);

15
watcher/src/test/java/org/elasticsearch/watcher/transform/search/SearchTransformTests.java
View File

@ -44,6 +44,7 @@ import org.elasticsearch.watcher.watch.Payload;
import org.elasticsearch.watcher.watch.Watch; import org.elasticsearch.watcher.watch.Watch;
import org.elasticsearch.watcher.watch.WatchStatus; import org.elasticsearch.watcher.watch.WatchStatus;
import org.joda.time.DateTime; import org.joda.time.DateTime;
import org.joda.time.chrono.ISOChronology;
import org.junit.Test; import org.junit.Test;
import java.io.IOException; import java.io.IOException;
@ -266,13 +267,7 @@ public class SearchTransformTests extends ESIntegTestCase {
builder.field("template", template); builder.field("template", template);
} }
XContentBuilder sourceBuilder = jsonBuilder().startObject() SearchSourceBuilder source = new SearchSourceBuilder().query(QueryBuilders.matchAllQuery());
.startObject("query")
.startObject("match_all")
.endObject()
.endObject()
.endObject();
BytesReference source = sourceBuilder.bytes();
builder.startObject("body") builder.startObject("body")
.startObject("query") .startObject("query")
@ -327,8 +322,8 @@ public class SearchTransformTests extends ESIntegTestCase {
+ "\"include_lower\":true,\"include_upper\":true}}}]}}}"; + "\"include_lower\":true,\"include_upper\":true}}}]}}}";
Map<String, Object> triggerParams = new HashMap<String, Object>(); Map<String, Object> triggerParams = new HashMap<String, Object>();
triggerParams.put("triggered_time", "1970-01-01T00:01:00.000Z"); triggerParams.put("triggered_time", new DateTime(1970, 01, 01, 00, 01, 00, 000, ISOChronology.getInstanceUTC()));
triggerParams.put("scheduled_time", "1970-01-01T00:01:00.000Z"); triggerParams.put("scheduled_time", new DateTime(1970, 01, 01, 00, 01, 00, 000, ISOChronology.getInstanceUTC()));
Map<String, Object> ctxParams = new HashMap<String, Object>(); Map<String, Object> ctxParams = new HashMap<String, Object>();
ctxParams.put("id", ctx.id().value()); ctxParams.put("id", ctx.id().value());
ctxParams.put("metadata", null); ctxParams.put("metadata", null);
@ -336,7 +331,7 @@ public class SearchTransformTests extends ESIntegTestCase {
ctxParams.put("watch_id", "test-watch"); ctxParams.put("watch_id", "test-watch");
ctxParams.put("payload", new HashMap<String, Object>()); ctxParams.put("payload", new HashMap<String, Object>());
ctxParams.put("trigger", triggerParams); ctxParams.put("trigger", triggerParams);
ctxParams.put("execution_time", "1970-01-01T00:01:00.000Z"); ctxParams.put("execution_time", new DateTime(1970, 01, 01, 00, 01, 00, 000, ISOChronology.getInstanceUTC()));
Map<String, Object> expectedParams = new HashMap<String, Object>(); Map<String, Object> expectedParams = new HashMap<String, Object>();
expectedParams.put("seconds_param", "30s"); expectedParams.put("seconds_param", "30s");
expectedParams.put("ctx", ctxParams); expectedParams.put("ctx", ctxParams);