honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-27 02:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

move template query builder tests back to core (using mockscript)

Browse Source
This commit is contained in:
Ryan Ernst 2015-12-08 20:26:45 -08:00
parent 2e299860e5
commit 907d3cf878
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/lang-mustache/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTests.java → core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTests.java
View File

@ -40,7 +40,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Random;
@ESTestCase.AwaitsFix(bugUrl = "nopush")
public class TemplateQueryBuilderTests extends AbstractQueryTestCase<TemplateQueryBuilder> {
/**
@ -52,7 +51,7 @@ public class TemplateQueryBuilderTests extends AbstractQueryTestCase<TemplateQue
public static void setupClass() {
templateBase = createQuery(getRandom());
}
static QueryBuilder<?> createQuery(Random r) {
switch (RandomInts.randomIntBetween(r, 0, 2)) {
case 0:
@ -73,7 +72,7 @@ public class TemplateQueryBuilderTests extends AbstractQueryTestCase<TemplateQue
@Override
protected TemplateQueryBuilder doCreateTestQueryBuilder() {
return new TemplateQueryBuilder(new Template(templateBase.toString()));
return new TemplateQueryBuilder(new Template(templateBase.toString(), ScriptType.INLINE, "mockscript", null, null));
}
@Override

11
test-framework/src/main/java/org/elasticsearch/script/MockScriptEngine.java
View File

@ -21,6 +21,8 @@ package org.elasticsearch.script;
import org.apache.lucene.index.LeafReaderContext;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.search.lookup.SearchLookup;
@ -71,12 +73,17 @@ public class MockScriptEngine implements ScriptEngineService {
@Override
public Object compile(String script) {
return Integer.parseInt(script);
return script;
}
@Override
public ExecutableScript executable(CompiledScript compiledScript, @Nullable Map<String, Object> vars) {
return null;
return new AbstractExecutableScript() {
@Override
public Object run() {
return new BytesArray((String)compiledScript.compiled());
}
};
}
@Override