Refactor: Macro -> RankingExpressionFunction

1 files changed, 0 insertions, 72 deletions

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedMacroNamesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedMacroNamesTestCase.java
deleted file mode 100644
index 8a07e99101c..00000000000
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReservedMacroNamesTestCase.java
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.searchdefinition.processing;
-
-import com.yahoo.config.application.api.DeployLogger;
-import com.yahoo.searchdefinition.RankProfileRegistry;
-import com.yahoo.searchdefinition.Search;
-import com.yahoo.searchdefinition.SearchBuilder;
-import com.yahoo.searchdefinition.parser.ParseException;
-import org.junit.Test;
-
-import java.util.logging.Level;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-/**
- * @author lesters
- */
-public class ReservedMacroNamesTestCase {
-
-    @Test
-    public void requireThatMacrosWithReservedNamesIssueAWarning() throws ParseException {
-        TestDeployLogger deployLogger = new TestDeployLogger();
-        RankProfileRegistry rankProfileRegistry = new RankProfileRegistry();
-        SearchBuilder builder = new SearchBuilder(rankProfileRegistry);
-        builder.importString(
-                "search test {\n" +
-                        "    document test { \n" +
-                        "        field a type string { \n" +
-                        "            indexing: index \n" +
-                        "        }\n" +
-                        "    }\n" +
-                        "    \n" +
-                        "    rank-profile test_rank_profile {\n" +
-                        "        macro not_a_reserved_name(x) {\n" +
-                        "            expression: x + x\n" +
-                        "        }\n" +
-                        "        macro sigmoid(x) {\n" +
-                        "            expression: x * x\n" +
-                        "        }\n" +
-                        "        first-phase {\n" +
-                        "            expression: sigmoid(2) + not_a_reserved_name(1)\n" +
-                        "        }\n" +
-                        "    }\n" +
-                        "    rank-profile test_rank_profile_2 inherits test_rank_profile {\n" +
-                        "        macro sin(x) {\n" +
-                        "            expression: x * x\n" +
-                        "        }\n" +
-                        "        first-phase {\n" +
-                        "            expression: sigmoid(2) + sin(1)\n" +
-                        "        }\n" +
-                        "    }\n" +
-                        "}\n");
-        builder.build(true, deployLogger);
-
-        assertTrue(deployLogger.log.contains("sigmoid") && deployLogger.log.contains("test_rank_profile"));
-        assertTrue(deployLogger.log.contains("sigmoid") && deployLogger.log.contains("test_rank_profile_2"));
-        assertTrue(deployLogger.log.contains("sin") && deployLogger.log.contains("test_rank_profile_2"));
-        assertFalse(deployLogger.log.contains("not_a_reserved_name") && deployLogger.log.contains("test_rank_profile"));
-        assertFalse(deployLogger.log.contains("not_a_reserved_name") && deployLogger.log.contains("test_rank_profile_2"));
-
-    }
-
-    public static class TestDeployLogger implements DeployLogger {
-        public String log = "";
-        @Override
-        public void log(Level level, String message) {
-            log += message;
-        }
-    }
-    
-}