Move: Remove duplicating conflict messages from test data

This commit is contained in:
Alexey Sedunov
2017-04-10 15:36:03 +03:00
parent cd6177534a
commit 411a8dc206
7 changed files with 1 additions and 11 deletions
@@ -1,5 +1,3 @@
Class A.X is private and will not be accessible from file noImports.kt.
Class A.X is private and will not be accessible from file noImports.kt.
Class A.X is private and will not be accessible from file onDemandImport.kt.
Class A.X is private and will not be accessible from file onDemandImport.kt.
Class A.X is private and will not be accessible from file specificImport.kt.
@@ -1,4 +1,3 @@
Class test2.J, referenced in property test2.pack.Bar.j, will not be accessible in module A
Class test2.J, referenced in property test2.pack.Foo.j, will not be accessible in module A
Class test2.pack.Foo, referenced in field J.foo, will not be accessible from module B
Class test2.pack.Foo, referenced in field J.foo, will not be accessible from module B
@@ -1,2 +1 @@
Property a1.internalTargetVal, referenced in file internalSource.kt, will not be accessible from module A
Property a1.internalTargetVal, referenced in file internalSource.kt, will not be accessible from module A
@@ -1,6 +1,5 @@
Class InternalContent uses function internalFun() which will be inaccessible after move
Class packA1.InternalContent, referenced in file InternalSource.kt, will not be accessible from module A
Class packA1.InternalContent, referenced in file InternalSource.kt, will not be accessible from module A
Class packA2.InternalContentUser, referenced in function packA1.InternalContent.useInternal(), will not be accessible in module B
Function packA2.InternalContentUser.internalFun(), referenced in function packA1.InternalContent.useInternal(), will not be accessible in module B
Function useInternal(InternalContent) uses internal function internalFun() which will be inaccessible after move
@@ -1,6 +1,4 @@
Class test.Bar, referenced in field J.bar, will not be accessible from module A
Class test.Bar, referenced in field J.bar, will not be accessible from module A
Class test.Foo, referenced in field J.foo, will not be accessible from module A
Class test.Foo, referenced in field J.foo, will not be accessible from module A
Class test.J, referenced in property test.Bar.j, will not be accessible in module B
Class test.J, referenced in property test.Foo.j, will not be accessible in module B
@@ -1,6 +1,3 @@
Class test2.J, referenced in property test2.pack.Bar.j, will not be accessible in module A
Class test2.J, referenced in property test2.pack.Foo.j, will not be accessible in module A
Class test2.pack.Foo, referenced in field J.foo, will not be accessible from module B
Class test2.pack.Foo, referenced in field J.foo, will not be accessible from module B
Class test2.pack.Foo, referenced in field J.foo, will not be accessible from module B
Class test2.pack.Foo, referenced in field J.foo, will not be accessible from module B
@@ -138,7 +138,7 @@ fun runMoveRefactoring(path: String, config: JsonObject, rootDir: VirtualFile, p
assert(!conflictFile.exists())
}
catch(e: ConflictsInTestsException) {
KotlinTestUtils.assertEqualsToFile(conflictFile, e.messages.sorted().joinToString("\n"))
KotlinTestUtils.assertEqualsToFile(conflictFile, e.messages.distinct().sorted().joinToString("\n"))
ConflictsInTestsException.setTestIgnore(true)