Revert "Bratseth/disallow dash rebased"

5 files changed, 48 insertions, 27 deletions

diff --git a/config-model/src/test/examples/invalid-name.sd b/config-model/src/test/examples/invalid-name.sd
deleted file mode 100644
index f26fcc723f4..00000000000
--- a/config-model/src/test/examples/invalid-name.sd
+++ /dev/null
@@ -1,12 +0,0 @@
-# Dashes in names are not allowed
-search invalid-name {
-
-  document invalid-name {
-
-      field title type string {
-
-      }
-
-  }
-
-}
\ No newline at end of file
diff --git a/config-model/src/test/examples/simple-with-weird-name.sd b/config-model/src/test/examples/simple-with-weird-name.sd
new file mode 100644
index 00000000000..109f4f7bba7
--- /dev/null
+++ b/config-model/src/test/examples/simple-with-weird-name.sd
@@ -0,0 +1,13 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# A minimal doc with name which is incompatible with YQL+
+search simple-with-weird-name {
+
+  document simple-with-weird-name {
+
+    field title type string {
+      indexing: summary | index
+    }
+
+  }
+
+}
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionsParsingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionsParsingTestCase.java
index a26154fc8da..278471cb37a 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionsParsingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/SearchDefinitionsParsingTestCase.java
@@ -73,16 +73,35 @@ public class SearchDefinitionsParsingTestCase extends SearchDefinitionTestCase {
         }
     }
 
-    @Test
-    public void illegalSearchDefinitionName() throws IOException, ParseException {
-        try {
-            SearchBuilder.buildFromFile("src/test/examples/invalid-name.sd");
-            fail("Name with dash passed");
-        } catch (ParseException e) {
-            if ( ! e.getMessage().contains("invalid-name")) {
-                throw e;
+    private static class WarningCatcher extends Handler {
+        volatile boolean gotYqlWarning = false;
+
+        @Override
+        public void publish(LogRecord record) {
+            if (record.getLevel() == Level.WARNING && record.getMessage().indexOf("YQL") >= 0) {
+                gotYqlWarning = true;
             }
         }
+
+        @Override
+        public void flush() {
+            // intentionally left blank
+        }
+
+        @Override
+        public void close() throws SecurityException {
+            // intentionally left blank
+        }
     }
 
+
+    @Test
+    public void requireYqlCompatibilityIsTested() throws Exception {
+        Logger log = Logger.getLogger("DeployLogger");
+        WarningCatcher w = new WarningCatcher();
+        log.addHandler(w);
+        assertNotNull(SearchBuilder.buildFromFile("src/test/examples/simple-with-weird-name.sd"));
+        log.removeHandler(w);
+        assertTrue(w.gotYqlWarning);
+    }
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
index 4180f9f6de4..30f1df6a394 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
@@ -26,6 +26,7 @@ import static org.junit.Assert.*;
 
 /**
  * @author gjoranv
+ * @since 5.1.10
  */
 public class SearchBuilderTest extends ContainerModelBuilderTestBase {
 
@@ -34,7 +35,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void gui_search_handler_is_always_included_when_search_is_specified() {
+    public void gui_search_handler_is_always_included_when_search_is_specified() throws Exception{
         Element clusterElem = DomBuilderTest.parse(
                 "<jdisc id='default' version='1.0'>",
                 "  <search />",
@@ -60,7 +61,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
 
 
     @Test
-    public void search_handler_bindings_can_be_overridden() {
+    public void search_handler_bindings_can_be_overridden() throws Exception {
         Element clusterElem = DomBuilderTest.parse(
                 "<jdisc id='default' version='1.0'>",
                 "  <search>",
@@ -79,7 +80,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void search_handler_bindings_can_be_disabled() {
+    public void search_handler_bindings_can_be_disabled() throws Exception {
         Element clusterElem = DomBuilderTest.parse(
                 "<jdisc id='default' version='1.0'>",
                 "  <search>",
@@ -110,7 +111,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
         assertThat(chainsConfig().chains(), hasItemWithMethod("vespa", "id"));
     }
 
-    private void createClusterWithOnlyDefaultChains() {
+    private void createClusterWithOnlyDefaultChains() throws SAXException, IOException {
         Element containerElem = DomBuilderTest.parse(
                 "<jdisc id='default' version='1.0'>",
                 "  <search/>",
@@ -123,7 +124,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void manually_setting_up_search_handler_is_forbidden() {
+    public void manually_setting_up_search_handler_is_forbidden() throws IOException, SAXException {
         try {
             Element clusterElem = DomBuilderTest.parse(
                     "<jdisc id='default' version='1.0'>",
@@ -192,7 +193,7 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
     }
 
 
-    private VespaModel getVespaModelWithMusic(String hosts, String services) {
+    private VespaModel getVespaModelWithMusic(String hosts, String services) throws ParseException {
         return new VespaModelCreatorWithMockPkg(hosts, services, ApplicationPackageUtils.generateSearchDefinitions("music")).create();
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ReservedDocumentTypeNameValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ReservedDocumentTypeNameValidatorTest.java
index 66f59717407..0ad5fb3b0bd 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ReservedDocumentTypeNameValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ReservedDocumentTypeNameValidatorTest.java
@@ -47,7 +47,7 @@ public class ReservedDocumentTypeNameValidatorTest {
     public void validation_is_case_insensitive() {
         expectedException.expect(IllegalArgumentException.class);
         expectedException.expectMessage("The following document types conflict with reserved keyword names: " +
-                                        "'NULL', 'True', 'anD'.");
+                "'NULL', 'True', 'anD'.");
 
         ReservedDocumentTypeNameValidator validator = new ReservedDocumentTypeNameValidator();
         Map<String, NewDocumentType> orderedDocTypes = new TreeMap<>(asDocTypeMapping(Arrays.asList("NULL", "True", "anD")));