MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-05 01:50:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-rd] IDEA-322563 fix test regressions

Browse Source 
- adjust path for Community
- delete outdated test
- Rewrite logic for mix tests

GitOrigin-RevId: 6e9e149bb715096f1e87eef7d831e29411f1bba4
This commit is contained in:
Mikhail Pyltsin
2023-09-22 12:14:18 +02:00
committed by intellij-monorepo-bot
parent 356d499450
commit c8d4c1842f
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-frontback-tests/testSrc/com/intellij/PathJavaTestUtil.java
View File

@@ -5,6 +5,10 @@ import com.intellij.openapi.application.ex.PathManagerEx;
public final class PathJavaTestUtil {
public static String getCommunityJavaTestDataPath() {
return PathManagerEx.getTestDataPath();
PathManagerEx.TestDataLookupStrategy strategy = PathManagerEx.guessTestDataLookupStrategy();
if (strategy == PathManagerEx.TestDataLookupStrategy.ULTIMATE) {
strategy = PathManagerEx.TestDataLookupStrategy.COMMUNITY_FROM_ULTIMATE;
}
return PathManagerEx.getTestDataPath(strategy);
}
}

4
java/java-frontback-tests/testSrc/com/intellij/java/parser/AbstractBasicJavaParsingTestCase.java
View File

@@ -1,10 +1,10 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.java.parser;
import com.intellij.PathJavaTestUtil;
import com.intellij.lang.Language;
import com.intellij.lang.LanguageExtension;
import com.intellij.lang.PsiBuilder;
import com.intellij.openapi.application.ex.PathManagerEx;
import com.intellij.platform.backend.workspace.WorkspaceModelTopics;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.PsiFile;
@@ -39,7 +39,7 @@ public abstract class AbstractBasicJavaParsingTestCase extends ParsingTestCase {
@Override
protected String getTestDataPath() {
return PathManagerEx.getTestDataPath(PathManagerEx.TestDataLookupStrategy.COMMUNITY_FROM_ULTIMATE);
return PathJavaTestUtil.getCommunityJavaTestDataPath();
}
public final <T> void addExplicit(@NotNull LanguageExtension<T> collector, @NotNull Language language, @NotNull T object) {

2
java/java-frontback-tests/testSrc/com/intellij/java/parser/statementParsing/AbstractBasicSwitchParsingTest.java
View File

@@ -11,8 +11,6 @@ public abstract class AbstractBasicSwitchParsingTest extends AbstractBasicJavaPa
}
public void testNormal() { doTest(true); }
public void testNormalManyWhen() { doTest(true); }
public void testUncomplete1() { doTest(true); }
public void testUncomplete2() { doTest(true); }