From 2cd60412954bec3717d2b0306622df36ecd3d770 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Thu, 22 Oct 2020 19:11:37 +0200 Subject: Expect spaces in Pair toString --- .../searchdefinition/RankPropertiesTestCase.java | 4 +- .../RankingExpressionConstantsTestCase.java | 4 +- .../RankingExpressionShadowingTestCase.java | 50 +++++++++++----------- 3 files changed, 29 insertions(+), 29 deletions(-) (limited to 'config-model') diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java index 3fe2861de0c..4bfe3db066c 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankPropertiesTestCase.java @@ -56,7 +56,7 @@ public class RankPropertiesTestCase extends SchemaTestCase { // Check derived model RawRankProfile rawParent = new RawRankProfile(parent, new QueryProfileRegistry(), new ImportedMlModels(), attributeFields); - assertEquals("(query(a),1500)", rawParent.configProperties().get(0).toString()); + assertEquals("(query(a), 1500)", rawParent.configProperties().get(0).toString()); } { @@ -69,7 +69,7 @@ public class RankPropertiesTestCase extends SchemaTestCase { new QueryProfileRegistry(), new ImportedMlModels(), attributeFields); - assertEquals("(query(a),2000)", rawChild.configProperties().get(0).toString()); + assertEquals("(query(a), 2000)", rawChild.configProperties().get(0).toString()); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java index d84d967a184..abf27ef643e 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionConstantsTestCase.java @@ -80,8 +80,8 @@ public class RankingExpressionConstantsTestCase extends SchemaTestCase { queryProfileRegistry, new ImportedMlModels(), new AttributeFields(s)).configProperties(); - assertEquals("(rankingExpression(foo).rankingScript,14.0)", rankProperties.get(0).toString()); - assertEquals("(rankingExpression(firstphase).rankingScript,16.6)", rankProperties.get(2).toString()); + assertEquals("(rankingExpression(foo).rankingScript, 14.0)", rankProperties.get(0).toString()); + assertEquals("(rankingExpression(firstphase).rankingScript, 16.6)", rankProperties.get(2).toString()); } @Test diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionShadowingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionShadowingTestCase.java index 02d1c3fc3b0..84a6d2a154a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionShadowingTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionShadowingTestCase.java @@ -50,11 +50,11 @@ public class RankingExpressionShadowingTestCase extends SchemaTestCase { new QueryProfileRegistry(), new ImportedMlModels(), new AttributeFields(s)).configProperties(); - assertEquals("(rankingExpression(sin@).rankingScript,2 * 2)", + assertEquals("(rankingExpression(sin@).rankingScript, 2 * 2)", censorBindingHash(testRankProperties.get(0).toString())); - assertEquals("(rankingExpression(sin).rankingScript,x * x)", + assertEquals("(rankingExpression(sin).rankingScript, x * x)", testRankProperties.get(1).toString()); - assertEquals("(vespa.rank.firstphase,rankingExpression(sin@))", + assertEquals("(vespa.rank.firstphase, rankingExpression(sin@))", censorBindingHash(testRankProperties.get(2).toString())); } @@ -94,23 +94,23 @@ public class RankingExpressionShadowingTestCase extends SchemaTestCase { new QueryProfileRegistry(), new ImportedMlModels(), new AttributeFields(s)).configProperties(); - assertEquals("(rankingExpression(tan@).rankingScript,2 * 2)", + assertEquals("(rankingExpression(tan@).rankingScript, 2 * 2)", censorBindingHash(testRankProperties.get(0).toString())); - assertEquals("(rankingExpression(cos@).rankingScript,rankingExpression(tan@))", + assertEquals("(rankingExpression(cos@).rankingScript, rankingExpression(tan@))", censorBindingHash(testRankProperties.get(1).toString())); - assertEquals("(rankingExpression(sin@).rankingScript,rankingExpression(cos@))", + assertEquals("(rankingExpression(sin@).rankingScript, rankingExpression(cos@))", censorBindingHash(testRankProperties.get(2).toString())); - assertEquals("(rankingExpression(tan).rankingScript,x * x)", + assertEquals("(rankingExpression(tan).rankingScript, x * x)", testRankProperties.get(3).toString()); - assertEquals("(rankingExpression(tan@).rankingScript,x * x)", + assertEquals("(rankingExpression(tan@).rankingScript, x * x)", censorBindingHash(testRankProperties.get(4).toString())); - assertEquals("(rankingExpression(cos).rankingScript,rankingExpression(tan@))", + assertEquals("(rankingExpression(cos).rankingScript, rankingExpression(tan@))", censorBindingHash(testRankProperties.get(5).toString())); - assertEquals("(rankingExpression(cos@).rankingScript,rankingExpression(tan@))", + assertEquals("(rankingExpression(cos@).rankingScript, rankingExpression(tan@))", censorBindingHash(testRankProperties.get(6).toString())); - assertEquals("(rankingExpression(sin).rankingScript,rankingExpression(cos@))", + assertEquals("(rankingExpression(sin).rankingScript, rankingExpression(cos@))", censorBindingHash(testRankProperties.get(7).toString())); - assertEquals("(vespa.rank.firstphase,rankingExpression(sin@))", + assertEquals("(vespa.rank.firstphase, rankingExpression(sin@))", censorBindingHash(testRankProperties.get(8).toString())); } @@ -143,15 +143,15 @@ public class RankingExpressionShadowingTestCase extends SchemaTestCase { new QueryProfileRegistry(), new ImportedMlModels(), new AttributeFields(s)).configProperties(); - assertEquals("(rankingExpression(sin@).rankingScript,4.0 * 4.0)", + assertEquals("(rankingExpression(sin@).rankingScript, 4.0 * 4.0)", censorBindingHash(testRankProperties.get(0).toString())); - assertEquals("(rankingExpression(sin@).rankingScript,cos(5.0) * cos(5.0))", + assertEquals("(rankingExpression(sin@).rankingScript, cos(5.0) * cos(5.0))", censorBindingHash(testRankProperties.get(1).toString())); - assertEquals("(rankingExpression(sin).rankingScript,x * x)", + assertEquals("(rankingExpression(sin).rankingScript, x * x)", testRankProperties.get(2).toString()); - assertEquals("(vespa.rank.firstphase,rankingExpression(firstphase))", + assertEquals("(vespa.rank.firstphase, rankingExpression(firstphase))", censorBindingHash(testRankProperties.get(3).toString())); - assertEquals("(rankingExpression(firstphase).rankingScript,cos(rankingExpression(sin@)) + rankingExpression(sin@))", + assertEquals("(rankingExpression(firstphase).rankingScript, cos(rankingExpression(sin@)) + rankingExpression(sin@))", censorBindingHash(testRankProperties.get(4).toString())); } @@ -207,21 +207,21 @@ public class RankingExpressionShadowingTestCase extends SchemaTestCase { queryProfiles, new ImportedMlModels(), new AttributeFields(s)).configProperties(); - assertEquals("(rankingExpression(relu@).rankingScript,max(1.0,reduce(query(q) * constant(W_hidden), sum, input) + constant(b_input)))", + assertEquals("(rankingExpression(relu@).rankingScript, max(1.0,reduce(query(q) * constant(W_hidden), sum, input) + constant(b_input)))", censorBindingHash(testRankProperties.get(0).toString())); - assertEquals("(rankingExpression(hidden_layer).rankingScript,rankingExpression(relu@))", + assertEquals("(rankingExpression(hidden_layer).rankingScript, rankingExpression(relu@))", censorBindingHash(testRankProperties.get(1).toString())); - assertEquals("(rankingExpression(hidden_layer).type,tensor(x[1]))", + assertEquals("(rankingExpression(hidden_layer).type, tensor(x[1]))", censorBindingHash(testRankProperties.get(2).toString())); - assertEquals("(rankingExpression(final_layer).rankingScript,sigmoid(reduce(rankingExpression(hidden_layer) * constant(W_final), sum, hidden) + constant(b_final)))", + assertEquals("(rankingExpression(final_layer).rankingScript, sigmoid(reduce(rankingExpression(hidden_layer) * constant(W_final), sum, hidden) + constant(b_final)))", testRankProperties.get(3).toString()); - assertEquals("(rankingExpression(final_layer).type,tensor(x[1]))", + assertEquals("(rankingExpression(final_layer).type, tensor(x[1]))", testRankProperties.get(4).toString()); - assertEquals("(rankingExpression(relu).rankingScript,max(1.0,x))", + assertEquals("(rankingExpression(relu).rankingScript, max(1.0,x))", testRankProperties.get(5).toString()); - assertEquals("(vespa.rank.secondphase,rankingExpression(secondphase))", + assertEquals("(vespa.rank.secondphase, rankingExpression(secondphase))", testRankProperties.get(6).toString()); - assertEquals("(rankingExpression(secondphase).rankingScript,reduce(rankingExpression(final_layer), sum))", + assertEquals("(rankingExpression(secondphase).rankingScript, reduce(rankingExpression(final_layer), sum))", testRankProperties.get(7).toString()); } -- cgit v1.2.3