MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 04:51:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix tests, revert some more of configuration naming behavior changes

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-07-26 21:16:40 +02:00
parent 45e25279a5
commit f57956a515
5 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-tests/testSrc/com/intellij/execution/actions/BaseRunConfigurationActionTest.java
View File

@@ -16,6 +16,7 @@ public class BaseRunConfigurationActionTest extends LightIdeaTestCase {
checkSuggestedName("AClass.main()", configuration);
configuration.setName("Other name");
configuration.setNameChangedByUser(true);
checkSuggestedName("Other name", configuration);
configuration.setName("1234567890123456789012345 other long name");
@@ -35,6 +36,7 @@ public class BaseRunConfigurationActionTest extends LightIdeaTestCase {
checkSuggestedName("ATestClass", configuration);
configuration.setName("Other name");
configuration.setNameChangedByUser(true);
checkSuggestedName("Other name", configuration);
data.METHOD_NAME = "testSmth";

18
java/java-tests/testSrc/com/intellij/execution/actions/ContextConfigurationTest.java
View File

@@ -40,7 +40,7 @@ public class ContextConfigurationTest extends BaseConfigurationTestCase {
checkClassName(CLASS_NAME, configuration);
checkMethodName(METHOD_NAME, configuration);
checkPackage(PACKAGE_NAME, configuration);
checkGeneratedName(configuration, METHOD_NAME + "()");
checkGeneretedName(configuration, SHORT_CLASS_NAME + "." + METHOD_NAME);
}
public void testJUnitClassTest() {
@@ -50,7 +50,7 @@ public class ContextConfigurationTest extends BaseConfigurationTestCase {
checkTestObject(JUnitConfiguration.TEST_CLASS, configuration);
checkClassName(CLASS_NAME, configuration);
checkPackage(PACKAGE_NAME, configuration);
checkGeneratedName(configuration, SHORT_CLASS_NAME);
checkGeneretedName(configuration, SHORT_CLASS_NAME);
}
@@ -78,7 +78,7 @@ public class ContextConfigurationTest extends BaseConfigurationTestCase {
JUnitConfiguration configuration = createJUnitConfiguration(psiPackage, AllInPackageConfigurationProducer.class, dataContext);
checkTestObject(JUnitConfiguration.TEST_PACKAGE, configuration);
checkPackage(PACKAGE_NAME, configuration);
checkGeneratedName(configuration, "Tests in '" + PACKAGE_NAME + "'");
checkGeneretedName(configuration, PACKAGE_NAME + " in " + module.getName());
}
public void testJUnitDefaultPackage() {
@@ -91,7 +91,7 @@ public class ContextConfigurationTest extends BaseConfigurationTestCase {
JUnitConfiguration configuration = createJUnitConfiguration(defaultPackage, AllInPackageConfigurationProducer.class, dataContext);
checkTestObject(JUnitConfiguration.TEST_PACKAGE, configuration);
checkPackage("", configuration);
checkGeneratedName(configuration, "All Tests");
checkGeneretedName(configuration, "All in " + module.getName());
}
public void testApplication() {
@@ -134,9 +134,9 @@ public class ContextConfigurationTest extends BaseConfigurationTestCase {
JUnitConfiguration.Data data = configuration.getPersistentData();
data.PACKAGE_NAME = psiPackage.getQualifiedName();
data.TEST_OBJECT = JUnitConfiguration.TEST_PACKAGE;
assertEquals("Tests in '" + PACKAGE_NAME + "'", configuration.suggestedName());
assertEquals(PACKAGE_NAME, configuration.suggestedName());
data.PACKAGE_NAME = "not.existing.pkg";
assertEquals("Tests in 'not.existing.pkg'", configuration.suggestedName());
assertEquals("not.existing.pkg", configuration.suggestedName());
data.TEST_OBJECT = JUnitConfiguration.TEST_CLASS;
data.MAIN_CLASS_NAME = psiClass.getQualifiedName();
@@ -151,12 +151,12 @@ public class ContextConfigurationTest extends BaseConfigurationTestCase {
data.TEST_OBJECT = JUnitConfiguration.TEST_METHOD;
data.MAIN_CLASS_NAME = psiClass.getQualifiedName();
data.METHOD_NAME = METHOD_NAME;
assertEquals(METHOD_NAME + "()", configuration.suggestedName());
assertEquals(SHORT_CLASS_NAME + "." + METHOD_NAME, configuration.suggestedName());
data.MAIN_CLASS_NAME = "not.existing.TestClass";
assertEquals(METHOD_NAME + "()", configuration.suggestedName());
assertEquals("TestClass." + METHOD_NAME, configuration.suggestedName());
}
private static void checkGeneratedName(JUnitConfiguration configuration, String name) {
private static void checkGeneretedName(JUnitConfiguration configuration, String name) {
assertEquals(configuration.suggestedName(), configuration.getName());
assertEquals(name, configuration.getName());
}