Unify how property names are generated and decomposed.

1 files changed, 16 insertions, 2 deletions

diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/RankingExpressionTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/RankingExpressionTestCase.java
index 092faa1934e..4214727eb5f 100755
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/RankingExpressionTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/RankingExpressionTestCase.java
@@ -14,6 +14,7 @@ import com.yahoo.searchlib.rankingexpression.rule.TensorFunctionNode;
 import com.yahoo.tensor.functions.Reduce;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
 
@@ -23,10 +24,13 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author Simon Thoresen Hult
@@ -208,6 +212,16 @@ public class RankingExpressionTestCase {
     }
 
     @Test
+    public void testPropertyName() {
+        assertEquals("rankingExpression(m4).rankingScript", RankingExpression.propertyName("m4"));
+        assertEquals("m4", RankingExpression.extractScriptName("rankingExpression(m4).rankingScript"));
+        assertNull(RankingExpression.extractScriptName("rankingexpression(m4).rankingScript"));
+        assertNull(RankingExpression.extractScriptName("rankingExpression(m4).rankingscript"));
+
+        assertEquals("rankingExpression(m4).expressionName", RankingExpression.propertyExpressionName("m4"));
+    }
+
+    @Test
     public void testBug3464208() throws ParseException {
         List<ExpressionFunction> functions = new ArrayList<>();
         functions.add(new ExpressionFunction("log10tweetage", null, new RankingExpression("69")));