Merge pull request #22038 from vespa-engine/arnej/allow-struct-types-with-same-name

Arnej/allow struct types with same name

2 files changed, 9 insertions, 17 deletions

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/DuplicateStructTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/DuplicateStructTestCase.java
index 8e221583bff..0695a3de922 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/DuplicateStructTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/DuplicateStructTestCase.java
@@ -24,5 +24,4 @@ public class DuplicateStructTestCase extends AbstractExportingTestCase {
                               .setExperimentalSdParsing(true),
                               new TestableDeployLogger());
     }
-
 }
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");
     }
 
 }