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

[junit] pass "junit.jupiter.conditions.deactivate" as vm option

Browse Source 
GitOrigin-RevId: 21ed0316af02e4daf878203a054e956ea97e676c
This commit is contained in:
Anna Kozlova
2022-07-20 09:24:52 +00:00
committed by intellij-monorepo-bot
parent 9d50130bbf
commit 39c63978a4
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/junit/src/com/intellij/execution/junit/TestObject.java
+1 -2
View File
@@ -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);
}
}
}
plugins/junit5_rt_tests/test/com/intellij/junit5/JUnit5AcceptanceTest.java
+3 -3
View File
@@ -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