Skip to content

Commit c69972d

Browse files
committed
Fix test failures
Signed-off-by: Rishabh Maurya <rishabhmaurya05@gmail.com>
1 parent 71c2439 commit c69972d

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

server/src/test/java/org/opensearch/index/mapper/ObjectMapperTests.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ public void testDerivedFields() throws Exception {
447447
.startObject("tweet")
448448
.startObject("derived")
449449
.startObject("derived_field_name1")
450-
.field("type", "text")
450+
.field("type", "boolean")
451451
.endObject()
452452
.startObject("derived_field_name2")
453453
.field("type", "keyword")
@@ -458,7 +458,7 @@ public void testDerivedFields() throws Exception {
458458
.endObject()
459459
.startObject("properties")
460460
.startObject("field_name")
461-
.field("type", "text")
461+
.field("type", "date")
462462
.endObject()
463463
.endObject()
464464
.endObject()
@@ -472,7 +472,7 @@ public void testDerivedFields() throws Exception {
472472
Mapper mapper = documentMapper.root().getMapper("derived_field_name1");
473473
assertTrue(mapper instanceof DerivedFieldMapper);
474474
DerivedFieldMapper derivedFieldMapper = (DerivedFieldMapper) mapper;
475-
assertEquals("text", derivedFieldMapper.getType());
475+
assertEquals("boolean", derivedFieldMapper.getType());
476476
assertNull(derivedFieldMapper.getScript());
477477

478478
mapper = documentMapper.root().getMapper("derived_field_name2");
@@ -484,7 +484,7 @@ public void testDerivedFields() throws Exception {
484484
// Check that field in properties was parsed correctly as well
485485
mapper = documentMapper.root().getMapper("field_name");
486486
assertNotNull(mapper);
487-
assertEquals("text", mapper.typeName());
487+
assertEquals("date", mapper.typeName());
488488
}
489489

490490
@Override

test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java

+2
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
import org.opensearch.index.mapper.ConstantKeywordFieldMapper;
9999
import org.opensearch.index.mapper.ContentPath;
100100
import org.opensearch.index.mapper.DateFieldMapper;
101+
import org.opensearch.index.mapper.DerivedFieldMapper;
101102
import org.opensearch.index.mapper.FieldAliasMapper;
102103
import org.opensearch.index.mapper.FieldMapper;
103104
import org.opensearch.index.mapper.GeoPointFieldMapper;
@@ -199,6 +200,7 @@ public abstract class AggregatorTestCase extends OpenSearchTestCase {
199200
denylist.add(ObjectMapper.NESTED_CONTENT_TYPE); // TODO support for nested
200201
denylist.add(CompletionFieldMapper.CONTENT_TYPE); // TODO support completion
201202
denylist.add(FieldAliasMapper.CONTENT_TYPE); // TODO support alias
203+
denylist.add(DerivedFieldMapper.CONTENT_TYPE); // TODO support derived fields
202204
TYPE_TEST_DENYLIST = denylist;
203205
}
204206

0 commit comments

Comments
 (0)