From dc9214eb70fc12864c355bdfc5c0211f2b841931 Mon Sep 17 00:00:00 2001 From: Arne H Juul Date: Thu, 10 Mar 2022 09:38:26 +0000 Subject: expect any RuntimeException * after switching config style, this gets further in the pipeline, but still fails due to collision. But now we get IllegalStateException instead of IllegalArgumentException; handle both the same way. --- .../yahoo/searchdefinition/derived/NameCollisionTestCase.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'config-model') diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NameCollisionTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/NameCollisionTestCase.java index 70f6187be12..61e80e6d701 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NameCollisionTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/NameCollisionTestCase.java @@ -19,21 +19,22 @@ public class NameCollisionTestCase extends AbstractExportingTestCase { @Test public void testNameCollision() throws Exception { - var ex = assertThrows(IllegalArgumentException.class, () -> { + var ex = assertThrows(RuntimeException.class, () -> { assertCorrectDeriving("namecollision", "collisionstruct", new TestProperties().setExperimentalSdParsing(false), new TestableDeployLogger()); var docman = DocumentTypeManager.fromFile("temp/namecollision/documentmanager.cfg"); }); + ex.printStackTrace(); System.err.println("MSG 1: "+ex.getClass()+" -> "+ex.getMessage()); - var ey = assertThrows(IllegalArgumentException.class, () -> { + var ey = assertThrows(RuntimeException.class, () -> { assertCorrectDeriving("namecollision", "collisionstruct", new TestProperties().setExperimentalSdParsing(true), new TestableDeployLogger()); var docman = DocumentTypeManager.fromFile("temp/namecollision/documentmanager.cfg"); }); - System.err.println("MSG 2: "+ey.getMessage()); - + ey.printStackTrace(); + System.err.println("MSG 2: "+ey.getClass()+" -> "+ey.getMessage()); } } -- cgit v1.2.3