From 36f36a372816f00fc023dcb19c2f2e4c5fc75978 Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 7 Dec 2010 14:24:41 +0300 Subject: [PATCH] set generated name for testng suite configuration (IDEA-62539) --- .../TestNGSuiteConfigurationProducer.java | 1 + .../com/theoryinpractice/testng/model/TestData.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGSuiteConfigurationProducer.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGSuiteConfigurationProducer.java index b8639a198be1..6a3dc60994f6 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGSuiteConfigurationProducer.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGSuiteConfigurationProducer.java @@ -58,6 +58,7 @@ public class TestNGSuiteConfigurationProducer extends TestNGConfigurationProduce configuration.getPersistantData().SUITE_NAME = virtualFile.getPath(); configuration.getPersistantData().TEST_OBJECT = TestType.SUITE.getType(); configuration.restoreOriginalModule(originalModule); + configuration.setGeneratedName(); settings.setName(configuration.getName()); RunConfigurationExtension.patchCreatedConfiguration(configuration); return settings; diff --git a/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java b/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java index bb147801ae18..d45ffe87e196 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java +++ b/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java @@ -184,8 +184,15 @@ public class TestData implements Cloneable if (TestType.PACKAGE.getType().equals(TEST_OBJECT)) if (getPackageName().length() == 0) return ""; else return getPackageName(); String name = JavaExecutionUtil.getPresentableClassName(getMainClassName(), runconfigurationmodule); - if (TestType.METHOD.getType().equals(TEST_OBJECT)) return name + '.' + getMethodName(); - else return name; + if (TestType.METHOD.getType().equals(TEST_OBJECT)) { + return name + '.' + getMethodName(); + } + else if (TestType.SUITE.getType().equals(TEST_OBJECT)) { + return getSuiteName(); + } + else { + return name; + } } public String getMainClassName() {