Simplify tests

5 files changed, 96 insertions, 64 deletions

diff --git a/config-model/src/test/examples/matchphase/non_existing_attribute.sd b/config-model/src/test/examples/matchphase/non_existing_attribute.sd
deleted file mode 100644
index cd3842fde8a..00000000000
--- a/config-model/src/test/examples/matchphase/non_existing_attribute.sd
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search test {
-  document test {
-    field foo type int {
-      indexing: summary
-    }
-  }
-  rank-profile default {
-    match-phase {
-      attribute: foo
-      max-hits: 100
-    }
-  }
-}
diff --git a/config-model/src/test/examples/matchphase/non_fast_search_attribute.sd b/config-model/src/test/examples/matchphase/non_fast_search_attribute.sd
deleted file mode 100644
index 5fde096cf61..00000000000
--- a/config-model/src/test/examples/matchphase/non_fast_search_attribute.sd
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search test {
-  document test {
-    field foo type int {
-      indexing: attribute
-    }
-  }
-  rank-profile default {
-    match-phase {
-      attribute: foo
-      max-hits: 100
-    }
-  }
-}
diff --git a/config-model/src/test/examples/matchphase/wrong_collection_type_attribute.sd b/config-model/src/test/examples/matchphase/wrong_collection_type_attribute.sd
deleted file mode 100644
index 8a9166c94f7..00000000000
--- a/config-model/src/test/examples/matchphase/wrong_collection_type_attribute.sd
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search test {
-  document test {
-    field foo type array<int> {
-      indexing: attribute
-    }
-  }
-  rank-profile default {
-    match-phase {
-      attribute: foo
-      max-hits: 100
-    }
-  }
-}
diff --git a/config-model/src/test/examples/matchphase/wrong_data_type_attribute.sd b/config-model/src/test/examples/matchphase/wrong_data_type_attribute.sd
deleted file mode 100644
index d4f526569ea..00000000000
--- a/config-model/src/test/examples/matchphase/wrong_data_type_attribute.sd
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search test {
-  document test {
-    field foo type string {
-      indexing: attribute
-    }
-  }
-  rank-profile default {
-    match-phase {
-      attribute: foo
-      max-hits: 100
-    }
-  }
-}
diff --git a/config-model/src/test/java/com/yahoo/schema/processing/MatchPhaseSettingsValidatorTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/MatchPhaseSettingsValidatorTestCase.java
index cbddea8ea6a..dc04fc9772f 100644
--- a/config-model/src/test/java/com/yahoo/schema/processing/MatchPhaseSettingsValidatorTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/processing/MatchPhaseSettingsValidatorTestCase.java
@@ -1,9 +1,13 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.schema.processing;
 
+import com.yahoo.schema.ApplicationBuilder;
+import com.yahoo.yolean.Exceptions;
 import org.junit.jupiter.api.Test;
 
 import static com.yahoo.schema.processing.AssertSearchBuilder.assertBuildFails;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class MatchPhaseSettingsValidatorTestCase {
 
@@ -13,25 +17,109 @@ public class MatchPhaseSettingsValidatorTestCase {
 
     @Test
     void requireThatAttributeMustExists() throws Exception {
-        assertBuildFails("src/test/examples/matchphase/non_existing_attribute.sd",
-                getMessagePrefix() + "does not exists");
+        try {
+            var schema = """
+                    search test {
+                      document test {
+                        field foo type int {
+                          indexing: summary
+                        }
+                      }
+                      rank-profile default {
+                        match-phase {
+                          attribute: foo
+                          max-hits: 100
+                        }
+                      }
+                    }
+                    """;
+            ApplicationBuilder.createFromString(schema);
+            fail("Expected exception");
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals(getMessagePrefix() + "does not exists", Exceptions.toMessageString(e));
+        }
     }
 
     @Test
     void requireThatAttributeMustBeNumeric() throws Exception {
-        assertBuildFails("src/test/examples/matchphase/wrong_data_type_attribute.sd",
-                getMessagePrefix() + "must be single value numeric, but it is 'string'");
+        try {
+            var schema = """
+                    search test {
+                      document test {
+                        field foo type string {
+                          indexing: attribute
+                        }
+                      }
+                      rank-profile default {
+                        match-phase {
+                          attribute: foo
+                          max-hits: 100
+                        }
+                      }
+                    }
+                    """;
+            ApplicationBuilder.createFromString(schema);
+            fail("Expected exception");
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals(getMessagePrefix() + "must be single value numeric, but it is 'string'",
+                         Exceptions.toMessageString(e));
+        }
     }
 
     @Test
     void requireThatAttributeMustBeSingleValue() throws Exception {
-        assertBuildFails("src/test/examples/matchphase/wrong_collection_type_attribute.sd",
-                getMessagePrefix() + "must be single value numeric, but it is 'Array<int>'");
+        try {
+            var schema = """
+                    search test {
+                      document test {
+                        field foo type array<int> {
+                          indexing: attribute
+                        }
+                      }
+                      rank-profile default {
+                        match-phase {
+                          attribute: foo
+                          max-hits: 100
+                        }
+                      }
+                    }
+                    """;
+            ApplicationBuilder.createFromString(schema);
+            fail("Expected exception");
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals(getMessagePrefix() + "must be single value numeric, but it is 'Array<int>'",
+                         Exceptions.toMessageString(e));
+        }
     }
 
     @Test
     void requireThatAttributeMustHaveFastSearch() throws Exception {
-        assertBuildFails("src/test/examples/matchphase/non_fast_search_attribute.sd",
-                getMessagePrefix() + "must be fast-search, but it is not");
+        try {
+            var schema = """
+                    search test {
+                      document test {
+                        field foo type int {
+                          indexing: attribute
+                        }
+                      }
+                      rank-profile default {
+                        match-phase {
+                          attribute: foo
+                          max-hits: 100
+                        }
+                      }
+                    }
+                    """;
+            ApplicationBuilder.createFromString(schema);
+            fail("Expected exception");
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals(getMessagePrefix() + "must be fast-search, but it is not",
+                         Exceptions.toMessageString(e));
+        }
     }
+
 }