diff options
Diffstat (limited to 'config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java')
-rw-r--r-- | config-model/src/test/java/com/yahoo/searchdefinition/derived/SummaryMapTestCase.java | 46 |
1 files changed, 23 insertions, 23 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()); |