Simplify tests

3 files changed, 47 insertions, 34 deletions

diff --git a/config-model/src/test/examples/indexing_output_conflict.sd b/config-model/src/test/examples/indexing_output_conflict.sd
deleted file mode 100644
index 9cf1cbc0823..00000000000
--- a/config-model/src/test/examples/indexing_output_conflict.sd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search indexing_output_confict {
-    document indexing_output_confict {
-        field foo type string {
-
-        }
-    }
-    field bar type string {
-        indexing: input foo | attribute | lowercase | index
-    }
-}
diff --git a/config-model/src/test/examples/indexing_output_other_field.sd b/config-model/src/test/examples/indexing_output_other_field.sd
deleted file mode 100644
index 40b08bb15b2..00000000000
--- a/config-model/src/test/examples/indexing_output_other_field.sd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search indexing_output_other_field {
-    document indexing_output_other_field {
-        field foo type string {
-            indexing: index bar
-        }
-    }
-    field bar type string {
-
-    }
-}
diff --git a/config-model/src/test/java/com/yahoo/schema/processing/IndexingOutputsTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/IndexingOutputsTestCase.java
index e707d203381..7557ca5b725 100644
--- a/config-model/src/test/java/com/yahoo/schema/processing/IndexingOutputsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/processing/IndexingOutputsTestCase.java
@@ -1,13 +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.schema.parser.ParseException;
+import com.yahoo.yolean.Exceptions;
 import org.junit.jupiter.api.Test;
 
-import java.io.IOException;
-
-import static com.yahoo.schema.processing.AssertSearchBuilder.assertBuildFails;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Simon Thoresen Hult
@@ -15,16 +15,51 @@ import static com.yahoo.schema.processing.AssertSearchBuilder.assertBuildFails;
 public class IndexingOutputsTestCase {
 
     @Test
-    void requireThatOutputOtherFieldThrows() throws IOException, ParseException {
-        assertBuildFails("src/test/examples/indexing_output_other_field.sd",
-                "For schema 'indexing_output_other_field', field 'foo': Indexing expression 'index bar' " +
-                        "attempts to write to a field other than 'foo'.");
+    void requireThatOutputOtherFieldThrows() throws ParseException {
+        try {
+            var schema = """
+                    search indexing_output_other_field {
+                        document indexing_output_other_field {
+                            field foo type string {
+                                indexing: index bar
+                            }
+                        }
+                        field bar type string {
+                        }
+                    }
+                    """;
+            ApplicationBuilder.createFromString(schema);
+            fail("Expected exception");
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals("For schema 'indexing_output_other_field', field 'foo': Indexing expression 'index bar' " +
+                         "attempts to write to a field other than 'foo'.",
+                         Exceptions.toMessageString(e));
+        }
     }
 
     @Test
-    void requireThatOutputConflictThrows() throws IOException, ParseException {
-        assertBuildFails("src/test/examples/indexing_output_conflict.sd",
-                "For schema 'indexing_output_confict', field 'bar': For expression 'index bar': Attempting " +
-                        "to assign conflicting values to field 'bar'.");
+    void requireThatOutputConflictThrows() throws ParseException {
+        try {
+            var schema = """
+                    search indexing_output_confict {
+                        document indexing_output_confict {
+                            field foo type string {
+                            }
+                        }
+                        field bar type string {
+                            indexing: input foo | attribute | lowercase | index
+                        }
+                    }
+                    """;
+            ApplicationBuilder.createFromString(schema);
+            fail("Expected exception");
+        }
+        catch (IllegalArgumentException e) {
+            assertEquals("For schema 'indexing_output_confict', field 'bar': For expression 'index bar': Attempting " +
+                         "to assign conflicting values to field 'bar'.",
+                         Exceptions.toMessageString(e));
+        }
     }
+
 }