From eb141b5ca2eb82e98372b9cb401b09c83ea73774 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 26 Jul 2013 13:29:35 +0200
Subject: [PATCH] keep track of whether the name of a run configuration was
 changed by the user on the platform level; introduce
 LocatableConfigurationBase class for this purpose; deprecate
 getGeneratedName() and replace its usages with suggestedName(); delete
 implementations of isGeneratedName() which are now redundant

---
 .../execution/applet/AppletConfiguration.java | 14 +---
 .../applet/AppletConfigurationProducer.java   |  2 +-
 .../application/ApplicationConfiguration.java | 25 +-----
 .../ApplicationConfigurationProducer.java     |  2 +-
 .../actions/ContextConfigurationTest.java     | 34 ++++-----
 .../LocatableConfiguration.java               | 21 ++++-
 .../LocatableConfigurationBase.java           | 76 +++++++++++++++++++
 .../configurations/RuntimeConfiguration.java  | 21 +----
 .../junit/RuntimeConfigurationProducer.java   |  6 --
 .../execution/impl/RunConfigurable.java       |  2 +-
 .../impl/SingleConfigurationConfigurable.java | 21 ++++-
 .../execution/junit/JUnitConfiguration.java   | 13 ----
 .../intellij/execution/junit/TestClass.java   |  6 +-
 .../intellij/execution/junit/TestPackage.java |  4 -
 .../configuration/TestNGConfiguration.java    | 13 ----
 .../testng/model/TestData.java                | 31 --------
 16 files changed, 142 insertions(+), 149 deletions(-)
 create mode 100644 platform/lang-api/src/com/intellij/execution/configurations/LocatableConfigurationBase.java

diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java b/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java
index a1a89dcb4710..2dc64aad366f 100644
--- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfiguration.java
@@ -205,11 +205,6 @@ public class AppletConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
     }
   }
 
-  public String getGeneratedName() {
-    if (MAIN_CLASS_NAME == null) return null;
-    return JavaExecutionUtil.getPresentableClassName(MAIN_CLASS_NAME, getConfigurationModule());
-  }
-
   public RefactoringElementListener getRefactoringElementListener(final PsiElement element) {
     if (HTML_USED) return null;
     return RefactoringListeners.getClassOrPackageListener(element, new RefactoringListeners.SingleClassConfigurationAccessor(this));
@@ -219,15 +214,8 @@ public class AppletConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
     return getConfigurationModule().findClass(MAIN_CLASS_NAME);
   }
 
-  public void setGeneratedName() {
-    setName(getGeneratedName());
-  }
-
-  public boolean isGeneratedName() {
-    return Comparing.equal(getName(), getGeneratedName());
-  }
-
   public String suggestedName() {
+    if (MAIN_CLASS_NAME == null) return null;
     return ProgramRunnerUtil.shortenName(JavaExecutionUtil.getShortClassName(MAIN_CLASS_NAME), 0);
   }
 
diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationProducer.java b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationProducer.java
index 6401d8df6b12..8961236853d9 100644
--- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationProducer.java
+++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationProducer.java
@@ -62,7 +62,7 @@ public class AppletConfigurationProducer extends JavaRuntimeConfigurationProduce
     final AppletConfiguration configuration = (AppletConfiguration)settings.getConfiguration();
     configuration.MAIN_CLASS_NAME = JavaExecutionUtil.getRuntimeQualifiedName(myPsiClass);
     configuration.setModule(myPsiClass.isValid() ? ModuleUtilCore.findModuleForPsiElement(myPsiClass) : null);
-    configuration.setName(configuration.getGeneratedName());
+    configuration.setGeneratedName();
     return settings;
   }
 
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
index 8ddf5ba5fc34..a0b8fcb0f039 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
@@ -32,7 +32,6 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.options.SettingsEditorGroup;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.DefaultJDOMExternalizer;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.WriteExternalException;
@@ -95,19 +94,6 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     return group;
   }
 
-  @Override
-  @Nullable
-  public String getGeneratedName() {
-    if (MAIN_CLASS_NAME == null) {
-      return null;
-    }
-    return JavaExecutionUtil.getPresentableClassName(MAIN_CLASS_NAME, getConfigurationModule());
-  }
-
-  public void setGeneratedName() {
-    setName(getGeneratedName());
-  }
-
   public RefactoringElementListener getRefactoringElementListener(final PsiElement element) {
     final RefactoringElementListener listener = RefactoringListeners.
       getClassOrPackageListener(element, new RefactoringListeners.SingleClassConfigurationAccessor(this));
@@ -119,18 +105,11 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     return getConfigurationModule().findClass(MAIN_CLASS_NAME);
   }
 
