MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Java] Fix tests for VmOptionsCompletionContributor after moving standard options to VMOptionsService

Browse Source 
IDEA-359564

GitOrigin-RevId: 4bd63e837290a44009a4af4dd8973881c27e72ae
This commit is contained in:
Georgii Ustinov
2024-09-27 09:13:46 +00:00
committed by intellij-monorepo-bot
parent ed565f05a1
commit acbd648c20
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/vmOptions/VMOptionsServiceImpl.kt
+3 -1
View File
@@ -17,7 +17,9 @@ class VMOptionsServiceImpl : VMOptionsService {
companion object {
private val ourData: ConcurrentMap<String, CompletableFuture<JdkOptionsData>> = CollectionFactory.createConcurrentSoftValueMap()
private val STANDARD_OPTION_LIST : List<VMOption> = listOf(
@JvmStatic
@get:JvmName("getStandardOptionList")
val STANDARD_OPTION_LIST : List<VMOption> = listOf(
opt("ea", "enable assertions with specified granularity"),
opt("enableassertions", "enable assertions with specified granularity"),
opt("da", "disable assertions with specified granularity"),
java/java-tests/testSrc/com/intellij/execution/ui/VmOptionsCompletionContributorTest.java
+18 -14
View File
@@ -16,6 +16,7 @@ import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import javax.swing.*;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -25,8 +26,8 @@ public class VmOptionsCompletionContributorTest extends LightPlatformCodeInsight
configure("<caret>");
myFixture.completeBasic();
assertEquals(List.of("--add-exports", "--add-opens",
"-agentlib:", "-agentpath:", "-D", "-da", "-disableassertions", "-Djava.awt.headless",
"-dsa", "-Duser.dir", "-Duser.home", "-Duser.name", "-ea", "-enableassertions", "-esa",
"-agentlib:", "-agentpath:", "-D", "-da", "-disableassertions", "-disablesystemassertions","-Djava.awt.headless",
"-dsa", "-Duser.dir", "-Duser.home", "-Duser.name", "-ea", "-enableassertions", "-enablesystemassertions", "-esa",
"-javaagent:", "-Xmx", "-XX:"), myFixture.getLookupElementStrings());
checkPresentation(myFixture.getLookupElements()[0], "--add-exports|null/null");
checkPresentation(myFixture.getLookupElements()[2], "-agentlib:|null/null");
@@ -37,8 +38,8 @@ public class VmOptionsCompletionContributorTest extends LightPlatformCodeInsight
configure("-<caret>");
myFixture.completeBasic();
assertEquals(List.of("--add-exports", "--add-opens",
"-agentlib:", "-agentpath:", "-D", "-da", "-disableassertions", "-Djava.awt.headless",
"-dsa", "-Duser.dir", "-Duser.home", "-Duser.name", "-ea", "-enableassertions", "-esa",
"-agentlib:", "-agentpath:", "-D", "-da", "-disableassertions", "-disablesystemassertions", "-Djava.awt.headless",
"-dsa", "-Duser.dir", "-Duser.home", "-Duser.name", "-ea", "-enableassertions", "-enablesystemassertions","-esa",
"-javaagent:", "-Xmx", "-XX:"), myFixture.getLookupElementStrings());
checkPresentation(myFixture.getLookupElements()[0], "--add-exports|null/null");
checkPresentation(myFixture.getLookupElements()[2], "-agentlib:|null/null");
@@ -189,16 +190,19 @@ public class VmOptionsCompletionContributorTest extends LightPlatformCodeInsight
@Override
public CompletableFuture<JdkOptionsData> getOrComputeOptionsForJdk(@NotNull String javaHome) {
assertEquals("/my/jre", javaHome);
return CompletableFuture.completedFuture(new JdkOptionsData(List.of(
new VMOption("Flag", "bool", "true", VMOptionKind.Product, null, VMOptionVariant.XX, null),
new VMOption("MinusFlag", "bool", "false", VMOptionKind.Product, null, VMOptionVariant.XX, null),
new VMOption("Value", "uint", "10", VMOptionKind.Product, null, VMOptionVariant.XX, null),
new VMOption("Experimental", "uint", "10", VMOptionKind.Experimental, null, VMOptionVariant.XX, null),
new VMOption("Diagnostic", "uint", "20", VMOptionKind.Diagnostic, null, VMOptionVariant.XX, null),
new VMOption("mx", null, null, VMOptionKind.Product, null, VMOptionVariant.X, null),
new VMOption("add-exports", null, null, VMOptionKind.Product, null, VMOptionVariant.DASH_DASH, null),
new VMOption("add-opens", null, null, VMOptionKind.Product, null, VMOptionVariant.DASH_DASH, null)
)));
List<VMOption> vmOptionList = new ArrayList<>(VMOptionsServiceImpl.getStandardOptionList());
vmOptionList.addAll(List.of(
new VMOption("Flag", "bool", "true", VMOptionKind.Product, null, VMOptionVariant.XX, null),
new VMOption("MinusFlag", "bool", "false", VMOptionKind.Product, null, VMOptionVariant.XX, null),
new VMOption("Value", "uint", "10", VMOptionKind.Product, null, VMOptionVariant.XX, null),
new VMOption("Experimental", "uint", "10", VMOptionKind.Experimental, null, VMOptionVariant.XX, null),
new VMOption("Diagnostic", "uint", "20", VMOptionKind.Diagnostic, null, VMOptionVariant.XX, null),
new VMOption("mx", null, null, VMOptionKind.Product, null, VMOptionVariant.X, null),
new VMOption("add-exports", null, null, VMOptionKind.Product, null, VMOptionVariant.DASH_DASH, null),
new VMOption("add-opens", null, null, VMOptionKind.Product, null, VMOptionVariant.DASH_DASH, null)
)
);
return CompletableFuture.completedFuture(new JdkOptionsData(vmOptionList));
}
}
}