MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

ensure conflicts are ordered

Browse Source
This commit is contained in:
Anna Kozlova
2016-02-17 12:27:25 +01:00
parent a35c9c7d29
commit 87039be208
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/refactoring/RenameMethodMultiTest.java
+3 -4
View File
@@ -19,7 +19,6 @@ import com.intellij.JavaTestUtil;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiDocumentManager;
@@ -71,9 +70,9 @@ public class RenameMethodMultiTest extends MultiFileTestCase {
doTest("p.B", "void method()", "finalMethod");
}
catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
Assert.assertEquals("Renaming method will override final \"method <b><code>A.finalMethod()</code></b>\"\n" +
"Method finalMethod() will override \n" +
"a method of the base class <b><code>p.A</code></b>", e.getMessage());
Assert.assertEquals("Method finalMethod() will override \n" +
"a method of the base class <b><code>p.A</code></b>\n" +
"Renaming method will override final \"method <b><code>A.finalMethod()</code></b>\"", e.getMessage());
return;
}
fail("Conflicts were not found");