Strip last names

2 files changed, 10 insertions, 12 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/ModelEvaluationTest.java b/config-model/src/test/java/com/yahoo/config/model/ModelEvaluationTest.java
index 8eccc4e7d06..d06752c9b6d 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ModelEvaluationTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ModelEvaluationTest.java
@@ -32,35 +32,31 @@ public class ModelEvaluationTest {
         RankProfilesConfig.Builder b = new RankProfilesConfig.Builder();
         cluster.getConfig(b);
         RankProfilesConfig config = new RankProfilesConfig(b);
-        System.out.println(config.rankprofile(2).toString());
         assertEquals(3, config.rankprofile().size());
         Set<String> modelNames = config.rankprofile().stream().map(v -> v.name()).collect(Collectors.toSet());
-        assertTrue(modelNames.contains("xgboost_2_2_json"));
-        assertTrue(modelNames.contains("mnist_softmax_onnx"));
+        assertTrue(modelNames.contains("xgboost_2_2"));
+        assertTrue(modelNames.contains("mnist_softmax"));
         assertTrue(modelNames.contains("mnist_softmax_saved"));
 
         ModelsEvaluator evaluator = new ModelsEvaluator(config);
 
         assertEquals(3, evaluator.models().size());
-        Model xgboost = evaluator.models().get("xgboost_2_2_json");
+        Model xgboost = evaluator.models().get("xgboost_2_2");
         assertNotNull(xgboost);
         assertNotNull(xgboost.evaluatorOf());
-        assertNotNull(xgboost.evaluatorOf("xgboost_2_2_json"));
-        System.out.println("xgboost functions: " + xgboost.functions().stream().map(f -> f.getName()).collect(Collectors.joining(", ")));
+        assertNotNull(xgboost.evaluatorOf("xgboost_2_2"));
 
-        Model onnx = evaluator.models().get("mnist_softmax_onnx");
+        Model onnx = evaluator.models().get("mnist_softmax");
         assertNotNull(onnx);
         assertNotNull(onnx.evaluatorOf());
         assertNotNull(onnx.evaluatorOf("default"));
         assertNotNull(onnx.evaluatorOf("default", "add"));
-        System.out.println("onnx functions: " + onnx.functions().stream().map(f -> f.getName()).collect(Collectors.joining(", ")));
 
         Model tensorflow = evaluator.models().get("mnist_softmax_saved");
         assertNotNull(tensorflow);
         assertNotNull(tensorflow.evaluatorOf());
         assertNotNull(tensorflow.evaluatorOf("serving_default"));
         assertNotNull(tensorflow.evaluatorOf("serving_default", "y"));
-        System.out.println("tensorflow functions: " + tensorflow.functions().stream().map(f -> f.getName()).collect(Collectors.joining(", ")));
     }
 
 }
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxTestCase.java
index a96a3ce798b..815a01cdb99 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionWithOnnxTestCase.java
@@ -31,7 +31,7 @@ public class RankingExpressionWithOnnxTestCase {
     private final Path applicationDir = Path.fromString("src/test/integration/onnx/");
 
     /** The model name */
-    private final static String name = "mnist_softmax_onnx";
+    private final static String name = "mnist_softmax";
 
     private final static String vespaExpression = "join(reduce(join(rename(Placeholder, (d0, d1), (d0, d2)), constant(" + name + "_Variable), f(a,b)(a * b)), sum, d2), constant(" + name + "_Variable_1), f(a,b)(a + b))";
 
@@ -54,7 +54,8 @@ public class RankingExpressionWithOnnxTestCase {
     @Test
     public void testOnnxReferenceWithQueryFeature() {
         String queryProfile = "<query-profile id='default' type='root'/>";
-        String queryProfileType = "<query-profile-type id='root'>" +
+        String queryProfileType =
+                "<query-profile-type id='root'>" +
                 "  <field name='query(mytensor)' type='tensor(d0[3],d1[784])'/>" +
                 "</query-profile-type>";
         StoringApplicationPackage application = new StoringApplicationPackage(applicationDir,
@@ -89,7 +90,8 @@ public class RankingExpressionWithOnnxTestCase {
     @Test
     public void testOnnxReferenceWithFeatureCombination() {
         String queryProfile = "<query-profile id='default' type='root'/>";
-        String queryProfileType = "<query-profile-type id='root'>" +
+        String queryProfileType =
+                "<query-profile-type id='root'>" +
                 "  <field name='query(mytensor)' type='tensor(d0[3],d1[784],d2[10])'/>" +
                 "</query-profile-type>";
         StoringApplicationPackage application = new StoringApplicationPackage(applicationDir,