diff options
Diffstat (limited to 'config-model/src/test')
2 files changed, 6 insertions, 5 deletions
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java index e8bc4f44738..7b262bdc4d0 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileRegistryTest.java @@ -4,6 +4,7 @@ package com.yahoo.searchdefinition; import com.yahoo.config.model.application.provider.FilesApplicationPackage; import com.yahoo.config.model.test.TestDriver; import com.yahoo.config.model.test.TestRoot; +import com.yahoo.searchlib.rankingexpression.ExpressionFunction; import com.yahoo.searchlib.rankingexpression.RankingExpression; import com.yahoo.vespa.config.search.RankProfilesConfig; import org.junit.Test; @@ -46,7 +47,7 @@ public class RankProfileRegistryTest { for (String rankProfileName : RankProfileRegistry.overridableRankProfileNames) { assertNull(rankProfileRegistry.get(search, rankProfileName).getMacros().get("foo")); RankProfile rankProfileWithAddedMacro = new RankProfile(rankProfileName, search, rankProfileRegistry); - rankProfileWithAddedMacro.addMacro("foo", RankingExpression.from("1+2"), true); + rankProfileWithAddedMacro.addMacro(new ExpressionFunction("foo", RankingExpression.from("1+2")), true); rankProfileRegistry.add(rankProfileWithAddedMacro); assertNotNull(rankProfileRegistry.get(search, rankProfileName).getMacros().get("foo")); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java index 0f8e6072d53..132807bf8b8 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java @@ -28,13 +28,13 @@ public class RankingExpressionsTestCase extends SearchDefinitionTestCase { final RankProfile macrosRankProfile = rankProfileRegistry.get(search, "macros"); macrosRankProfile.parseExpressions(); final Map<String, RankProfile.Macro> macros = macrosRankProfile.getMacros(); - assertEquals(2, macros.get("titlematch$").getArguments().size()); - assertEquals("var1", macros.get("titlematch$").getArguments().get(0)); - assertEquals("var2", macros.get("titlematch$").getArguments().get(1)); + assertEquals(2, macros.get("titlematch$").function().arguments().size()); + assertEquals("var1", macros.get("titlematch$").function().arguments().get(0)); + assertEquals("var2", macros.get("titlematch$").function().arguments().get(1)); assertEquals("var1 * var2 + 890", macros.get("titlematch$").function().getBody().getRoot().toString()); assertEquals("0.8+0.2*titlematch$(4,5)+0.8*titlematch$(7,8)*closeness(distance)", macrosRankProfile.getFirstPhaseRankingString().trim()); assertEquals("78 + closeness(distance)", macros.get("artistmatch").function().getBody().getRoot().toString()); - assertEquals(0, macros.get("artistmatch").getArguments().size()); + assertEquals(0, macros.get("artistmatch").function().arguments().size()); List<Pair<String, String>> rankProperties = new RawRankProfile(macrosRankProfile, new QueryProfileRegistry(), |