diff options
Diffstat (limited to 'config-model/src/test/java')
| -rw-r--r-- | config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java | 46 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java | 16 |
2 files changed, 31 insertions, 31 deletions
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java index bfa135de90e..6abe0e763cb 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java @@ -31,44 +31,44 @@ public class SummaryMapTestCase extends AbstractSchemaTestCase { @Test public void testDeriving() throws IOException, ParseException { Schema schema = ApplicationBuilder.buildFromFile("src/test/examples/simple.sd"); - SummaryMap summaryMap=new SummaryMap(schema); + SummaryMap summaryMap = new SummaryMap(schema); - Iterator transforms=summaryMap.resultTransformIterator(); - FieldResultTransform transform = (FieldResultTransform)transforms.next(); + Iterator<FieldResultTransform> transforms = summaryMap.resultTransforms().values().iterator(); + FieldResultTransform transform = transforms.next(); assertEquals("dyndesc", transform.getFieldName()); - assertEquals(SummaryTransform.DYNAMICTEASER,transform.getTransform()); + assertEquals(SummaryTransform.DYNAMICTEASER, transform.getTransform()); - transform = (FieldResultTransform)transforms.next(); + transform = transforms.next(); assertEquals("dynlong", transform.getFieldName()); - assertEquals(SummaryTransform.DYNAMICTEASER,transform.getTransform()); + assertEquals(SummaryTransform.DYNAMICTEASER, transform.getTransform()); - transform = (FieldResultTransform)transforms.next(); + transform = transforms.next(); assertEquals("dyndesc2", transform.getFieldName()); - assertEquals(SummaryTransform.DYNAMICTEASER,transform.getTransform()); + assertEquals(SummaryTransform.DYNAMICTEASER, transform.getTransform()); - transform = (FieldResultTransform)transforms.next(); + transform = transforms.next(); assertEquals("measurement", transform.getFieldName()); - assertEquals(SummaryTransform.ATTRIBUTE,transform.getTransform()); + assertEquals(SummaryTransform.ATTRIBUTE, transform.getTransform()); - transform = (FieldResultTransform)transforms.next(); + transform = transforms.next(); assertEquals("rankfeatures", transform.getFieldName()); assertEquals(SummaryTransform.RANKFEATURES, transform.getTransform()); - transform = (FieldResultTransform)transforms.next(); + transform = transforms.next(); assertEquals("summaryfeatures", transform.getFieldName()); assertEquals(SummaryTransform.SUMMARYFEATURES, transform.getTransform()); - transform = (FieldResultTransform)transforms.next(); + transform = transforms.next(); assertEquals("popsiness", transform.getFieldName()); - assertEquals(SummaryTransform.ATTRIBUTE,transform.getTransform()); + assertEquals(SummaryTransform.ATTRIBUTE, transform.getTransform()); - transform = (FieldResultTransform)transforms.next(); + transform = transforms.next(); assertEquals("popularity", transform.getFieldName()); - assertEquals(SummaryTransform.ATTRIBUTE,transform.getTransform()); + assertEquals(SummaryTransform.ATTRIBUTE, transform.getTransform()); - transform = (FieldResultTransform)transforms.next(); + transform = transforms.next(); assertEquals("access", transform.getFieldName()); - assertEquals(SummaryTransform.ATTRIBUTE,transform.getTransform()); + assertEquals(SummaryTransform.ATTRIBUTE, transform.getTransform()); assertFalse(transforms.hasNext()); } @@ -84,22 +84,22 @@ public class SummaryMapTestCase extends AbstractSchemaTestCase { true, false, Set.of()); SummaryMap summaryMap = new SummaryMap(schema); - Iterator transforms = summaryMap.resultTransformIterator(); + Iterator<FieldResultTransform> transforms = summaryMap.resultTransforms().values().iterator(); - FieldResultTransform transform = (FieldResultTransform)transforms.next(); + FieldResultTransform transform = transforms.next(); assertEquals(fieldName, transform.getFieldName()); assertEquals(SummaryTransform.GEOPOS, transform.getTransform()); - transform = (FieldResultTransform)transforms.next(); + transform = transforms.next(); assertEquals("rankfeatures", transform.getFieldName()); assertEquals(SummaryTransform.RANKFEATURES, transform.getTransform()); - transform = (FieldResultTransform)transforms.next(); + transform = transforms.next(); assertEquals("summaryfeatures", transform.getFieldName()); assertEquals(SummaryTransform.SUMMARYFEATURES, transform.getTransform()); - transform = (FieldResultTransform)transforms.next(); + transform = transforms.next(); assertEquals("location_zcurve", transform.getFieldName()); assertEquals(SummaryTransform.ATTRIBUTE,transform.getTransform()); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java index 9a36ef90cd7..fd5caeb6b6d 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryTestCase.java @@ -37,7 +37,7 @@ public class SummaryTestCase extends AbstractSchemaTestCase { "}"); Schema schema = ApplicationBuilder.createFromString(sd).getSchema(); SummaryClass summary = new SummaryClass(schema, schema.getSummary("default"), new BaseDeployLogger()); - assertEquals(SummaryClassField.Type.RAW, summary.getField("raw_field").getType()); + assertEquals(SummaryClassField.Type.RAW, summary.fields().get("raw_field").getType()); } @Test @@ -52,7 +52,7 @@ public class SummaryTestCase extends AbstractSchemaTestCase { "}"); Schema schema = ApplicationBuilder.createFromString(sd).getSchema(); SummaryClass summary = new SummaryClass(schema, schema.getSummary("default"), new BaseDeployLogger()); - assertEquals(SummaryClassField.Type.DATA, summary.getField("raw_field").getType()); + assertEquals(SummaryClassField.Type.DATA, summary.fields().get("raw_field").getType()); } @Test @@ -61,11 +61,11 @@ public class SummaryTestCase extends AbstractSchemaTestCase { SummaryClass summary = new SummaryClass(schema, schema.getSummary("default"), new BaseDeployLogger()); assertEquals("default", summary.getName()); - Iterator<SummaryClassField> fields = summary.fieldIterator(); + Iterator<SummaryClassField> fields = summary.fields().values().iterator(); SummaryClassField field; - assertEquals(13, summary.getFieldCount()); + assertEquals(13, summary.fields().size()); field = fields.next(); assertEquals("exactemento", field.getName()); @@ -125,12 +125,12 @@ public class SummaryTestCase extends AbstractSchemaTestCase { Schema adSchema = buildCampaignAdModel(); SummaryClass defaultClass = new SummaryClass(adSchema, adSchema.getSummary("default"), new BaseDeployLogger()); - assertEquals(SummaryClassField.Type.LONGSTRING, defaultClass.getField("campaign_ref").getType()); - assertEquals(SummaryClassField.Type.LONGSTRING, defaultClass.getField("other_campaign_ref").getType()); + assertEquals(SummaryClassField.Type.LONGSTRING, defaultClass.fields().get("campaign_ref").getType()); + assertEquals(SummaryClassField.Type.LONGSTRING, defaultClass.fields().get("other_campaign_ref").getType()); SummaryClass myClass = new SummaryClass(adSchema, adSchema.getSummary("my_summary"), new BaseDeployLogger()); - assertNull(myClass.getField("campaign_ref")); - assertEquals(SummaryClassField.Type.LONGSTRING, myClass.getField("other_campaign_ref").getType()); + assertNull(myClass.fields().get("campaign_ref")); + assertEquals(SummaryClassField.Type.LONGSTRING, myClass.fields().get("other_campaign_ref").getType()); } private static Schema buildCampaignAdModel() throws ParseException { |