-  public boolean isGeneratedName() {
-    if (MAIN_CLASS_NAME == null || MAIN_CLASS_NAME.length() == 0) {
-      return JavaExecutionUtil.isNewName(getName());
-    }
-    return Comparing.equal(getName(), getGeneratedName());
-  }
-
   public String suggestedName() {
     if (MAIN_CLASS_NAME == null || MAIN_CLASS_NAME.length() == 0) {
-      return getName();
+      return null;
     }
-    return ProgramRunnerUtil.shortenName(JavaExecutionUtil.getShortClassName(MAIN_CLASS_NAME), 6) + ".main()";
+    return ProgramRunnerUtil.shortenName(JavaExecutionUtil.getShortClassName(MAIN_CLASS_NAME), 6);
   }
 
   public void setMainClassName(final String qualifiedName) {
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationProducer.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationProducer.java
index 08d1ae9d940c..00261f05e0ca 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationProducer.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationProducer.java
@@ -69,7 +69,7 @@ public class ApplicationConfigurationProducer extends JavaRuntimeConfigurationPr
     RunnerAndConfigurationSettings settings = cloneTemplateConfiguration(project, context);
     final ApplicationConfiguration configuration = (ApplicationConfiguration)settings.getConfiguration();
     configuration.MAIN_CLASS_NAME = JavaExecutionUtil.getRuntimeQualifiedName(aClass);
-    configuration.setName(configuration.getGeneratedName());
+    configuration.setGeneratedName();
     setupConfigurationModule(context, configuration);
     JavaRunConfigurationExtensionManager.getInstance().extendCreatedConfiguration(configuration, location);
     return settings;
diff --git a/java/java-tests/testSrc/com/intellij/execution/actions/ContextConfigurationTest.java b/java/java-tests/testSrc/com/intellij/execution/actions/ContextConfigurationTest.java
index 73afb2a759ce..9e15cac1a7f3 100644
--- a/java/java-tests/testSrc/com/intellij/execution/actions/ContextConfigurationTest.java
+++ b/java/java-tests/testSrc/com/intellij/execution/actions/ContextConfigurationTest.java
@@ -40,7 +40,7 @@ public class ContextConfigurationTest extends BaseConfigurationTestCase {
     checkClassName(CLASS_NAME, configuration);
     checkMethodName(METHOD_NAME, configuration);
     checkPackage(PACKAGE_NAME, configuration);
-    checkGenaratedName(configuration, SHORT_CLASS_NAME + "." + METHOD_NAME);
+    checkGeneratedName(configuration, 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);
-    checkGenaratedName(configuration, SHORT_CLASS_NAME);
+    checkGeneratedName(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);
-    checkGenaratedName(configuration, PACKAGE_NAME + " in " + module.getName());
+    checkGeneratedName(configuration, "Tests in '" + PACKAGE_NAME + "'");
   }
 
   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);
