lucene4: fixed default values tests to refer to correct default FieldType constants
This commit is contained in:
parent
a5bef30be9
commit
2fb3591792
|
@ -19,7 +19,6 @@
|
||||||
|
|
||||||
package org.elasticsearch.test.unit.index.mapper.timestamp;
|
package org.elasticsearch.test.unit.index.mapper.timestamp;
|
||||||
|
|
||||||
import org.apache.lucene.document.Field;
|
|
||||||
import org.elasticsearch.common.bytes.BytesReference;
|
import org.elasticsearch.common.bytes.BytesReference;
|
||||||
import org.elasticsearch.common.xcontent.XContentFactory;
|
import org.elasticsearch.common.xcontent.XContentFactory;
|
||||||
import org.elasticsearch.index.mapper.DocumentMapper;
|
import org.elasticsearch.index.mapper.DocumentMapper;
|
||||||
|
@ -74,8 +73,8 @@ public class TimestampMappingTests {
|
||||||
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type").endObject().string();
|
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type").endObject().string();
|
||||||
DocumentMapper docMapper = MapperTests.newParser().parse(mapping);
|
DocumentMapper docMapper = MapperTests.newParser().parse(mapping);
|
||||||
assertThat(docMapper.timestampFieldMapper().enabled(), equalTo(TimestampFieldMapper.Defaults.ENABLED));
|
assertThat(docMapper.timestampFieldMapper().enabled(), equalTo(TimestampFieldMapper.Defaults.ENABLED));
|
||||||
assertThat(docMapper.timestampFieldMapper().stored(), equalTo(TimestampFieldMapper.Defaults.FIELD_TYPE.stored()));
|
assertThat(docMapper.timestampFieldMapper().stored(), equalTo(TimestampFieldMapper.Defaults.TIMESTAMP_FIELD_TYPE.stored()));
|
||||||
assertThat(docMapper.timestampFieldMapper().indexed(), equalTo(TimestampFieldMapper.Defaults.FIELD_TYPE.indexed()));
|
assertThat(docMapper.timestampFieldMapper().indexed(), equalTo(TimestampFieldMapper.Defaults.TIMESTAMP_FIELD_TYPE.indexed()));
|
||||||
assertThat(docMapper.timestampFieldMapper().path(), equalTo(null));
|
assertThat(docMapper.timestampFieldMapper().path(), equalTo(null));
|
||||||
assertThat(docMapper.timestampFieldMapper().dateTimeFormatter().format(), equalTo(TimestampFieldMapper.DEFAULT_DATE_TIME_FORMAT));
|
assertThat(docMapper.timestampFieldMapper().dateTimeFormatter().format(), equalTo(TimestampFieldMapper.DEFAULT_DATE_TIME_FORMAT));
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
|
|
||||||
package org.elasticsearch.test.unit.index.mapper.ttl;
|
package org.elasticsearch.test.unit.index.mapper.ttl;
|
||||||
|
|
||||||
import org.apache.lucene.document.Field;
|
|
||||||
import org.elasticsearch.common.bytes.BytesReference;
|
import org.elasticsearch.common.bytes.BytesReference;
|
||||||
import org.elasticsearch.common.xcontent.XContentFactory;
|
import org.elasticsearch.common.xcontent.XContentFactory;
|
||||||
import org.elasticsearch.index.mapper.DocumentMapper;
|
import org.elasticsearch.index.mapper.DocumentMapper;
|
||||||
|
@ -72,8 +71,8 @@ public class TTLMappingTests {
|
||||||
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type").endObject().string();
|
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type").endObject().string();
|
||||||
DocumentMapper docMapper = MapperTests.newParser().parse(mapping);
|
DocumentMapper docMapper = MapperTests.newParser().parse(mapping);
|
||||||
assertThat(docMapper.TTLFieldMapper().enabled(), equalTo(TTLFieldMapper.Defaults.ENABLED));
|
assertThat(docMapper.TTLFieldMapper().enabled(), equalTo(TTLFieldMapper.Defaults.ENABLED));
|
||||||
assertThat(docMapper.TTLFieldMapper().stored(), equalTo(TTLFieldMapper.Defaults.FIELD_TYPE.stored()));
|
assertThat(docMapper.TTLFieldMapper().stored(), equalTo(TTLFieldMapper.Defaults.TTL_FIELD_TYPE.stored()));
|
||||||
assertThat(docMapper.TTLFieldMapper().indexed(), equalTo(TTLFieldMapper.Defaults.FIELD_TYPE.indexed()));
|
assertThat(docMapper.TTLFieldMapper().indexed(), equalTo(TTLFieldMapper.Defaults.TTL_FIELD_TYPE.indexed()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue