From 8f456556f69df021ee845baa55bc214f1091b4b7 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 25 Feb 2016 13:56:43 +0300 Subject: [PATCH] Update existing test data depending on diagnostic parameter rendering Original commit: a4c005fefdb113a86c164b14b445417de65344dd --- .../errors.txt | 2 +- .../testData/general/InternalFromAnotherModule/errors.txt | 2 +- .../companionObjectInheritedMemberChanged/build.log | 8 ++++---- .../companionObjectMemberChanged/build.log | 8 ++++---- .../classHierarchyAffected/enumMemberChanged/build.log | 2 +- .../flagsAndMemberInSameClassChanged/build.log | 8 ++++---- .../inferredTypeArgumentChanged/build.log | 4 ++-- .../methodNullabilityChanged/build.log | 2 +- .../classHierarchyAffected/overrideImplicit/build.log | 2 +- .../propertyNullabilityChanged/build.log | 2 +- .../secondaryConstructorAdded/build.log | 2 +- .../pureKotlin/conflictingPlatformDeclarations/build.log | 8 ++++---- .../incremental/pureKotlin/funRedeclaration/build.log | 2 +- .../incremental/pureKotlin/valAddCustomAccessor/build.log | 2 +- .../valAddCustomAccessor/experimental-ic-build.log | 2 +- .../pureKotlin/valRemoveCustomAccessor/build.log | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt index de432978151..c025526d7a1 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt @@ -1,4 +1,4 @@ -'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 14, column 14 +'internal open val member: Int defined in test.ClassBB1' has no access to 'internal abstract val member: Int defined in test.ClassB1', so it cannot override it at line 14, column 14 'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36 'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36 'public' subclass exposes its 'internal' supertype InternalClass2 at line 19, column 15 diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt index 9627524678f..d1920809ebf 100644 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt @@ -1,4 +1,4 @@ -'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 14, column 14 +'internal open val member: Int defined in test.ClassBB1' has no access to 'internal abstract val member: Int defined in test.ClassB1', so it cannot override it at line 14, column 14 'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36 'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36 Cannot access 'InternalClass1': it is 'internal' in 'test' at line 5, column 13 diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log index dfb126785da..dfe2d963e1e 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log @@ -33,10 +33,10 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log index ebeff233c5f..4d2113b7a99 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log @@ -30,10 +30,10 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log index a4e3a6d15e8..c1aa2e715de 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log @@ -20,7 +20,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any? ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log index 2856771b984..5b6fbaf1784 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log @@ -37,9 +37,9 @@ Cannot access 'A': it is 'private' in file 'public' function exposes its 'private' return type A Cannot access 'A': it is 'private' in file Cannot access 'A': it is 'private' in file -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any? Cannot access 'x': it is 'invisible_fake' in 'B' -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any? ================ Step #2 ================= @@ -57,8 +57,8 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any? ================ Step #3 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log index ee2b0711e9a..059e63deb32 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log @@ -34,8 +34,8 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Type mismatch: inferred type is kotlin.collections.List but kotlin.collections.List was expected -Type mismatch: inferred type is kotlin.collections.List but kotlin.collections.List was expected +Type mismatch: inferred type is List but List was expected +Type mismatch: inferred type is List but List was expected ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log index aaa57fbc2e4..cf30e6eee91 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log @@ -23,7 +23,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Null can not be a value of a non-null type kotlin.Any +Null can not be a value of a non-null type Any ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log index 062678e016f..3370de7c993 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): kotlin.Unit defined in A +Class 'BA' must be declared abstract or implement abstract member public abstract fun f(c: C): Unit defined in A ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log index 260a3c78c3e..f5140879637 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log @@ -24,7 +24,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected +Type mismatch: inferred type is Any? but Any was expected ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log index 1cc2b929b61..8ff9855fed1 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log @@ -9,7 +9,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -'public constructor A(x: kotlin.String)' conflicts with another declaration in package '' +'public constructor A(x: String)' conflicts with another declaration in package '' ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index 21ab5180f89..c3d008be68b 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: kotlin.collections.List): kotlin.Unit - fun function(list: kotlin.collections.List): kotlin.Unit + fun function(list: List): kotlin.Unit + fun function(list: List): kotlin.Unit Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): - fun function(list: kotlin.collections.List): kotlin.Unit - fun function(list: kotlin.collections.List): kotlin.Unit + fun function(list: List): kotlin.Unit + fun function(list: List): kotlin.Unit \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index 5d1ddb7b207..cc75bbbadea 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -10,4 +10,4 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -'public fun function(): kotlin.Unit' conflicts with another declaration in package 'test' +'public fun function(): Unit' conflicts with another declaration in package 'test' \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log index ec12e7f5ab1..12944581320 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log @@ -18,4 +18,4 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a property that has open or custom getter +Smart cast to 'Int' is impossible, because 'a.x' is a property that has open or custom getter \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log index e1179f2c022..1b9a86e1791 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log @@ -20,4 +20,4 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a property that has open or custom getter +Smart cast to 'Int' is impossible, because 'a.x' is a property that has open or custom getter \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log index 96b7b7bbbf1..ba582b86091 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log @@ -10,7 +10,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a property that has open or custom getter +Smart cast to 'Int' is impossible, because 'a.x' is a property that has open or custom getter ================ Step #2 =================