diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java index 68cc57deb24b..1d41be0671a7 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java @@ -91,8 +91,6 @@ import java.util.Objects; import java.util.Set; import java.util.concurrent.TimeUnit; -import static com.intellij.testFramework.TemporaryDirectoryKt.generateTemporaryPath; - /** * @author yole */ @@ -308,7 +306,7 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro int hashCode = System.identityHashCode(leaked); leakers.append("Leaked project found:").append(leaked).append("; hash: ").append(hashCode).append("; place: ") .append(getCreationPlace(leaked)).append("\n"); - leakers.append(backLink+"\n"); + leakers.append(backLink).append("\n"); leakers.append(";-----\n"); hashCodes.remove(hashCode); @@ -324,7 +322,6 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro @NotNull @TestOnly public static String getCreationPlace(@NotNull Project project) { - String place = project.getUserData(CREATION_PLACE); Object base; try { base = project.isDisposed() ? "" : project.getBaseDir(); @@ -332,7 +329,8 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro catch (Exception e) { base = " (" + e + " while getting base dir)"; } - return project + (place != null ? place : "") + base; + String place = project.getUserData(CREATION_PLACE); + return project + " " +(place == null ? "" : place) + base; } protected void runStartupActivities() { @@ -364,7 +362,8 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro } } - Path tempFile = generateTemporaryPath(FileUtil.sanitizeFileName(getName(), false) + (isDirectoryBasedProject ? "" : ProjectFileType.DOT_DEFAULT_EXTENSION)); + Path tempFile = TemporaryDirectoryKt + .generateTemporaryPath(FileUtil.sanitizeFileName(getName(), false) + (isDirectoryBasedProject ? "" : ProjectFileType.DOT_DEFAULT_EXTENSION)); myFilesToDelete.add(tempFile.toFile()); return tempFile; } @@ -601,14 +600,8 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro resetClassFields(aClass.getSuperclass()); } - private String getFullName() { - return getClass().getName() + "." + getName(); - } - protected void setUpJdk() { - //final ProjectJdkEx jdk = ProjectJdkUtil.getDefaultJdk("java 1.4"); final Sdk jdk = getTestProjectJdk(); -// ProjectJdkImpl jdk = ProjectJdkTable.getInstance().addJdk(defaultJdk); Module[] modules = ModuleManager.getInstance(myProject).getModules(); for (Module module : modules) { ModuleRootModificationUtil.setModuleSdk(module, jdk); @@ -635,8 +628,7 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro resetAllFields(); }); } - catch (Throwable e) { - // Ignore + catch (Throwable ignored) { } } }