From 53e0e44855c45c6bc3f2ff14a1b063f68b51596a Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@gmail.com>
Date: Mon, 21 Feb 2022 09:55:19 +0100
Subject: Slightly more testing

---
 .../src/test/applications/rankprofilemodularity/test.expression       | 1 +
 .../intellij/src/test/applications/rankprofilemodularity/test.sd      | 3 ++-
 .../java/ai/vespa/intellij/findUsages/FindFunctionUsagesTest.java     | 2 ++
 .../src/test/java/ai/vespa/intellij/findUsages/UsagesTester.java      | 4 +++-
 4 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 integration/intellij/src/test/applications/rankprofilemodularity/test.expression

(limited to 'integration/intellij')

diff --git a/integration/intellij/src/test/applications/rankprofilemodularity/test.expression b/integration/intellij/src/test/applications/rankprofilemodularity/test.expression
new file mode 100644
index 00000000000..54b323c6b32
--- /dev/null
+++ b/integration/intellij/src/test/applications/rankprofilemodularity/test.expression
@@ -0,0 +1 @@
+fieldMatch(title)
diff --git a/integration/intellij/src/test/applications/rankprofilemodularity/test.sd b/integration/intellij/src/test/applications/rankprofilemodularity/test.sd
index 05901b4de6a..013881248c1 100644
--- a/integration/intellij/src/test/applications/rankprofilemodularity/test.sd
+++ b/integration/intellij/src/test/applications/rankprofilemodularity/test.sd
@@ -39,13 +39,14 @@ schema test {
 
     }
 
+    # A comment
     rank-profile in_schema2 inherits outside_schema2 {
 
         first-phase {
             expression: f2 + ff1
         }
 
-        function f2() {
+        macro f2() { # legacy name
             expression: fieldMatch(title) + fo2 + ff1
         }
 
diff --git a/integration/intellij/src/test/java/ai/vespa/intellij/findUsages/FindFunctionUsagesTest.java b/integration/intellij/src/test/java/ai/vespa/intellij/findUsages/FindFunctionUsagesTest.java
index a5315cea8fe..68d059b42ce 100644
--- a/integration/intellij/src/test/java/ai/vespa/intellij/findUsages/FindFunctionUsagesTest.java
+++ b/integration/intellij/src/test/java/ai/vespa/intellij/findUsages/FindFunctionUsagesTest.java
@@ -2,6 +2,8 @@
 package ai.vespa.intellij.findUsages;
 
 import ai.vespa.intellij.PluginTestBase;
+import ai.vespa.intellij.schema.model.Schema;
+import ai.vespa.intellij.schema.utils.Path;
 import com.intellij.usageView.UsageInfo;
 import org.junit.Test;
 
diff --git a/integration/intellij/src/test/java/ai/vespa/intellij/findUsages/UsagesTester.java b/integration/intellij/src/test/java/ai/vespa/intellij/findUsages/UsagesTester.java
index c1e6c9282b6..f9e3e71a85c 100644
--- a/integration/intellij/src/test/java/ai/vespa/intellij/findUsages/UsagesTester.java
+++ b/integration/intellij/src/test/java/ai/vespa/intellij/findUsages/UsagesTester.java
@@ -30,7 +30,9 @@ class UsagesTester {
     }
 
     List<UsageInfo> assertFunctionUsages(String explanation, int expectedUsages, String profileName, String functionName) {
-        var function = schema.rankProfiles().get(profileName).definedFunctions().get(functionName).get(0).definition();
+        var profile = schema.rankProfiles().get(profileName);
+        var functions = profile.definedFunctions().get(functionName);
+        var function = functions.get(0).definition();
         findUsages(function);
         assertEquals(explanation, expectedUsages, usageProcessor.usages.size());
         return usageProcessor.usages;
-- 
cgit v1.2.3