From 737a37d0ed82df358c0ff551cae3ce67c45c4633 Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@broadpark.no>
Date: Tue, 23 Jan 2018 23:20:04 +0100
Subject: Enable imported tensor attributes.

---
 .../processing/ImportedFieldsResolverTestCase.java | 28 +++++++++-------------
 1 file changed, 11 insertions(+), 17 deletions(-)

(limited to 'config-model/src/test/java/com/yahoo')

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java
index 9f7c7458738..7fb05c03cbf 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ImportedFieldsResolverTestCase.java
@@ -38,18 +38,23 @@ public class ImportedFieldsResolverTestCase {
     @Rule
     public final ExpectedException exceptionRule = ExpectedException.none();
 
-    @Test
-    public void valid_imported_fields_are_resolved() {
+    private void resolve_imported_field(String fieldName, String targetFieldName) {
         SearchModel model = new SearchModel();
-        model.addImportedField("my_attribute_field", "ref", "attribute_field").resolve();
+        model.addImportedField(fieldName, "ref", targetFieldName).resolve();
 
         assertEquals(1, model.importedFields.fields().size());
-        ImportedField myField = model.importedFields.fields().get("my_attribute_field");
+        ImportedField myField = model.importedFields.fields().get(fieldName);
         assertNotNull(myField);
-        assertEquals("my_attribute_field", myField.fieldName());
+        assertEquals(fieldName, myField.fieldName());
         assertSame(model.childSearch.getConcreteField("ref"), myField.reference().referenceField());
         assertSame(model.parentSearch, myField.reference().targetSearch());
-        assertSame(model.parentSearch.getConcreteField("attribute_field"), myField.targetField());
+        assertSame(model.parentSearch.getConcreteField(targetFieldName), myField.targetField());
+    }
+
+    @Test
+    public void valid_imported_fields_are_resolved() {
+	resolve_imported_field("my_attribute_field", "attribute_field");
+	resolve_imported_field("my_tensor_field", "tensor_field");
     }
 
     @Test
@@ -87,17 +92,6 @@ public class ImportedFieldsResolverTestCase {
                 .resolve();
     }
 
-    @Test
-    public void resolver_fails_if_imported_field_is_tensor_type() {
-        exceptionRule.expect(IllegalArgumentException.class);
-        exceptionRule.expectMessage(
-                "For search 'child', import field 'my_tensor_field': " +
-                        "Field 'tensor_field' via reference field 'ref': Is of type 'tensor'. Not supported");
-        new SearchModel()
-                .addImportedField("my_tensor_field", "ref", "tensor_field")
-                .resolve();
-    }
-
     @Test
     public void resolver_fails_if_imported_field_is_also_an_imported_field() {
         exceptionRule.expect(IllegalArgumentException.class);
-- 
cgit v1.2.3