From a9134cd8a279b3c53cda3c7176557fadef2c160c Mon Sep 17 00:00:00 2001 From: Andrey Vlasovskikh Date: Wed, 4 May 2011 16:43:07 +0400 Subject: [PATCH] Try to compare files in assertDirectoriesEqual() as text for better diff view --- .../com/intellij/testFramework/PlatformTestUtil.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java index 520892b46d85..d94395f420a4 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java +++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java @@ -26,6 +26,7 @@ import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.editor.Document; import com.intellij.openapi.extensions.ExtensionPoint; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.extensions.Extensions; @@ -499,7 +500,14 @@ public class PlatformTestUtil { assertJarFilesEqual(VfsUtil.virtualToIoFile(fileAfter), VfsUtil.virtualToIoFile(fileBefore)); } catch (IOException e) { - Assert.assertArrayEquals(fileAfter.getPath(), fileAfter.contentsToByteArray(), fileBefore.contentsToByteArray()); + FileDocumentManager manager = FileDocumentManager.getInstance(); + Document docBefore = manager.getDocument(fileBefore); + Document docAfter = manager.getDocument(fileAfter); + if (docBefore != null && docAfter != null) { + Assert.assertEquals(fileAfter.getPath(), docAfter.getText(), docBefore.getText()); + } else { + Assert.assertArrayEquals(fileAfter.getPath(), fileAfter.contentsToByteArray(), fileBefore.contentsToByteArray()); + } } }