Find usages correctly

3 files changed, 30 insertions, 17 deletions

diff --git a/integration/intellij/src/test/applications/rankprofilemodularity/test.sd b/integration/intellij/src/test/applications/rankprofilemodularity/test.sd
index af08815dcba..05901b4de6a 100644
--- a/integration/intellij/src/test/applications/rankprofilemodularity/test.sd
+++ b/integration/intellij/src/test/applications/rankprofilemodularity/test.sd
@@ -67,17 +67,16 @@ schema test {
 
     }
 
-#    rank-profile in_schema4 {
-#
-#        function f2() {
-#            expression: fieldMatch(title)
-#        }
-#
-#        first-phase {
-#            expression: f2
-#        }
+    rank-profile in_schema4 {
 
-    }
+        function f2() {
+            expression: fieldMatch(title)
+        }
 
+        first-phase {
+            expression: f2
+        }
+
+    }
 
 }
\ No newline at end of file
diff --git a/integration/intellij/src/test/java/ai/vespa/intellij/findUsages/FindUsagesTest.java b/integration/intellij/src/test/java/ai/vespa/intellij/findUsages/FindUsagesTest.java
index 70df63320b1..c0ddb79606b 100644
--- a/integration/intellij/src/test/java/ai/vespa/intellij/findUsages/FindUsagesTest.java
+++ b/integration/intellij/src/test/java/ai/vespa/intellij/findUsages/FindUsagesTest.java
@@ -21,17 +21,29 @@ import java.util.List;
 public class FindUsagesTest extends PluginTestBase {
 
     @Test
+    public void testTmp() {
+        useDir("src/test/applications/rankprofilemodularity");
+        var tester = new UsagesTester("test.sd", getProject());
+        tester.assertFunctionUsages("3 references in parent schema", 3, "outside_schema2", "fo2");
+    }
+
+    @Test
+    public void testTmp2() {
+        useDir("src/test/applications/rankprofilemodularity");
+        var tester = new UsagesTester("test.sd", getProject());
+    }
+
+    @Test
     public void testFindUsages() {
         useDir("src/test/applications/rankprofilemodularity");
         var tester = new UsagesTester("test.sd", getProject());
         tester.assertFunctionUsages("0 refs",       0, "in_schema1", "tensorFunction");
-        tester.assertFunctionUsages("1 local refs + 2 refs in child",  3, "in_schema2", "f2");
+        tester.assertFunctionUsages("1 local ref in first-phase",  1, "in_schema2", "f2");
         tester.assertFunctionUsages("2 local refs", 2, "in_schema2", "ff1");
-        tester.assertFunctionUsages("2 local refs + 1 ref in parent", 3, "in_schema3", "f2");
-        //tester.assertFunctionUsages("1 local ref", 1, "in_schema4", "f2");
-        //tester.assertFunctionUsages("1 local reference ", 1, "outside_schema1", "local1");
-        //tester.assertFunctionUsages("4 local references", 4, "outside_schema1", "local2");
-        //tester.assertFunctionUsages("3 references in parent schema", 3, "outside_schema2", "fo2");
+        tester.assertFunctionUsages("1 local ref", 1, "in_schema4", "f2");
+        tester.assertFunctionUsages("1 local refa", 1, "outside_schema1", "local1");
+        tester.assertFunctionUsages("4 local refs", 4, "outside_schema1", "local2");
+        tester.assertFunctionUsages("3 refs in parent schema", 3, "outside_schema2", "fo2");
     }
 
     private static class UsagesTester {
diff --git a/integration/intellij/src/test/java/ai/vespa/intellij/model/SchemaTest.java b/integration/intellij/src/test/java/ai/vespa/intellij/model/SchemaTest.java
index 420c441d302..fb71e701411 100644
--- a/integration/intellij/src/test/java/ai/vespa/intellij/model/SchemaTest.java
+++ b/integration/intellij/src/test/java/ai/vespa/intellij/model/SchemaTest.java
@@ -52,12 +52,14 @@ public class SchemaTest extends PluginTestBase {
         assertEquals("outside_schema1", profile.inherited().get("outside_schema1").name());
         assertEquals("outside_schema2", profile.inherited().get("outside_schema2").name());
         schema.functions().entrySet().stream().forEach(e -> System.out.println(e));
-        assertEquals(8, schema.functions().size());
+        assertEquals("8 proper functions + first-phase", 9, schema.functions().size());
         assertEquals(schema.rankProfiles().get("in_schema2").definedFunctions().get("ff1"),
                      schema.functions().get("ff1"));
         assertEquals(schema.rankProfiles().get("outside_schema1").definedFunctions().get("local1"),
                      schema.functions().get("local1"));
         assertEquals(4, schema.rankProfiles().get("outside_schema1").definedFunctions().size());
+        assertEquals(1, schema.rankProfiles().get("in_schema1").children().size());
+        assertEquals(4, schema.rankProfiles().get("outside_schema2").children().size());
     }
 
 }