1 files changed, 23 insertions, 24 deletions
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 5c1134f928c..e4ca83640e9 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionShadowingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionShadowingTestCase.java
@@ -50,10 +50,10 @@ public class RankingExpressionShadowingTestCase extends SchemaTestCase {
                                                                            new QueryProfileRegistry(),
                                                                            new ImportedMlModels(),
                                                                            new AttributeFields(s)).configProperties();
-        assertEquals("(rankingExpression(sin).rankingScript,x * x)",
-                     testRankProperties.get(0).toString());
         assertEquals("(rankingExpression(sin@).rankingScript,2 * 2)",
-                     censorBindingHash(testRankProperties.get(1).toString()));
+                censorBindingHash(testRankProperties.get(0).toString()));
+        assertEquals("(rankingExpression(sin).rankingScript,x * x)",
+                     testRankProperties.get(1).toString());
         assertEquals("(vespa.rank.firstphase,rankingExpression(sin@))",
                      censorBindingHash(testRankProperties.get(2).toString()));
     }
@@ -94,27 +94,26 @@ public class RankingExpressionShadowingTestCase extends SchemaTestCase {
                                                                            new QueryProfileRegistry(),
                                                                            new ImportedMlModels(),
                                                                            new AttributeFields(s)).configProperties();
+        assertEquals("(rankingExpression(tan@).rankingScript,2 * 2)",
+                censorBindingHash(testRankProperties.get(0).toString()));
+        assertEquals("(rankingExpression(cos@).rankingScript,rankingExpression(tan@))",
+                censorBindingHash(testRankProperties.get(1).toString()));
+        assertEquals("(rankingExpression(sin@).rankingScript,rankingExpression(cos@))",
+                censorBindingHash(testRankProperties.get(2).toString()));
         assertEquals("(rankingExpression(tan).rankingScript,x * x)",
-                     testRankProperties.get(0).toString());
+                     testRankProperties.get(3).toString());
         assertEquals("(rankingExpression(tan@).rankingScript,x * x)",
-                     censorBindingHash(testRankProperties.get(1).toString()));
-        assertEquals("(rankingExpression(cos).rankingScript,rankingExpression(tan@))",
-                     censorBindingHash(testRankProperties.get(2).toString()));
-        assertEquals("(rankingExpression(cos@).rankingScript,rankingExpression(tan@))",
-                     censorBindingHash(testRankProperties.get(3).toString()));
-        assertEquals("(rankingExpression(sin).rankingScript,rankingExpression(cos@))",
                      censorBindingHash(testRankProperties.get(4).toString()));
-        assertEquals("(rankingExpression(tan@).rankingScript,2 * 2)",
+        assertEquals("(rankingExpression(cos).rankingScript,rankingExpression(tan@))",
                      censorBindingHash(testRankProperties.get(5).toString()));
         assertEquals("(rankingExpression(cos@).rankingScript,rankingExpression(tan@))",
-                     censorBindingHash(testRankProperties.get(6).toString()));
-        assertEquals("(rankingExpression(sin@).rankingScript,rankingExpression(cos@))",
+                censorBindingHash(testRankProperties.get(6).toString()));
+        assertEquals("(rankingExpression(sin).rankingScript,rankingExpression(cos@))",
                      censorBindingHash(testRankProperties.get(7).toString()));
         assertEquals("(vespa.rank.firstphase,rankingExpression(sin@))",
                      censorBindingHash(testRankProperties.get(8).toString()));
     }
 
-
     @Test
     public void testFunctionShadowingArguments() throws ParseException {
         RankProfileRegistry rankProfileRegistry = new RankProfileRegistry();
@@ -144,12 +143,12 @@ public class RankingExpressionShadowingTestCase extends SchemaTestCase {
                                                                            new QueryProfileRegistry(),
                                                                            new ImportedMlModels(),
                                                                            new AttributeFields(s)).configProperties();
-        assertEquals("(rankingExpression(sin).rankingScript,x * x)",
-                     testRankProperties.get(0).toString());
         assertEquals("(rankingExpression(sin@).rankingScript,4.0 * 4.0)",
-                     censorBindingHash(testRankProperties.get(1).toString()));
+                censorBindingHash(testRankProperties.get(0).toString()));
         assertEquals("(rankingExpression(sin@).rankingScript,cos(5.0) * cos(5.0))",
-                     censorBindingHash(testRankProperties.get(2).toString()));
+                censorBindingHash(testRankProperties.get(1).toString()));
+        assertEquals("(rankingExpression(sin).rankingScript,x * x)",
+                     testRankProperties.get(2).toString());
         assertEquals("(vespa.rank.firstphase,rankingExpression(firstphase))",
                      censorBindingHash(testRankProperties.get(3).toString()));
         assertEquals("(rankingExpression(firstphase).rankingScript,cos(rankingExpression(sin@)) + rankingExpression(sin@))",
@@ -208,17 +207,17 @@ public class RankingExpressionShadowingTestCase extends SchemaTestCase {
                                                                            queryProfiles,
                                                                            new ImportedMlModels(),
                                                                            new AttributeFields(s)).configProperties();
-        assertEquals("(rankingExpression(relu).rankingScript,max(1.0,x))",
-                     testRankProperties.get(0).toString());
         assertEquals("(rankingExpression(relu@).rankingScript,max(1.0,reduce(query(q) * constant(W_hidden), sum, input) + constant(b_input)))",
-                     censorBindingHash(testRankProperties.get(1).toString()));
+                censorBindingHash(testRankProperties.get(0).toString()));
         assertEquals("(rankingExpression(hidden_layer).rankingScript,rankingExpression(relu@))",
-                     censorBindingHash(testRankProperties.get(2).toString()));
+                censorBindingHash(testRankProperties.get(1).toString()));
         assertEquals("(rankingExpression(hidden_layer).type,tensor(x[]))",
-                     censorBindingHash(testRankProperties.get(3).toString()));
+                censorBindingHash(testRankProperties.get(2).toString()));
         assertEquals("(rankingExpression(final_layer).rankingScript,sigmoid(reduce(rankingExpression(hidden_layer) * constant(W_final), sum, hidden) + constant(b_final)))",
-                     testRankProperties.get(4).toString());
+                testRankProperties.get(3).toString());
         assertEquals("(rankingExpression(final_layer).type,tensor(x[]))",
+                testRankProperties.get(4).toString());
+        assertEquals("(rankingExpression(relu).rankingScript,max(1.0,x))",
                      testRankProperties.get(5).toString());
         assertEquals("(vespa.rank.secondphase,rankingExpression(secondphase))",
                      testRankProperties.get(6).toString());