Further test correct names

2 files changed, 15 insertions, 2 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java b/container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java
index 3b3bc468fe3..70e9357e7cf 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java
@@ -51,8 +51,8 @@ public class SameElementItem extends CompositeItem {
         TermItem asTerm = (TermItem) item;
         Validator.ensureNonEmpty("Struct fieldname", asTerm.getIndexName());
         Validator.ensureNonEmpty("Query term", asTerm.getIndexedString());
-        Validator.ensure("Struct fieldname does not start with '" + getFieldName() + "'",
-                !asTerm.getIndexName().startsWith(fieldName));
+        Validator.ensure("Struct fieldname starts with '" + getFieldName() + ".'",
+                !asTerm.getIndexName().startsWith(fieldName+"."));
         item.setIndexName(fieldName + '.' + asTerm.getIndexName());
     }
     @Override
diff --git a/container-search/src/test/java/com/yahoo/prelude/query/test/SameElementItemTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/test/SameElementItemTestCase.java
index ff3ca53319f..01c03fcd802 100644
--- a/container-search/src/test/java/com/yahoo/prelude/query/test/SameElementItemTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/query/test/SameElementItemTestCase.java
@@ -22,6 +22,19 @@ public class SameElementItemTestCase {
         s.addItem(new WordItem("b", "f1"));
         s.addItem(new WordItem("c"));
     }
+    @Test
+    public void requireAllowCommonPrefix() {
+        SameElementItem s = new SameElementItem("structa");
+        s.addItem(new WordItem("b", "f1"));
+        s.addItem(new WordItem("c", "structaf2"));
+        assertEquals("structa:{f1:b structaf2:c}", s.toString());
+    }
+    @Test(expected = IllegalArgumentException.class)
+    public void requireNoChildrenHasCommonPrefixWithDot() {
+        SameElementItem s = new SameElementItem("structa");
+        s.addItem(new WordItem("b", "f1"));
+        s.addItem(new WordItem("c", "structa.f2"));
+    }
     @Test(expected = IllegalArgumentException.class)
     public void requireAllChildrenHaveNonEmptyTerm() {
         SameElementItem s = new SameElementItem("structa");