From cb8ab9316003642b2f5c032757cb3545d13513e2 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 25 May 2017 10:58:12 +0300 Subject: [PATCH] Update testData for changed diagnostic messages Original commit: 7979663e6c0a9ebdecaf406b77ccbfd8b8c6300e --- .../classHierarchyAffected/overrideImplicit/build.log | 4 ++-- .../pureKotlin/conflictingPlatformDeclarations/build.log | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log index 3370de7c993..2533be1703d 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log @@ -19,7 +19,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Class 'BA' must be declared abstract or implement abstract member public abstract fun f(c: C): Unit defined in A +Class 'BA' is not abstract and does not implement abstract member public abstract fun f(c: C): Unit defined in A ================ Step #2 ================= @@ -31,4 +31,4 @@ Compiling files: src/BA.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index 6c49ba3e152..47083313579 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -12,8 +12,8 @@ Exit code: ABORT ------------------------------------------ COMPILATION FAILED Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): - fun function(list: List): Unit - fun function(list: List): Unit + fun function(list: List): Unit defined in test + fun function(list: List): Unit defined in test Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): - fun function(list: List): Unit - fun function(list: List): Unit \ No newline at end of file + fun function(list: List): Unit defined in test + fun function(list: List): Unit defined in test \ No newline at end of file