From 5c0aad66d8339b8fbf60617a5fe4c06bec1803b4 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Wed, 8 Jun 2016 16:38:19 +0300 Subject: [PATCH] disable fork mode if module was chosen successfully (cherry picked from commit 180cac8) --- .../junit/testDiscovery/JUnitTestDiscoveryConfiguration.java | 2 +- .../testDiscovery/TestNGTestDiscoveryConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/junit/src/com/intellij/execution/junit/testDiscovery/JUnitTestDiscoveryConfiguration.java b/plugins/junit/src/com/intellij/execution/junit/testDiscovery/JUnitTestDiscoveryConfiguration.java index dddbc7f1e081..68e28874c08d 100644 --- a/plugins/junit/src/com/intellij/execution/junit/testDiscovery/JUnitTestDiscoveryConfiguration.java +++ b/plugins/junit/src/com/intellij/execution/junit/testDiscovery/JUnitTestDiscoveryConfiguration.java @@ -75,7 +75,7 @@ public class JUnitTestDiscoveryConfiguration extends TestDiscoveryConfiguration @Override protected boolean forkPerModule() { - return spansMultipleModules(""); + return getConfigurationModule().getModule() == null; } @Override diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/testDiscovery/TestNGTestDiscoveryConfiguration.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/testDiscovery/TestNGTestDiscoveryConfiguration.java index 9ecb0d556213..0b89cbca9a68 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/testDiscovery/TestNGTestDiscoveryConfiguration.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/testDiscovery/TestNGTestDiscoveryConfiguration.java @@ -75,7 +75,7 @@ public class TestNGTestDiscoveryConfiguration extends TestDiscoveryConfiguration @Override protected boolean forkPerModule() { - return spansMultipleModules(""); + return getConfigurationModule().getModule() == null; } @Override