From ace49828a9f2569a6fa9e9d6ab77fd09df43baa8 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Wed, 1 Feb 2012 11:03:56 +0400 Subject: [PATCH] junit/testng: restore abstract method name to run --- .../com/intellij/execution/junit/JUnitConfiguration.java | 8 ++++---- .../testng/configuration/TestNGConfiguration.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java index 469d4b64ed03..1665873b828b 100644 --- a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java +++ b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java @@ -363,13 +363,13 @@ public class JUnitConfiguration extends ModuleBasedConfiguration classes, PsiMethod method) { - Set patterns = new HashSet(); + myData.TEST_OBJECT = TEST_PATTERN; + final Set patterns = new HashSet(); + myData.METHOD_NAME = method.getName(); for (PsiClass pattern : classes) { - patterns.add(JavaExecutionUtil.getRuntimeQualifiedName(pattern)); + patterns.add(JavaExecutionUtil.getRuntimeQualifiedName(pattern) + "," + myData.METHOD_NAME); } myData.setPatterns(patterns); - myData.METHOD_NAME = method.getName(); - myData.TEST_OBJECT = TEST_PATTERN; setGeneratedName(); } diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java index 52bc39ee1adf..92a67174157c 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java @@ -261,13 +261,13 @@ public class TestNGConfiguration extends ModuleBasedConfiguration classes, PsiMethod method) { + data.TEST_OBJECT = TestType.PATTERN.getType(); + data.METHOD_NAME = method.getName(); Set patterns = new HashSet(); for (PsiClass pattern : classes) { - patterns.add(JavaExecutionUtil.getRuntimeQualifiedName(pattern)); + patterns.add(JavaExecutionUtil.getRuntimeQualifiedName(pattern) + "," + data.METHOD_NAME); } data.setPatterns(patterns); - data.METHOD_NAME = method.getName(); - data.TEST_OBJECT = TestType.PATTERN.getType(); setGeneratedName(); }