From 8d987d75ff7dbc6f332566b2e308cfa7f4401ca8 Mon Sep 17 00:00:00 2001 From: Nikita Katkov Date: Fri, 14 Mar 2025 01:02:50 +0100 Subject: [PATCH] [json + remdev] IJPL-176240 Update test data path GitOrigin-RevId: 9b6b98b1b9a9c98631801f24df0bd0f7463d3251 --- .../test/com/intellij/json/JsonParsingTest.java | 2 +- .../tests/test/com/intellij/json/JsonTestCase.java | 4 ++-- .../com/intellij/json/json5/Json5ParsingTest.java | 2 +- .../jsonSchema/JsonSchemaHeavyAbstractTest.java | 6 +++--- .../jsonSchema/JsonSchemaHighlightingTest.java | 2 +- .../JsonSchemaReSharperHighlightingTest.java | 2 +- .../jsonSchema/fixes/JsonSchemaQuickFixTestBase.java | 2 +- .../jsonSchema/impl/JsonSchemaReadTest.java | 12 ++++++------ .../v2/JsonSchemaObjectReadingMergingTest.kt | 4 ++-- .../test/com/intellij/jsonpath/JsonPathTestUtils.kt | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/json/backend/tests/test/com/intellij/json/JsonParsingTest.java b/json/backend/tests/test/com/intellij/json/JsonParsingTest.java index b257a04cbe18..ff6f1616b259 100644 --- a/json/backend/tests/test/com/intellij/json/JsonParsingTest.java +++ b/json/backend/tests/test/com/intellij/json/JsonParsingTest.java @@ -15,7 +15,7 @@ public class JsonParsingTest extends ParsingTestCase { @Override protected String getTestDataPath() { - return PlatformTestUtil.getCommunityPath() + "/json/tests/testData"; + return PlatformTestUtil.getCommunityPath() + "/json/backend/tests/testData"; } private void doTest() { diff --git a/json/backend/tests/test/com/intellij/json/JsonTestCase.java b/json/backend/tests/test/com/intellij/json/JsonTestCase.java index 184a38cf09ed..847a822ae701 100644 --- a/json/backend/tests/test/com/intellij/json/JsonTestCase.java +++ b/json/backend/tests/test/com/intellij/json/JsonTestCase.java @@ -45,8 +45,8 @@ public abstract class JsonTestCase extends BasePlatformTestCase { String communityPath = PlatformTestUtil.getCommunityPath(); String homePath = IdeaTestExecutionPolicy.getHomePathWithPolicy(); if (communityPath.startsWith(homePath)) { - return communityPath.substring(homePath.length()) + "/json/tests/testData"; + return communityPath.substring(homePath.length()) + "/json/backend/tests/testData"; } - return "/json/tests/testData"; + return "/json/backend/tests/testData"; } } \ No newline at end of file diff --git a/json/backend/tests/test/com/intellij/json/json5/Json5ParsingTest.java b/json/backend/tests/test/com/intellij/json/json5/Json5ParsingTest.java index a3fe4b9550c7..056811c5fa90 100644 --- a/json/backend/tests/test/com/intellij/json/json5/Json5ParsingTest.java +++ b/json/backend/tests/test/com/intellij/json/json5/Json5ParsingTest.java @@ -14,7 +14,7 @@ public class Json5ParsingTest extends ParsingTestCase { @Override protected String getTestDataPath() { - return PlatformTestUtil.getCommunityPath() + "/json/tests/testData"; + return PlatformTestUtil.getCommunityPath() + "/json/backend/tests/testData"; } private void doTest() { diff --git a/json/backend/tests/test/com/jetbrains/jsonSchema/JsonSchemaHeavyAbstractTest.java b/json/backend/tests/test/com/jetbrains/jsonSchema/JsonSchemaHeavyAbstractTest.java index aba8b2cba275..9405b3ecf620 100644 --- a/json/backend/tests/test/com/jetbrains/jsonSchema/JsonSchemaHeavyAbstractTest.java +++ b/json/backend/tests/test/com/jetbrains/jsonSchema/JsonSchemaHeavyAbstractTest.java @@ -56,9 +56,9 @@ public abstract class JsonSchemaHeavyAbstractTest extends BasePlatformTestCase { public String getTestDataPath() { PathManagerEx.TestDataLookupStrategy strategy = PathManagerEx.guessTestDataLookupStrategy(); if (strategy.equals(PathManagerEx.TestDataLookupStrategy.COMMUNITY)) { - return PathManager.getHomePath() + "/json" + getBasePath() + "/"; + return PathManager.getHomePath() + "/json/backend" + getBasePath() + "/"; } - return PathManager.getHomePath() + "/community/json" + getBasePath() + "/"; + return PathManager.getHomePath() + "/community/json/backend" + getBasePath() + "/"; } public static @NotNull String getJsonSchemaTestDataFilePath(@NotNull String jsonSchemaRelativePath) { @@ -70,7 +70,7 @@ public abstract class JsonSchemaHeavyAbstractTest extends BasePlatformTestCase { else { prefix = PathManager.getHomePath() + "/community/json/"; } - return prefix + "/tests/testData/jsonSchema/" + jsonSchemaRelativePath; + return prefix + "backend/tests/testData/jsonSchema/" + jsonSchemaRelativePath; } @Override diff --git a/json/backend/tests/test/com/jetbrains/jsonSchema/JsonSchemaHighlightingTest.java b/json/backend/tests/test/com/jetbrains/jsonSchema/JsonSchemaHighlightingTest.java index 623f82fffaef..55e3eef1fae5 100644 --- a/json/backend/tests/test/com/jetbrains/jsonSchema/JsonSchemaHighlightingTest.java +++ b/json/backend/tests/test/com/jetbrains/jsonSchema/JsonSchemaHighlightingTest.java @@ -23,7 +23,7 @@ public class JsonSchemaHighlightingTest extends JsonSchemaHighlightingTestBase { @NotNull @Override protected String getTestDataPath() { - return PlatformTestUtil.getCommunityPath() + "/json/tests/testData/jsonSchema/highlighting"; + return PlatformTestUtil.getCommunityPath() + "/json/backend/tests/testData/jsonSchema/highlighting"; } @Override diff --git a/json/backend/tests/test/com/jetbrains/jsonSchema/JsonSchemaReSharperHighlightingTest.java b/json/backend/tests/test/com/jetbrains/jsonSchema/JsonSchemaReSharperHighlightingTest.java index 505fea1c9f5b..6701721df300 100644 --- a/json/backend/tests/test/com/jetbrains/jsonSchema/JsonSchemaReSharperHighlightingTest.java +++ b/json/backend/tests/test/com/jetbrains/jsonSchema/JsonSchemaReSharperHighlightingTest.java @@ -18,7 +18,7 @@ public class JsonSchemaReSharperHighlightingTest extends JsonSchemaHighlightingT @NotNull @Override protected String getTestDataPath() { - return PlatformTestUtil.getCommunityPath() + "/json/tests/testData/jsonSchema/highlighting/resharper"; + return PlatformTestUtil.getCommunityPath() + "/json/backend/tests/testData/jsonSchema/highlighting/resharper"; } @Override diff --git a/json/backend/tests/test/com/jetbrains/jsonSchema/fixes/JsonSchemaQuickFixTestBase.java b/json/backend/tests/test/com/jetbrains/jsonSchema/fixes/JsonSchemaQuickFixTestBase.java index 9c3550c5a925..76de3cff6c03 100644 --- a/json/backend/tests/test/com/jetbrains/jsonSchema/fixes/JsonSchemaQuickFixTestBase.java +++ b/json/backend/tests/test/com/jetbrains/jsonSchema/fixes/JsonSchemaQuickFixTestBase.java @@ -21,7 +21,7 @@ public abstract class JsonSchemaQuickFixTestBase extends JsonSchemaHighlightingT @Override protected String getTestDataPath() { - return PlatformTestUtil.getCommunityPath() + "/json/tests/testData/jsonSchema/highlighting"; + return PlatformTestUtil.getCommunityPath() + "/json/backend/tests/testData/jsonSchema/highlighting"; } protected void doTest(@Language("JSON") @NotNull String schema, @NotNull String text, String fixName, String afterFix) { diff --git a/json/backend/tests/test/com/jetbrains/jsonSchema/impl/JsonSchemaReadTest.java b/json/backend/tests/test/com/jetbrains/jsonSchema/impl/JsonSchemaReadTest.java index 98bad28d4ca5..c2713e4fb0e2 100644 --- a/json/backend/tests/test/com/jetbrains/jsonSchema/impl/JsonSchemaReadTest.java +++ b/json/backend/tests/test/com/jetbrains/jsonSchema/impl/JsonSchemaReadTest.java @@ -39,11 +39,11 @@ public class JsonSchemaReadTest extends BasePlatformTestCase { @NotNull @Override protected String getTestDataPath() { - return PlatformTestUtil.getCommunityPath() + "/json/tests/testData/jsonSchema"; + return PlatformTestUtil.getCommunityPath() + "/json/backend/tests/testData/jsonSchema"; } public void testReadSchemaItself() throws Exception { - final File file = new File(PlatformTestUtil.getCommunityPath(), "json/tests/testData/jsonSchema/schema.json"); + final File file = new File(PlatformTestUtil.getCommunityPath(), "json/backend/tests/testData/jsonSchema/schema.json"); final JsonSchemaObject read = getSchemaObject(file); Assert.assertEquals("http://json-schema.org/draft-04/schema", read.getId()); @@ -104,13 +104,13 @@ public class JsonSchemaReadTest extends BasePlatformTestCase { } public void testReadSchemaWithCustomTags() throws Exception { - final File file = new File(PlatformTestUtil.getCommunityPath(), "json/tests/testData/jsonSchema/withNotesCustomTag.json"); + final File file = new File(PlatformTestUtil.getCommunityPath(), "json/backend/tests/testData/jsonSchema/withNotesCustomTag.json"); final JsonSchemaObject read = getSchemaObject(file); Assert.assertNotNull(read.getDefinitionByName("common").getPropertyByName("id")); } public void testArrayItemsSchema() throws Exception { - final File file = new File(PlatformTestUtil.getCommunityPath(), "json/tests/testData/jsonSchema/arrayItemsSchema.json"); + final File file = new File(PlatformTestUtil.getCommunityPath(), "json/backend/tests/testData/jsonSchema/arrayItemsSchema.json"); final JsonSchemaObject read = getSchemaObject(file); Iterable iterable = () -> read.getPropertyNames(); var properties = StreamSupport.stream(iterable.spliterator(), false).toList(); @@ -135,11 +135,11 @@ public class JsonSchemaReadTest extends BasePlatformTestCase { } public void testReadSchemaWithWrongRequired() throws Exception { - doTestSchemaReadNotHung(new File(PlatformTestUtil.getCommunityPath(), "json/tests/testData/jsonSchema/WithWrongRequired.json")); + doTestSchemaReadNotHung(new File(PlatformTestUtil.getCommunityPath(), "json/backend/tests/testData/jsonSchema/WithWrongRequired.json")); } public void testReadSchemaWithWrongItems() throws Exception { - doTestSchemaReadNotHung(new File(PlatformTestUtil.getCommunityPath(), "json/tests/testData/jsonSchema/WithWrongItems.json")); + doTestSchemaReadNotHung(new File(PlatformTestUtil.getCommunityPath(), "json/backend/tests/testData/jsonSchema/WithWrongItems.json")); } public void testReadNestedSchemaObject() { diff --git a/json/backend/tests/test/com/jetbrains/jsonSchema/v2/JsonSchemaObjectReadingMergingTest.kt b/json/backend/tests/test/com/jetbrains/jsonSchema/v2/JsonSchemaObjectReadingMergingTest.kt index 55bdcac4692d..f3416cc86d7a 100644 --- a/json/backend/tests/test/com/jetbrains/jsonSchema/v2/JsonSchemaObjectReadingMergingTest.kt +++ b/json/backend/tests/test/com/jetbrains/jsonSchema/v2/JsonSchemaObjectReadingMergingTest.kt @@ -393,9 +393,9 @@ internal class JsonSchemaObjectReadingMergingTest : BasePlatformTestCase() { override fun getTestDataPath(): String { val strategy = PathManagerEx.guessTestDataLookupStrategy() if (strategy == TestDataLookupStrategy.COMMUNITY) { - return PathManager.getHomePath() + "/json/tests/testData/jsonSchema/v2" + return PathManager.getHomePath() + "/json/backend/tests/testData/jsonSchema/v2" } - return PathManager.getHomePath() + "/community/json/tests/testData/jsonSchema/v2" + return PathManager.getHomePath() + "/community/json/backend/tests/testData/jsonSchema/v2" } private fun propertyDependencySchema(): String { diff --git a/plugins/jsonpath/test/com/intellij/jsonpath/JsonPathTestUtils.kt b/plugins/jsonpath/test/com/intellij/jsonpath/JsonPathTestUtils.kt index 92ef09c1ba6a..3a155bed4a70 100644 --- a/plugins/jsonpath/test/com/intellij/jsonpath/JsonPathTestUtils.kt +++ b/plugins/jsonpath/test/com/intellij/jsonpath/JsonPathTestUtils.kt @@ -7,6 +7,6 @@ import com.intellij.testFramework.PlatformTestUtil abstract class JsonPathParsingTestCase(subFolder: String) : ParsingTestCase(subFolder, ".jsonpath", JsonPathParserDefinition()) { override fun getTestDataPath(): String { - return PlatformTestUtil.getCommunityPath() + "/json/tests/testData/jsonpath/parser" + return PlatformTestUtil.getCommunityPath() + "/json/backend/tests/testData/jsonpath/parser" } } \ No newline at end of file