Merge pull request #22620 from vespa-engine/bratseth/models-in-profiles

Bratseth/models in profiles

2 files changed, 15 insertions, 15 deletions

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxModelTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxModelTestCase.java
index 1c23950d972..6820a8d9678 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxModelTestCase.java
@@ -93,6 +93,18 @@ public class RankingExpressionWithOnnxModelTestCase {
         assertEquals("path_to_output_2", model.output(2).as());
 
         model = config.model(1);
+        assertEquals("dynamic_model", model.name());
+        assertEquals(1, model.input().size());
+        assertEquals(1, model.output().size());
+        assertEquals("rankingExpression(my_function)", model.input(0).source());
+
+        model = config.model(2);
+        assertEquals("unbound_model", model.name());
+        assertEquals(1, model.input().size());
+        assertEquals(1, model.output().size());
+        assertEquals("rankingExpression(my_function)", model.input(0).source());
+
+        model = config.model(3);
         assertEquals("files_model_onnx", model.name());
         assertEquals(3, model.input().size());
         assertEquals(3, model.output().size());
@@ -104,27 +116,15 @@ public class RankingExpressionWithOnnxModelTestCase {
         assertEquals("path_to_output_2", model.output(2).as());
         assertEquals("files_model_onnx", model.name());
 
-        model = config.model(2);
+        model = config.model(4);
         assertEquals("another_model", model.name());
         assertEquals("third_input", model.input(2).name());
         assertEquals("rankingExpression(another_function)", model.input(2).source());
 
-        model = config.model(3);
+        model = config.model(5);
         assertEquals("files_summary_model_onnx", model.name());
         assertEquals(3, model.input().size());
         assertEquals(3, model.output().size());
-
-        model = config.model(4);
-        assertEquals("unbound_model", model.name());
-        assertEquals(1, model.input().size());
-        assertEquals(1, model.output().size());
-        assertEquals("rankingExpression(my_function)", model.input(0).source());
-
-        model = config.model(5);
-        assertEquals("dynamic_model", model.name());
-        assertEquals(1, model.input().size());
-        assertEquals(1, model.output().size());
-        assertEquals("rankingExpression(my_function)", model.input(0).source());
     }
 
     private void assertTransformedFeature(VespaModel model) {
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/VespaMlModelTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/VespaMlModelTestCase.java
index e0427d93ee4..4446f01aa95 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/VespaMlModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/VespaMlModelTestCase.java
@@ -68,7 +68,7 @@ public class VespaMlModelTestCase {
 
     private String rankConfigOf(String rankProfileName, VespaModel model) {
         StringBuilder b = new StringBuilder();
-        RawRankProfile profile = model.rankProfileList().getRankProfile(rankProfileName);
+        RawRankProfile profile = model.rankProfileList().getRankProfiles().get(rankProfileName);
         for (var property : profile.configProperties())
             b.append(property.getFirst()).append(" : ").append(property.getSecond()).append("\n");
         return b.toString();