From cddbc285a2f8dbe6f18d5b09ff90eed1f8a00ddf Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 28 Aug 2013 19:45:18 +0400
Subject: [PATCH] EA-48802 - assert: JavaFileManagerBase.findClass

---
 .../application/ApplicationConfiguration.java     |  4 ++--
 .../com/intellij/execution/JavaExecutionUtil.java | 15 ++++++++++-----
 .../execution/junit/JUnitConfiguration.java       |  4 ++--
 .../theoryinpractice/testng/model/TestData.java   |  4 ++--
 4 files changed, 16 insertions(+), 11 deletions(-)

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 a15f2de7d5fa..f98100026007 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * 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.
@@ -111,7 +111,7 @@ public class ApplicationConfiguration extends ModuleBasedConfiguration<JavaRunCo
     if (MAIN_CLASS_NAME == null) {
       return null;
     }
-    return JavaExecutionUtil.getPresentableClassName(MAIN_CLASS_NAME, getConfigurationModule());
+    return JavaExecutionUtil.getPresentableClassName(MAIN_CLASS_NAME);
   }
 
   @Override
diff --git a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
index 95a2c2d46e8b..0e0615769b79 100644
--- a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
+++ b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * 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.
@@ -140,13 +140,18 @@ public class JavaExecutionUtil {
     return ClassUtil.getJVMClassName(aClass);
   }
 
+  @Nullable
+  public static String getPresentableClassName(final String rtClassName) {
+    return getPresentableClassName(rtClassName, null);
+  }
+
+  /**
+   * {@link JavaExecutionUtil#getPresentableClassName(java.lang.String)} 
+   */
+  @Deprecated
   @Nullable
   public static String getPresentableClassName(final String rtClassName, final JavaRunConfigurationModule configurationModule) {
     if (StringUtil.isEmpty(rtClassName)) return null;
-    final PsiClass psiClass = configurationModule.findClass(rtClassName);
-    if (psiClass != null) {
-      return psiClass.getName();
-    }
     final int lastDot = rtClassName.lastIndexOf('.');
     if (lastDot == -1 || lastDot == rtClassName.length() - 1) {
       return rtClassName;
diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
index 569d4b12152a..422e567f8949 100644
--- a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
+++ b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * 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.
@@ -492,7 +492,7 @@ public class JUnitConfiguration extends ModuleBasedConfiguration<JavaRunConfigur
         final String fqName = myPattern.iterator().next();
         return (fqName.contains("*") ? fqName : StringUtil.getShortName(fqName)) + (size > 1 ? " and " + (size - 1) + " more" : "");
       }
-      final String className = JavaExecutionUtil.getPresentableClassName(getMainClassName(), configurationModule);
+      final String className = JavaExecutionUtil.getPresentableClassName(getMainClassName());
       if (TEST_METHOD.equals(TEST_OBJECT)) {
         return className + '.' + getMethodName();
       }
diff --git a/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java b/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java
index f88daee3e06b..55a6a3db11b5 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/model/TestData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * 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.
@@ -177,7 +177,7 @@ public class TestData implements Cloneable
   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);
+    String name = JavaExecutionUtil.getPresentableClassName(getMainClassName());
     if (TestType.METHOD.getType().equals(TEST_OBJECT)) {
       return name + '.' + getMethodName();
     }