Merge branch 'master' into balder/upper-limit-before-commit

2 files changed, 5 insertions, 4 deletions

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SchemaTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SchemaTestCase.java
index 329d27472c2..8b96779f695 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/SchemaTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/SchemaTestCase.java
@@ -166,7 +166,7 @@ public class SchemaTestCase {
         assertTrue(child.onnxModels().asMap().containsKey("child_model"));
         assertNotNull(child.getSummary("parent_summary"));
         assertNotNull(child.getSummary("child_summary"));
-        assertEquals("parent_summary", child.getSummary("child_summary").getInherited().getName());
+        assertEquals("parent_summary", child.getSummary("child_summary").inherited().get().getName());
         assertTrue(child.getSummaries().containsKey("parent_summary"));
         assertTrue(child.getSummaries().containsKey("child_summary"));
         assertNotNull(child.getSummaryField("pf1"));
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java
index e57dcf38fed..dee63f04ad5 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java
@@ -10,6 +10,7 @@ import static com.yahoo.config.model.test.TestUtil.joinLines;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
@@ -172,12 +173,12 @@ public class SummaryTestCase {
                 new TestValue(everythingSummary, titleArtistSummary, List.of(List.of(titleField), implicitFields, List.of(artistField, albumField)))
         );
         tests.forEach(testValue -> {
-            var actualFields = testValue.summary.getSummaryFields().stream()
+            var actualFields = testValue.summary.getSummaryFields().values().stream()
                                                 .map(FieldBase::getName)
                                                 .collect(Collectors.toList());
             assertEquals(testValue.summary.getName() + (testValue.parent == null ? " does not inherit anything" : " inherits " + testValue.parent.getName()),
-                         testValue.parent,
-                         testValue.summary.getInherited());
+                         Optional.ofNullable(testValue.parent),
+                         testValue.summary.inherited());
             assertEquals("Summary " + testValue.summary.getName() + " has expected fields", testValue.fields, actualFields);
         });
     }