From 2b674bf37e9521e102aa4b73b6e86b9ec9cfaa48 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Tue, 14 Feb 2017 18:17:47 +0100
Subject: [PATCH] add isEqualTo(file: File)

---
 .../src/com/intellij/testFramework/assertions/JdomAssert.kt   | 4 ++++
 .../org/jetbrains/idea/eclipse/EclipseImlTest.java            | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/platform/testFramework/extensions/src/com/intellij/testFramework/assertions/JdomAssert.kt b/platform/testFramework/extensions/src/com/intellij/testFramework/assertions/JdomAssert.kt
index 57d0c3555463..868864789e4b 100644
--- a/platform/testFramework/extensions/src/com/intellij/testFramework/assertions/JdomAssert.kt
+++ b/platform/testFramework/extensions/src/com/intellij/testFramework/assertions/JdomAssert.kt
@@ -24,6 +24,7 @@ import com.intellij.util.loadElement
 import org.assertj.core.api.AbstractAssert
 import org.assertj.core.internal.Objects
 import org.jdom.Element
+import java.io.File
 import java.nio.file.Path
 
 class JdomAssert(actual: Element?) : AbstractAssert<JdomAssert, Element?>(actual, JdomAssert::class.java) {
@@ -37,6 +38,9 @@ class JdomAssert(actual: Element?) : AbstractAssert<JdomAssert, Element?>(actual
     return this
   }
 
+  @Deprecated("isEqualTo(file: Path)", ReplaceWith("isEqualTo(file.toPath())"))
+  fun isEqualTo(file: File) = isEqualTo(file.toPath())
+
   fun isEqualTo(file: Path): JdomAssert {
     isNotNull
 
diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java
index b7dd0043223a..a7bf065cf8b2 100644
--- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java
+++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java
@@ -46,6 +46,7 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.idea.eclipse.conversion.EclipseClasspathReader;
 
 import java.io.File;
+import java.nio.file.Paths;
 
 import static com.intellij.testFramework.assertions.Assertions.assertThat;
 
@@ -97,7 +98,7 @@ public class EclipseImlTest extends IdeaTestCase {
     PathMacroManager.getInstance(project).collapsePaths(actualImlElement);
     PathMacros.getInstance().removeMacro(JUNIT);
 
-    assertThat(actualImlElement).isEqualTo(new File(project.getBaseDir().getPath() + "/expected", "expected.iml"));
+    assertThat(actualImlElement).isEqualTo(Paths.get(project.getBaseDir().getPath(), "expected", "expected.iml"));
   }
 
   public void testWorkspaceOnly() throws Exception {