-    checkGenaratedName(configuration, "All in " + module.getName());
+    checkGeneratedName(configuration, "All Tests");
   }
 
   public void testApplication() {
@@ -99,7 +99,7 @@ public class ContextConfigurationTest extends BaseConfigurationTestCase {
     PsiMethod psiMethod = psiClass.findMethodsByName("main", false)[0];
     ApplicationConfiguration configuration = createConfiguration(psiMethod);
     assertEquals(CLASS_NAME, configuration.MAIN_CLASS_NAME);
-    assertEquals(configuration.getGeneratedName(), configuration.getName());
+    assertEquals(configuration.suggestedName(), configuration.getName());
     assertEquals(SHORT_CLASS_NAME, configuration.getName());
   }
 
@@ -115,7 +115,7 @@ public class ContextConfigurationTest extends BaseConfigurationTestCase {
     context = createContext(psiClass);
     assertSame(testClass, context.findExisting());
 
-    runManager.setActiveConfiguration(testClass);
+    runManager.setSelectedConfiguration(testClass);
     context = createContext(psiPackage);
     assertEquals(null, context.findExisting());
     RunnerAndConfigurationSettings testPackage = context.getConfiguration();
@@ -123,7 +123,7 @@ public class ContextConfigurationTest extends BaseConfigurationTestCase {
     context = createContext(psiPackage);
     assertSame(testPackage, context.findExisting());
     assertSame(testClass, runManager.getSelectedConfiguration());
-    runManager.setActiveConfiguration(context.findExisting());
+    runManager.setSelectedConfiguration(context.findExisting());
     assertSame(testPackage, runManager.getSelectedConfiguration());
   }
 
@@ -134,30 +134,30 @@ public class ContextConfigurationTest extends BaseConfigurationTestCase {
     JUnitConfiguration.Data data = configuration.getPersistentData();
     data.PACKAGE_NAME = psiPackage.getQualifiedName();
     data.TEST_OBJECT = JUnitConfiguration.TEST_PACKAGE;
-    assertEquals(PACKAGE_NAME, configuration.getGeneratedName());
+    assertEquals("Tests in '" + PACKAGE_NAME + "'", configuration.suggestedName());
     data.PACKAGE_NAME = "not.existing.pkg";
-    assertEquals("not.existing.pkg", configuration.getGeneratedName());
+    assertEquals("Tests in 'not.existing.pkg'", configuration.suggestedName());
 
     data.TEST_OBJECT = JUnitConfiguration.TEST_CLASS;
     data.MAIN_CLASS_NAME = psiClass.getQualifiedName();
-    assertEquals(SHORT_CLASS_NAME, configuration.getGeneratedName());
+    assertEquals(SHORT_CLASS_NAME, configuration.suggestedName());
     data.MAIN_CLASS_NAME = "not.existing.TestClass";
-    assertEquals("TestClass", configuration.getGeneratedName());
+    assertEquals("TestClass", configuration.suggestedName());
     data.MAIN_CLASS_NAME = "pkg.TestClass.";
-    assertEquals("pkg.TestClass.", configuration.getGeneratedName());
+    assertEquals("pkg.TestClass.", configuration.suggestedName());
     data.MAIN_CLASS_NAME = "TestClass";
-    assertEquals("TestClass", configuration.getGeneratedName());
+    assertEquals("TestClass", configuration.suggestedName());
 
     data.TEST_OBJECT = JUnitConfiguration.TEST_METHOD;
     data.MAIN_CLASS_NAME = psiClass.getQualifiedName();
     data.METHOD_NAME = METHOD_NAME;
-    assertEquals(SHORT_CLASS_NAME + "." + METHOD_NAME, configuration.getGeneratedName());
+    assertEquals(METHOD_NAME + "()", configuration.suggestedName());
     data.MAIN_CLASS_NAME = "not.existing.TestClass";
-    assertEquals("TestClass." + METHOD_NAME, configuration.getGeneratedName());
+    assertEquals(METHOD_NAME + "()", configuration.suggestedName());
   }
 
-  private void checkGenaratedName(JUnitConfiguration configuration, String name) {
-    assertEquals(configuration.getGeneratedName(), configuration.getName());
+  private static void checkGeneratedName(JUnitConfiguration configuration, String name) {
+    assertEquals(configuration.suggestedName(), configuration.getName());
     assertEquals(name, configuration.getName());
   }
 }
diff --git a/platform/lang-api/src/com/intellij/execution/configurations/LocatableConfiguration.java b/platform/lang-api/src/com/intellij/execution/configurations/LocatableConfiguration.java
index f9cd2419fb3f..c56396d8e5df 100644
--- a/platform/lang-api/src/com/intellij/execution/configurations/LocatableConfiguration.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/LocatableConfiguration.java
@@ -16,12 +16,25 @@
 package com.intellij.execution.configurations;
 
 /**
- * User: anna
- * Date: Jan 24, 2005
+ * Base class for configurations that can be created from context (a location in a file) by implementations of
+ * {@link com.intellij.execution.junit.RuntimeConfigurationProducer}.
+ *
+ * @author anna
+ * @see LocatableConfigurationBase
  */
-public interface LocatableConfiguration extends RunProfile{
+public interface LocatableConfiguration extends RunProfile {
+  /**
+   * Checks if the current name for the run configuration was automatically generated.
+   *
+   * @return true if the name was generated by {@link #suggestedName()}, false if it was manually entered or changed by the user.
+   */
   boolean isGeneratedName();
 
+  /**
+   * Returns the default name for the run configuration based on its settings (such as the name of class or file to run).
+   *
+   * @return the suggested name for the configuration, or null if no name could be suggested based on the current settings (for example,
+   * the name of the file to run isn't yet specified).
+   */
   String suggestedName();
-
 }
diff --git a/platform/lang-api/src/com/intellij/execution/configurations/LocatableConfigurationBase.java b/platform/lang-api/src/com/intellij/execution/configurations/LocatableConfigurationBase.java
new file mode 100644
index 000000000000..ea31521f649b
--- /dev/null
+++ b/platform/lang-api/src/com/intellij/execution/configurations/LocatableConfigurationBase.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.execution.configurations;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.InvalidDataException;
+import com.intellij.openapi.util.WriteExternalException;
+import org.jdom.Element;
+
+/**
+ * @author yole
+ */
+public abstract class LocatableConfigurationBase extends RunConfigurationBase implements LocatableConfiguration {
+  private static final String ATTR_NAME_CHANGED_BY_USER = "nameChangedByUser";
+
+  protected LocatableConfigurationBase(Project project,
+                                       ConfigurationFactory factory, String name) {
+    super(project, factory, name);
+  }
+
+  private boolean myNameChangedByUser;
+
+  @Override
+  public boolean isGeneratedName() {
+    return suggestedName() != null && !myNameChangedByUser;
+  }
+
+  /**
+   * Renames the configuration to its suggested name.
+   */
+  public void setGeneratedName() {
+    setName(suggestedName());
+    myNameChangedByUser = false;
+  }
+
+  @Override
+  public String suggestedName() {
+    return null;
+  }
+
+  public void setNameChangedByUser(boolean nameChangedByUser) {
+    myNameChangedByUser = nameChangedByUser;
+  }
+
+  @Override
+  public void readExternal(Element element) throws InvalidDataException {
+    super.readExternal(element);
+    myNameChangedByUser = "true".equals(element.getAttributeValue(ATTR_NAME_CHANGED_BY_USER));
+  }
+
+  @Override
+  public void writeExternal(Element element) throws WriteExternalException {
+    super.writeExternal(element);
+    if (suggestedName() != null && myNameChangedByUser) {
+      element.setAttribute(ATTR_NAME_CHANGED_BY_USER, "true");
+    }
+  }
+
+  @Override
+  public void checkConfiguration() throws RuntimeConfigurationException {
+
+  }
+}
diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java b/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java
index fac1535f82f7..423c6f3bcbdd 100644
--- a/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java
@@ -19,11 +19,10 @@ package com.intellij.execution.configurations;
 import com.intellij.openapi.actionSystem.DataKey;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public abstract class RuntimeConfiguration extends RunConfigurationBase implements LocatableConfiguration, Cloneable, ModuleRunConfiguration {
+public abstract class RuntimeConfiguration extends LocatableConfigurationBase implements Cloneable, ModuleRunConfiguration {
   public static final DataKey<RuntimeConfiguration> DATA_KEY = DataKey.create("runtimeConfiguration");
 
   protected RuntimeConfiguration(final String name, final Project project, final ConfigurationFactory factory) {
@@ -36,26 +35,14 @@ public abstract class RuntimeConfiguration extends RunConfigurationBase implemen
     return Module.EMPTY_ARRAY;
   }
 
-  @Override
-  public void checkConfiguration() throws RuntimeConfigurationException {
-  }
-
-
   @Override
   public RuntimeConfiguration clone() {
     return (RuntimeConfiguration)super.clone();
   }
 
-  @Override
-  public boolean isGeneratedName() {
-    return false;
-  }
-
-  @Override
-  @NonNls public String suggestedName() {
-    return null;
-  }
-
+  /**
+   * @deprecated use {@link #suggestedName()} instead
+   */
   @Nullable
   public String getGeneratedName() {
     return suggestedName();
diff --git a/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java b/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java
index 91c6edff445a..a9ea99c0e3dd 100644
--- a/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java
+++ b/platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java
@@ -33,7 +33,6 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.HashSet;
 
 public abstract class RuntimeConfigurationProducer implements Comparable, Cloneable {
   public static final ExtensionPointName<RuntimeConfigurationProducer> RUNTIME_CONFIGURATION_PRODUCER = ExtensionPointName.create("com.intellij.configurationProducer");
@@ -202,11 +201,6 @@ public abstract class RuntimeConfigurationProducer implements Comparable, Clonea
       myConfig.checkConfiguration();
     }
 
-    @Override
-    public boolean isGeneratedName() {
-      return myConfig.isGeneratedName();
-    }
-
     @Override
     public String suggestedName() {
       return myConfig.suggestedName();
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
index 1a5d991ae700..0a6ce91e445c 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
@@ -445,7 +445,7 @@ class RunConfigurable extends BaseConfigurable {
           if (runtimeConfiguration.isGeneratedName() && !changed[0]) {
             try {
               final LocatableConfiguration snapshot = (LocatableConfiguration)editor.getSnapshot().getConfiguration();
-              final String generatedName = snapshot instanceof RuntimeConfiguration? ((RuntimeConfiguration)snapshot).getGeneratedName() : snapshot.suggestedName();
+              final String generatedName = snapshot.suggestedName();
               if (generatedName != null && generatedName.length() > 0) {
                 info.setNameText(generatedName);
                 changed[0] = false;
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java
index b94c0274e8ee..bf091fced193 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java
@@ -56,6 +56,7 @@ public final class SingleConfigurationConfigurable<Config extends RunConfigurati
   private boolean myStoreProjectConfiguration;
   private boolean mySingleton;
   private String myFolderName;
+  private boolean myChangingNameFromCode;
 
 
   private SingleConfigurationConfigurable(RunnerAndConfigurationSettings settings, @Nullable Executor executor) {
@@ -74,6 +75,12 @@ public final class SingleConfigurationConfigurable<Config extends RunConfigurati
       @Override
       public void textChanged(DocumentEvent event) {
         setModified(true);
+        if (!myChangingNameFromCode) {
+          RunConfiguration runConfiguration = getSettings().getConfiguration();
+          if (runConfiguration instanceof LocatableConfigurationBase) {
+            ((LocatableConfigurationBase) runConfiguration).setNameChangedByUser(true);
+          }
+        }
       }
     });
 
@@ -199,13 +206,19 @@ public final class SingleConfigurationConfigurable<Config extends RunConfigurati
   }
 
   public final void setNameText(final String name) {
+    myChangingNameFromCode = true;
     try {
-      if (!myNameDocument.getText(0, myNameDocument.getLength()).equals(name)) {
-        myNameDocument.replace(0, myNameDocument.getLength(), name, null);
+      try {
+        if (!myNameDocument.getText(0, myNameDocument.getLength()).equals(name)) {
+          myNameDocument.replace(0, myNameDocument.getLength(), name, null);
+        }
+      }
+      catch (BadLocationException e) {
+        LOG.error(e);
       }
     }
-    catch (BadLocationException e) {
-      LOG.error(e);
+    finally {
+      myChangingNameFromCode = false;
     }
   }
 
diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
index 440870e5c402..d6a1b0c86308 100644
--- a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
+++ b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
@@ -97,10 +97,6 @@ public class JUnitConfiguration extends ModuleBasedConfiguration<JavaRunConfigur
     return RunConfigurationExtension.wrapRefactoringElementListener(element, this, listener);
   }
 
-  public String getGeneratedName() {
-    return myData.getGeneratedName(getConfigurationModule());
-  }
-
   public void checkConfiguration() throws RuntimeConfigurationException {
     myData.getTestObject(getProject(), this).checkConfiguration();
     JavaRunConfigurationExtensionManager.checkConfigurationIsValid(this);
@@ -127,11 +123,6 @@ public class JUnitConfiguration extends ModuleBasedConfiguration<JavaRunConfigur
     return new JUnitConfiguration(getName(), getProject(), myData.clone(), JUnitConfigurationType.getInstance().getConfigurationFactories()[0]);// throw new RuntimeException("Should not call");
   }
 
-  public boolean isGeneratedName() {
-    final String name = getName();
-    return myData.isGeneratedName(name, getConfigurationModule());
-  }
-
   public String suggestedName() {
     return getTestObject().suggestActionName();
   }
@@ -216,10 +207,6 @@ public class JUnitConfiguration extends ModuleBasedConfiguration<JavaRunConfigur
     if (shouldUpdateName) setGeneratedName();
   }
 
-  public void setGeneratedName() {
-    setName(getGeneratedName());
-  }
-
   public void beMethodConfiguration(final Location<PsiMethod> methodLocation) {
     setModule(myData.setTestMethod(methodLocation));
     setGeneratedName();
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestClass.java b/plugins/junit/src/com/intellij/execution/junit/TestClass.java
index 048edb82c344..aefe6f014453 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestClass.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestClass.java
@@ -49,7 +49,11 @@ class TestClass extends TestObject {
   }
 
   public String suggestActionName() {
-    return ProgramRunnerUtil.shortenName(JavaExecutionUtil.getShortClassName(myConfiguration.getPersistentData().MAIN_CLASS_NAME), 0);
+    String name = myConfiguration.getPersistentData().MAIN_CLASS_NAME;
+    if (name != null && name.endsWith(".")) {
+      return ProgramRunnerUtil.shortenName(name, 0);
+    }
+    return ProgramRunnerUtil.shortenName(JavaExecutionUtil.getShortClassName(name), 0);
   }
 
   public RefactoringElementListener getListener(final PsiElement element, final JUnitConfiguration configuration) {
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestPackage.java b/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
index 6f0b13403213..e6c1574e5617 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
@@ -223,10 +223,6 @@ public class TestPackage extends TestObject {
   }
 
   public String suggestActionName() {
-    final String configurationName = myConfiguration.getName();
-    if (!myConfiguration.isGeneratedName()) {
-      return "'" + configurationName + "'";
-    }
     final JUnitConfiguration.Data data = myConfiguration.getPersistentData();
     if (data.getPackageName().trim().length() > 0) {
       return ExecutionBundle.message("test.in.scope.presentable.text", data.getPackageName());
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
index 1149207108c6..11351928a50f 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfiguration.java
@@ -146,11 +146,6 @@ public class TestNGConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
     return JavaRunConfigurationModule.getModulesForClass(getProject(), data.getMainClassName());
   }
 
-  @Override
-  public boolean isGeneratedName() {
-    return data.isGeneratedName(getName(), getConfigurationModule());
-  }
-
   @Override
   public String suggestedName() {
     if (TestType.CLASS.getType().equals(data.TEST_OBJECT)) {
@@ -285,14 +280,6 @@ public class TestNGConfiguration extends ModuleBasedConfiguration<JavaRunConfigu
     setGeneratedName();
   }
 
-  public void setGeneratedName() {
-    setName(getGeneratedName());
-  }
-
-  public String getGeneratedName() {
-    return data.getGeneratedName(getConfigurationModule());
-  }
-
   @NotNull
   public SettingsEditor<? extends RunConfiguration> getConfigurationEditor() {
     SettingsEditorGroup<TestNGConfiguration> group = new SettingsEditorGroup<TestNGConfiguration>();
diff --git a/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java b/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java
index 2f857253b86a..cc688d3f6b6f 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java
@@ -18,14 +18,12 @@ package com.theoryinpractice.testng.model;
 import com.intellij.execution.ExternalizablePath;
 import com.intellij.execution.JavaExecutionUtil;
 import com.intellij.execution.Location;
-import com.intellij.execution.configurations.JavaRunConfigurationModule;
 import com.intellij.execution.junit.JUnitUtil;
 import com.intellij.execution.junit2.info.MethodLocation;
 import com.intellij.execution.testframework.TestSearchScope;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 
@@ -174,35 +172,6 @@ public class TestData implements Cloneable
     return data;
   }
 
-  public boolean isGeneratedName(String s, JavaRunConfigurationModule config) {
-    if (TEST_OBJECT == null) return true;
-    if ((TestType.CLASS.getType().equals(TEST_OBJECT) || TestType.METHOD.getType().equals(TEST_OBJECT)) && getMainClassName().length() == 0)
-      return JavaExecutionUtil.isNewName(s);
-    if (TestType.METHOD.getType().equals(TEST_OBJECT) && getMethodName().length() == 0)
-      return JavaExecutionUtil.isNewName(s);
-    else return Comparing.equal(s, getGeneratedName(config));
-  }
-
-  public String getGeneratedName(JavaRunConfigurationModule runconfigurationmodule) {
-    if (TestType.PACKAGE.getType().equals(TEST_OBJECT)) if (getPackageName().length() == 0) return "<default>";
-    else return getPackageName();
-    String name = JavaExecutionUtil.getPresentableClassName(getMainClassName(), runconfigurationmodule);
-    if (TestType.METHOD.getType().equals(TEST_OBJECT)) {
-      return name + '.' + getMethodName();
-    }
-    else if (TestType.SUITE.getType().equals(TEST_OBJECT)) {
-      return getSuiteName();
-    }
-    else {
-      if (TestType.PATTERN.getType().equals(TEST_OBJECT)) {
-        final int size = myPatterns.size();
-        if (size == 0) return "Temp suite";
-        return StringUtil.getShortName(myPatterns.iterator().next()) + (size > 1 ? " and " + (size - 1) + " more" : "");
-      }
-      return name;
-    }
-  }
-
   public String getMainClassName() {
     return MAIN_CLASS_NAME == null ? "" : MAIN_CLASS_NAME;
   }