From 0d35338ba16fa7c7b081df9a629cbb6f61639141 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 14 Feb 2022 10:47:31 +0100 Subject: More usages tests --- .../intellij/src/test/applications/rankprofilemodularity/test.sd | 2 +- .../rankprofilemodularity/test/outside_schema1.profile | 4 ++-- .../intellij/src/test/java/ai/vespa/intellij/PluginTestBase.java | 3 +++ .../test/java/ai/vespa/intellij/findUsages/FindUsagesTest.java | 8 +++++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/integration/intellij/src/test/applications/rankprofilemodularity/test.sd b/integration/intellij/src/test/applications/rankprofilemodularity/test.sd index 17ee9f57ad6..20b571cbba5 100644 --- a/integration/intellij/src/test/applications/rankprofilemodularity/test.sd +++ b/integration/intellij/src/test/applications/rankprofilemodularity/test.sd @@ -62,7 +62,7 @@ schema test { } first-phase { - expression: f2 + expression: f2 + fo2 } } diff --git a/integration/intellij/src/test/applications/rankprofilemodularity/test/outside_schema1.profile b/integration/intellij/src/test/applications/rankprofilemodularity/test/outside_schema1.profile index 388ec4155cd..de1dc012dea 100644 --- a/integration/intellij/src/test/applications/rankprofilemodularity/test/outside_schema1.profile +++ b/integration/intellij/src/test/applications/rankprofilemodularity/test/outside_schema1.profile @@ -5,7 +5,7 @@ rank-profile outside_schema1 inherits in_schema1 { } function local1() { - expression: local2 + local3 + expression: local2 + local3 + local2 } function local2() { @@ -13,7 +13,7 @@ rank-profile outside_schema1 inherits in_schema1 { } function local3() { - expression: local2 + expression: local2 + local2 } } \ No newline at end of file diff --git a/integration/intellij/src/test/java/ai/vespa/intellij/PluginTestBase.java b/integration/intellij/src/test/java/ai/vespa/intellij/PluginTestBase.java index 9407e6794c0..32f24805c07 100644 --- a/integration/intellij/src/test/java/ai/vespa/intellij/PluginTestBase.java +++ b/integration/intellij/src/test/java/ai/vespa/intellij/PluginTestBase.java @@ -8,6 +8,9 @@ import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; /** * Parent of unit tests. This is an antipattern, but mandated by IntelliJ. * + * NOTE: Sometimes, unit tests will stop working with IntelliJ-interna. exceptions. To fix this, + * run the first step of "File -> Repair IDE": "Refresh indexable files" + * * @author bratseth */ public class PluginTestBase extends LightJavaCodeInsightFixtureTestCase { 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 0906ee7a96d..48c05c3ff00 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 @@ -24,7 +24,13 @@ public class FindUsagesTest extends PluginTestBase { public void testFindUsages() { useDir("src/test/applications/rankprofilemodularity"); var tester = new UsagesTester("test.sd", getProject()); - tester.assertFunctionUsages("2 local references", 2, "in_schema2", "ff1"); + tester.assertFunctionUsages("0 refs", 0, "in_schema1", "tensorFunction"); + tester.assertFunctionUsages("1 local refs + 2 refs in child", 3, "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 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"); } private static class UsagesTester { -- cgit v1.2.3