From bb61ebaf4cb9673b1c12c6af7c09a9ac9e60d385 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 23 Jan 2017 16:58:57 +0300
Subject: [PATCH] useless throws removed

---
 .../psi/impl/cache/impl/FindClassTest.java    | 26 +++++++------------
 .../impl/SameSourceRootInTwoModulesTest.java  | 26 +++++++------------
 .../testFramework/PlatformTestCase.java       | 12 ++++++---
 3 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/FindClassTest.java b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/FindClassTest.java
index 016c5ab7fa60..c34c5eae8fbb 100644
--- a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/FindClassTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/FindClassTest.java
@@ -40,7 +40,6 @@ import com.intellij.testFramework.PsiTestUtil;
 import com.intellij.util.containers.ContainerUtil;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 
@@ -58,24 +57,19 @@ public class FindClassTest extends PsiTestCase {
 
     final File root = createTempDirectory();
     WriteCommandAction.runWriteCommandAction(null, () -> {
-      try {
-        VirtualFile rootVFile =
-          LocalFileSystem.getInstance().refreshAndFindFileByPath(root.getAbsolutePath().replace(File.separatorChar, '/'));
+      VirtualFile rootVFile =
+        LocalFileSystem.getInstance().refreshAndFindFileByPath(root.getAbsolutePath().replace(File.separatorChar, '/'));
 
-        myPrjDir1 = createChildDirectory(rootVFile, "prj1");
-        mySrcDir1 = createChildDirectory(myPrjDir1, "src1");
+      myPrjDir1 = createChildDirectory(rootVFile, "prj1");
+      mySrcDir1 = createChildDirectory(myPrjDir1, "src1");
 
-        myPackDir = createChildDirectory(mySrcDir1, "p");
-        VirtualFile file1 = createChildData(myPackDir, "A.java");
-        setFileText(file1, "package p; public class A{ public void foo(); }");
-        PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
+      myPackDir = createChildDirectory(mySrcDir1, "p");
+      VirtualFile file1 = createChildData(myPackDir, "A.java");
+      setFileText(file1, "package p; public class A{ public void foo(); }");
+      PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
 
-        PsiTestUtil.addContentRoot(myModule, myPrjDir1);
-        PsiTestUtil.addSourceRoot(myModule, mySrcDir1);
-      }
-      catch (IOException e) {
-        LOG.error(e);
-      }
+      PsiTestUtil.addContentRoot(myModule, myPrjDir1);
+      PsiTestUtil.addSourceRoot(myModule, mySrcDir1);
     });
   }
 
diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SameSourceRootInTwoModulesTest.java b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SameSourceRootInTwoModulesTest.java
index d2bb0bff9f40..bbb1ee8ba32c 100644
--- a/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SameSourceRootInTwoModulesTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/impl/cache/impl/SameSourceRootInTwoModulesTest.java
@@ -27,7 +27,6 @@ import com.intellij.testFramework.PsiTestCase;
 import com.intellij.testFramework.PsiTestUtil;
 
 import java.io.File;
-import java.io.IOException;
 
 /**
  * @author max
@@ -43,24 +42,19 @@ public class SameSourceRootInTwoModulesTest extends PsiTestCase {
 
     final File root = createTempDirectory();
     ApplicationManager.getApplication().runWriteAction(() -> {
-      try {
-        VirtualFile rootVFile =
-          LocalFileSystem.getInstance().refreshAndFindFileByPath(root.getAbsolutePath().replace(File.separatorChar, '/'));
+      VirtualFile rootVFile =
+        LocalFileSystem.getInstance().refreshAndFindFileByPath(root.getAbsolutePath().replace(File.separatorChar, '/'));
 
-        myPrjDir1 = createChildDirectory(rootVFile, "prj1");
-        mySrcDir1 = createChildDirectory(myPrjDir1, "src1");
+      myPrjDir1 = createChildDirectory(rootVFile, "prj1");
+      mySrcDir1 = createChildDirectory(myPrjDir1, "src1");
 
-        myPackDir = createChildDirectory(mySrcDir1, "p");
-        VirtualFile file1 = createChildData(myPackDir, "A.java");
-        setFileText(file1, "package p; public class A{ public void foo(); }");
-        PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
+      myPackDir = createChildDirectory(mySrcDir1, "p");
+      VirtualFile file1 = createChildData(myPackDir, "A.java");
+      setFileText(file1, "package p; public class A{ public void foo(); }");
+      PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
 
-        PsiTestUtil.addContentRoot(myModule, myPrjDir1);
-        PsiTestUtil.addSourceRoot(myModule, mySrcDir1);
-      }
-      catch (IOException e) {
-        LOG.error(e);
-      }
+      PsiTestUtil.addContentRoot(myModule, myPrjDir1);
+      PsiTestUtil.addSourceRoot(myModule, mySrcDir1);
     });
   }
 
diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
index d0afe1c9b470..9777051dc063 100644
--- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
@@ -438,14 +438,18 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
   protected void tearDown() throws Exception {
     Project project = myProject;
 
+    runTearDownActions(project);
+  }
+
+  private void runTearDownActions(Project project) {
     new RunAll()
       .append(() -> {
         if (project != null) {
           LightPlatformTestCase.doTearDown(project, ourApplication, false);
         }
       })
-      .append(() -> disposeProject())
-      .append(() -> checkForSettingsDamage())
+      .append(this::disposeProject)
+      .append(this::checkForSettingsDamage)
       .append(() -> {
         if (project != null) {
           InjectedLanguageManagerImpl.checkInjectorsAreDisposed(project);
@@ -475,7 +479,7 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
           myThreadTracker.checkLeak();
         }
       })
-      .append(() -> LightPlatformTestCase.checkEditorsReleased())
+      .append(LightPlatformTestCase::checkEditorsReleased)
       .append(() -> {
         myProjectManager = null;
         myProject = null;
@@ -871,7 +875,7 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
     }.execute().throwException();
   }
 
-  public static void setFileText(@NotNull final VirtualFile file, @NotNull final String text) throws IOException {
+  public static void setFileText(@NotNull final VirtualFile file, @NotNull final String text) {
     new WriteAction() {
       @Override
       protected void run(@NotNull Result result) throws Throwable {