From 1274dbae64d3a378159bee372fdbd24f44797031 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 16 Apr 2014 17:11:33 +0400 Subject: [PATCH] removed confusing createTempPath() --- .../execution/BaseConfigurationTestCase.java | 2 +- .../com/intellij/testFramework/TempFiles.java | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/execution/BaseConfigurationTestCase.java b/java/java-tests/testSrc/com/intellij/execution/BaseConfigurationTestCase.java index 9a88daac74eb..b6f79c1fe753 100644 --- a/java/java-tests/testSrc/com/intellij/execution/BaseConfigurationTestCase.java +++ b/java/java-tests/testSrc/com/intellij/execution/BaseConfigurationTestCase.java @@ -103,7 +103,7 @@ public abstract class BaseConfigurationTestCase extends IdeaTestCase { @NotNull public static Module createTempModule(TempFiles tempFiles, final Project project) { - final String tempPath = tempFiles.createTempPath(); + final String tempPath = tempFiles.createTempFile("xxx").getAbsolutePath(); return ApplicationManager.getApplication().runWriteAction(new Computable() { @Override public Module compute() { diff --git a/platform/testFramework/src/com/intellij/testFramework/TempFiles.java b/platform/testFramework/src/com/intellij/testFramework/TempFiles.java index add3c46ee70d..a19347765d97 100644 --- a/platform/testFramework/src/com/intellij/testFramework/TempFiles.java +++ b/platform/testFramework/src/com/intellij/testFramework/TempFiles.java @@ -43,13 +43,15 @@ public class TempFiles { return getVFileByFile(createTempFile(prefix, postfix)); } + @NotNull public File createTempFile(@NotNull String prefix) { - return createTempFile(prefix, "_Temp_File_"); + return createTempFile(prefix, null); } - public File createTempFile(@NotNull String prefix, String postfix) { + @NotNull + public File createTempFile(@NotNull String prefix, String suffix) { try { - File tempFile = FileUtil.createTempFile(prefix, postfix); + File tempFile = FileUtil.createTempFile(prefix, suffix); tempFileCreated(tempFile); getVFileByFile(tempFile); return tempFile; @@ -68,10 +70,12 @@ public class TempFiles { return LocalFileSystem.getInstance().refreshAndFindFileByIoFile(tempFile); } + @NotNull public File createTempDir() { return createTempDir("dir"); } + @NotNull private File createTempDir(@NotNull String prefix) { try { File dir = FileUtil.createTempDirectory(prefix, "test",false); @@ -94,12 +98,6 @@ public class TempFiles { return getVFileByFile(createTempDir(prefix)); } - public String createTempPath() { - File tempFile = createTempFile("xxx"); - String absolutePath = tempFile.getAbsolutePath(); - return absolutePath; - } - public void deleteAll() { for (File file : myFilesToDelete) { if (!FileUtil.delete(file)) { @@ -108,7 +106,7 @@ public class TempFiles { } } - public VirtualFile createVFile(VirtualFile parentDir, String name, String text) { + public VirtualFile createVFile(@NotNull VirtualFile parentDir, @NotNull String name, @NotNull String text) { try { final VirtualFile virtualFile = parentDir.createChildData(this, name); VfsUtil.saveText(virtualFile, text + "\n");