Replacing now unsupported dot-notation in object field mappings in base test setup
We still want one mapping with an object with two inner fields for e.g. testing one code path in ExistsQueryBuilder. Using the dot notation for field names was forbidden with recent changes from master coming in.
This commit is contained in:
parent
fc1b178dc4
commit
6c79569cae
|
@ -58,11 +58,20 @@ import org.elasticsearch.test.TestSearchContext;
|
||||||
import org.elasticsearch.test.VersionUtils;
|
import org.elasticsearch.test.VersionUtils;
|
||||||
import org.elasticsearch.threadpool.ThreadPool;
|
import org.elasticsearch.threadpool.ThreadPool;
|
||||||
import org.elasticsearch.threadpool.ThreadPoolModule;
|
import org.elasticsearch.threadpool.ThreadPoolModule;
|
||||||
import org.junit.*;
|
import org.junit.After;
|
||||||
|
import org.junit.AfterClass;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.BeforeClass;
|
||||||
|
import org.junit.Ignore;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
import static org.hamcrest.Matchers.*;
|
import static org.hamcrest.Matchers.equalTo;
|
||||||
|
import static org.hamcrest.Matchers.instanceOf;
|
||||||
|
import static org.hamcrest.Matchers.is;
|
||||||
|
import static org.hamcrest.Matchers.notNullValue;
|
||||||
|
import static org.hamcrest.Matchers.nullValue;
|
||||||
|
|
||||||
@Ignore
|
@Ignore
|
||||||
public abstract class BaseQueryTestCase<QB extends AbstractQueryBuilder<QB>> extends ElasticsearchTestCase {
|
public abstract class BaseQueryTestCase<QB extends AbstractQueryBuilder<QB>> extends ElasticsearchTestCase {
|
||||||
|
@ -135,9 +144,11 @@ public abstract class BaseQueryTestCase<QB extends AbstractQueryBuilder<QB>> ext
|
||||||
DOUBLE_FIELD_NAME, "type=double",
|
DOUBLE_FIELD_NAME, "type=double",
|
||||||
BOOLEAN_FIELD_NAME, "type=boolean",
|
BOOLEAN_FIELD_NAME, "type=boolean",
|
||||||
STRING_FIELD_NAME, "type=string",
|
STRING_FIELD_NAME, "type=string",
|
||||||
OBJECT_FIELD_NAME, "type=object",
|
OBJECT_FIELD_NAME, "type=object"
|
||||||
OBJECT_FIELD_NAME+"."+DATE_FIELD_NAME, "type=date",
|
).string()), false, false);
|
||||||
OBJECT_FIELD_NAME+"."+INT_FIELD_NAME, "type=integer").string()), false, false);
|
// also add mappings for two inner field in the object field
|
||||||
|
mapperService.merge(type, new CompressedXContent("{\"properties\":{\""+OBJECT_FIELD_NAME+"\":{\"type\":\"object\","
|
||||||
|
+ "\"properties\":{\""+DATE_FIELD_NAME+"\":{\"type\":\"date\"},\""+INT_FIELD_NAME+"\":{\"type\":\"integer\"}}}}}"), false, false);
|
||||||
currentTypes[i] = type;
|
currentTypes[i] = type;
|
||||||
}
|
}
|
||||||
namedWriteableRegistry = injector.getInstance(NamedWriteableRegistry.class);
|
namedWriteableRegistry = injector.getInstance(NamedWriteableRegistry.class);
|
||||||
|
|
Loading…
Reference in New Issue