summaryrefslogtreecommitdiffstats
path: root/config-model/src/test
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahooinc.com>2022-04-07 07:47:36 +0000
committerArne H Juul <arnej@yahooinc.com>2022-04-07 14:01:29 +0000
commitad0d0f7875890539ecaee79a925f0d5247ca8682 (patch)
treee9b03b0047513e4196dbeb579ad7280949bd702f /config-model/src/test
parent402027bcbddb7bbae84a643acdc7fcef9dfe6c11 (diff)
name collisions should be ok now
Diffstat (limited to 'config-model/src/test')
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/NameCollisionTestCase.java25
1 files changed, 9 insertions, 16 deletions
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 61e80e6d701..15cf553f80e 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,22 +19,15 @@ public class NameCollisionTestCase extends AbstractExportingTestCase {
@Test
public void testNameCollision() throws Exception {
- 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(RuntimeException.class, () -> {
- assertCorrectDeriving("namecollision", "collisionstruct",
- new TestProperties().setExperimentalSdParsing(true),
- new TestableDeployLogger());
- var docman = DocumentTypeManager.fromFile("temp/namecollision/documentmanager.cfg");
- });
- ey.printStackTrace();
- System.err.println("MSG 2: "+ey.getClass()+" -> "+ey.getMessage());
+ assertCorrectDeriving("namecollision", "collisionstruct",
+ new TestProperties().setExperimentalSdParsing(false),
+ new TestableDeployLogger());
+ var docman = DocumentTypeManager.fromFile("temp/namecollision/documentmanager.cfg");
+
+ assertCorrectDeriving("namecollision", "collisionstruct",
+ new TestProperties().setExperimentalSdParsing(true),
+ new TestableDeployLogger());
+ docman = DocumentTypeManager.fromFile("temp/namecollision/documentmanager.cfg");
}
}