diff options
author | Geir Storli <geirst@yahoo-inc.com> | 2017-02-09 17:07:04 +0100 |
---|---|---|
committer | Geir Storli <geirst@yahoo-inc.com> | 2017-02-09 17:07:04 +0100 |
commit | fe52765a037cb72ce14cbe94f843c76487b86515 (patch) | |
tree | 28de077dcb97e139f124e22df00f9e0407bfdb07 /config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java | |
parent | 023a58fba580ee27ebb576ede73f1cff5b12e764 (diff) |
Align naming of imported fields across Java code and config.
Diffstat (limited to 'config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java')
-rw-r--r-- | config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java index 8bfa172eeb8..44b30e3419a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsTestCase.java @@ -78,16 +78,16 @@ public class ImportedFieldsTestCase { return builder.getSearch("ad"); } - private static void assertSearchContainsImportedField(String aliasFieldName, - String documentReferenceFieldName, - String documentReferenceType, - String foreignFieldName, + private static void assertSearchContainsImportedField(String fieldName, + String referenceFieldName, + String referenceDocType, + String targetFieldName, Search search) { - ImportedField importedField = search.importedFields().get().fields().get(aliasFieldName); + ImportedField importedField = search.importedFields().get().fields().get(fieldName); assertNotNull(importedField); - assertEquals(aliasFieldName, importedField.aliasFieldName()); - assertEquals(documentReferenceFieldName, importedField.documentReference().documentReferenceField().getName()); - assertEquals(documentReferenceType, importedField.documentReference().search().getName()); - assertEquals(foreignFieldName, importedField.referencedField().getName()); + assertEquals(fieldName, importedField.fieldName()); + assertEquals(referenceFieldName, importedField.reference().referenceField().getName()); + assertEquals(referenceDocType, importedField.reference().targetSearch().getName()); + assertEquals(targetFieldName, importedField.targetField().getName()); } } |