From 585a5b38c5811da950336c26326636773ca289e3 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <jonbratseth@yahoo.com>
Date: Thu, 12 Jan 2017 22:17:49 +0100
Subject: Revert "Revert "Bratseth/tensor type info in documents""

---
 .../com/yahoo/searchdefinition/NameFieldCheckTestCase.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/NameFieldCheckTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/NameFieldCheckTestCase.java
index f8fe979c866..5542c1ce5e9 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/NameFieldCheckTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/NameFieldCheckTestCase.java
@@ -6,14 +6,16 @@ import org.junit.Test;
 
 import java.io.IOException;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+
 /**
  * Tests that "name" is not allowed as name for a field.
  * 
  * And that duplicate names are not allowed. 
  *
- * @author <a href="mailto:larschr@yahoo-inc.com">Lars Christian Jensen</a>
+ * @author Lars Christian Jensen
  */
 public class NameFieldCheckTestCase extends SearchDefinitionTestCase {
 
@@ -22,8 +24,8 @@ public class NameFieldCheckTestCase extends SearchDefinitionTestCase {
         try {
             SearchBuilder.buildFromFile("src/test/examples/name-check.sd");
             fail("Should throw exception.");
-        } catch (Exception e) {
-            e.printStackTrace();
+        } catch (Exception expected) {
+            // Success
         }
     }
 
@@ -33,8 +35,7 @@ public class NameFieldCheckTestCase extends SearchDefinitionTestCase {
             SearchBuilder.buildFromFile("src/test/examples/duplicatenamesinsearchdifferenttype.sd");
             fail("Should throw exception.");
         } catch (Exception e) {
-            e.printStackTrace();
-            assertTrue(e.getMessage().matches(".*Duplicate.*different type.*"));
+            assertEquals("For search 'duplicatenamesinsearch', field 'grpphotoids64': Incompatible types. Expected Array<long> for index field 'grpphotoids64', got string.", e.getMessage());
         }
     }
 
@@ -44,7 +45,6 @@ public class NameFieldCheckTestCase extends SearchDefinitionTestCase {
             SearchBuilder.buildFromFile("src/test/examples/duplicatenamesindoc.sd");
             fail("Should throw exception.");
         } catch (Exception e) {
-            e.printStackTrace();
             assertTrue(e.getMessage().matches(".*Duplicate.*"));
         }
     }
-- 
cgit v1.2.3