From 39c63978a4b74afbefc0b3e0fe9c8d79d18bf04a Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 19 Jul 2022 20:37:47 +0200
Subject: [PATCH] [junit] pass "junit.jupiter.conditions.deactivate" as vm
 option

GitOrigin-RevId: 21ed0316af02e4daf878203a054e956ea97e676c
---
 .../junit/src/com/intellij/execution/junit/TestObject.java  | 3 +--
 .../test/com/intellij/junit5/JUnit5AcceptanceTest.java      | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
index 21749e149dfe..ba139335520e 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
@@ -1,7 +1,6 @@
 // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.intellij.execution.junit;
 
-import com.intellij.codeInsight.MetaAnnotationUtil;
 import com.intellij.codeInsight.TestFrameworks;
 import com.intellij.execution.*;
 import com.intellij.execution.configurations.*;
@@ -569,7 +568,7 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
         return DisabledConditionUtil.getDisabledConditionValue(myConfiguration);
       }).executeSynchronously();
       if (disabledCondition != null) {
-        javaParameters.getProgramParametersList().add("-Djunit.jupiter.conditions.deactivate=" + disabledCondition);
+        javaParameters.getVMParametersList().add("-Djunit.jupiter.conditions.deactivate=" + disabledCondition);
       }
     }
   }
diff --git a/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5AcceptanceTest.java b/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5AcceptanceTest.java
index d128b2d425e7..d53070076a23 100644
--- a/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5AcceptanceTest.java
+++ b/plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5AcceptanceTest.java
@@ -102,7 +102,7 @@ public class JUnit5AcceptanceTest extends JUnit5CodeInsightTest {
     JUnitConfiguration configuration = new JUnitConfiguration("", myFixture.getProject());
     configuration.beClassConfiguration(aClass);
     JavaParameters parameters = configuration.getTestObject().createJavaParameters4Tests();
-    assertTrue(parameters.getProgramParametersList().hasParameter("-Djunit.jupiter.conditions.deactivate=org.junit.*DisabledCondition"));
+    assertTrue(parameters.getVMParametersList().hasParameter("-Djunit.jupiter.conditions.deactivate=org.junit.*DisabledCondition"));
   }
 
   @Test
@@ -123,7 +123,7 @@ public class JUnit5AcceptanceTest extends JUnit5CodeInsightTest {
     JUnitConfiguration configuration = new JUnitConfiguration("", myFixture.getProject());
     configuration.beClassConfiguration(aClass);
     JavaParameters parameters = configuration.getTestObject().createJavaParameters4Tests();
-    assertTrue(parameters.getProgramParametersList().hasParameter("-Djunit.jupiter.conditions.deactivate=org.junit.*DisabledCondition"));
+    assertTrue(parameters.getVMParametersList().hasParameter("-Djunit.jupiter.conditions.deactivate=org.junit.*DisabledCondition"));
   }
 
   @Test
@@ -142,7 +142,7 @@ public class JUnit5AcceptanceTest extends JUnit5CodeInsightTest {
     @SuppressWarnings("OptionalGetWithoutIsPresent") PsiMethod method = Arrays.stream(aClass.getMethods()).findFirst().get();
     configuration.beMethodConfiguration(MethodLocation.elementInClass(method, aClass));
     JavaParameters parameters = configuration.getTestObject().createJavaParameters4Tests();
-    assertTrue(parameters.getProgramParametersList().hasParameter("-Djunit.jupiter.conditions.deactivate=org.junit.*DisabledCondition"));
+    assertTrue(parameters.getVMParametersList().hasParameter("-Djunit.jupiter.conditions.deactivate=org.junit.*DisabledCondition"));
   }
 
   @Test