diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index d76f79845d4..f95076a7401 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -40,18 +40,18 @@ abstract class AbstractProtoComparisonTest : UsefulTestCase() { val p = Printer(sb) (oldClassMap.keys - newClassMap.keys).sortedBy { it.toString() }.forEach { classId -> - p.println("REMOVED: class $classId") + p.println("REMOVED $classId") } (newClassMap.keys - oldClassMap.keys).sortedBy { it.toString() }.forEach { classId -> - p.println("ADDED: class $classId") + p.println("ADDED $classId") } (oldClassMap.keys.intersect(newClassMap.keys)).sortedBy { it.toString() }.forEach { classId -> val diff = difference(oldClassMap[classId]!!, newClassMap[classId]!!) if (diff == null) { - p.println("skip $classId") + p.println("SKIPPED $classId") return@forEach } @@ -66,7 +66,7 @@ abstract class AbstractProtoComparisonTest : UsefulTestCase() { changes.add("NONE") } - p.println("changes in $classId: ${changes.joinToString()}") + p.println("CHANGES in $classId: ${changes.joinToString()}") } KotlinTestUtils.assertEqualsToFile(File(testDataPath + File.separator + "result.out"), sb.toString()) diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out b/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out index feb94193953..23a2f727ee7 100644 --- a/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out @@ -1,12 +1,12 @@ -REMOVED: class test/ClassWithChangedCompanionObject.FirstName -REMOVED: class test/ClassWithRemovedCompanionObject.Companion -ADDED: class test/ClassWithAddedCompanionObject.Companion -ADDED: class test/ClassWithChangedCompanionObject.SecondName -changes in test/ClassWithAddedCompanionObject: CLASS_SIGNATURE, MEMBERS +REMOVED test/ClassWithChangedCompanionObject.FirstName +REMOVED test/ClassWithRemovedCompanionObject.Companion +ADDED test/ClassWithAddedCompanionObject.Companion +ADDED test/ClassWithChangedCompanionObject.SecondName +CHANGES in test/ClassWithAddedCompanionObject: CLASS_SIGNATURE, MEMBERS [Companion] -changes in test/ClassWithChangedCompanionObject: CLASS_SIGNATURE, MEMBERS +CHANGES in test/ClassWithChangedCompanionObject: CLASS_SIGNATURE, MEMBERS [FirstName, SecondName] -changes in test/ClassWithChangedVisibilityForCompanionObject: NONE -changes in test/ClassWithChangedVisibilityForCompanionObject.Companion: CLASS_SIGNATURE -changes in test/ClassWithRemovedCompanionObject: CLASS_SIGNATURE, MEMBERS +CHANGES in test/ClassWithChangedVisibilityForCompanionObject: NONE +CHANGES in test/ClassWithChangedVisibilityForCompanionObject.Companion: CLASS_SIGNATURE +CHANGES in test/ClassWithRemovedCompanionObject: CLASS_SIGNATURE, MEMBERS [Companion] diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/result.out b/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/result.out index 08fa3f65113..5d960a0c3cb 100644 --- a/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/result.out +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/result.out @@ -1,5 +1,5 @@ -changes in test/ClassWithPrimaryConstructorChanged: CLASS_SIGNATURE -changes in test/ClassWithPrimaryConstructorVisibilityChanged: CLASS_SIGNATURE -changes in test/ClassWithSecondaryConstructorVisibilityChanged: CLASS_SIGNATURE -changes in test/ClassWithSecondaryConstructorsAdded: CLASS_SIGNATURE -changes in test/ClassWithSecondaryConstructorsRemoved: CLASS_SIGNATURE +CHANGES in test/ClassWithPrimaryConstructorChanged: CLASS_SIGNATURE +CHANGES in test/ClassWithPrimaryConstructorVisibilityChanged: CLASS_SIGNATURE +CHANGES in test/ClassWithSecondaryConstructorVisibilityChanged: CLASS_SIGNATURE +CHANGES in test/ClassWithSecondaryConstructorsAdded: CLASS_SIGNATURE +CHANGES in test/ClassWithSecondaryConstructorsRemoved: CLASS_SIGNATURE diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/result.out b/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/result.out index 77239b3da8c..0220f1df264 100644 --- a/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/result.out +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/result.out @@ -1,12 +1,12 @@ -changes in test/ClassWithChangedVisiblityForFun1: MEMBERS +CHANGES in test/ClassWithChangedVisiblityForFun1: MEMBERS [foo] -changes in test/ClassWithChangedVisiblityForFun2: MEMBERS +CHANGES in test/ClassWithChangedVisiblityForFun2: MEMBERS [foo] -changes in test/ClassWithFunAdded: MEMBERS +CHANGES in test/ClassWithFunAdded: MEMBERS [added] -changes in test/ClassWithFunRemoved: MEMBERS +CHANGES in test/ClassWithFunRemoved: MEMBERS [removed] -changes in test/ClassWithValAndFunAddedAndRemoved: MEMBERS +CHANGES in test/ClassWithValAndFunAddedAndRemoved: MEMBERS [funAdded, funRemoved, valAdded, valRemoved] -changes in test/ClassWithValConvertedToVar: MEMBERS +CHANGES in test/ClassWithValConvertedToVar: MEMBERS [value] diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/result.out b/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/result.out index 9c4508243a5..6d3a21a9224 100644 --- a/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/result.out +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/result.out @@ -1,9 +1,9 @@ -REMOVED: class test/ClassWithNestedClasses.NestedClassRemoved -ADDED: class test/ClassWithNestedClasses.InnerClassAdded -ADDED: class test/ClassWithNestedClasses.NestedClassAdded -changes in test/ClassWithChangedVisibilityForNestedClasses: NONE -changes in test/ClassWithChangedVisibilityForNestedClasses.InnerClass: CLASS_SIGNATURE -changes in test/ClassWithChangedVisibilityForNestedClasses.NestedClass: CLASS_SIGNATURE -changes in test/ClassWithNestedClasses: MEMBERS +REMOVED test/ClassWithNestedClasses.NestedClassRemoved +ADDED test/ClassWithNestedClasses.InnerClassAdded +ADDED test/ClassWithNestedClasses.NestedClassAdded +CHANGES in test/ClassWithChangedVisibilityForNestedClasses: NONE +CHANGES in test/ClassWithChangedVisibilityForNestedClasses.InnerClass: CLASS_SIGNATURE +CHANGES in test/ClassWithChangedVisibilityForNestedClasses.NestedClass: CLASS_SIGNATURE +CHANGES in test/ClassWithNestedClasses: MEMBERS [InnerClassAdded, NestedClassAdded, NestedClassRemoved] -changes in test/ClassWithNestedClasses.InnerClass: NONE +CHANGES in test/ClassWithNestedClasses.InnerClass: NONE diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result.out b/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result.out index e7108629fed..868b63aa7e0 100644 --- a/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result.out +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result.out @@ -1 +1 @@ -changes in test/EnumClassWithChanges: CLASS_SIGNATURE +CHANGES in test/EnumClassWithChanges: CLASS_SIGNATURE diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/result.out b/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/result.out index 38bb7923619..fa961dc605b 100644 --- a/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/result.out +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/result.out @@ -1,7 +1,7 @@ -changes in test/A: MEMBERS +CHANGES in test/A: MEMBERS [argumentAdded, argumentRemoved, valueAdded, valueRemoved] -changes in test/ConstructorArgumentAdded: CLASS_SIGNATURE -changes in test/ConstructorArgumentRemoved: CLASS_SIGNATURE -changes in test/ConstructorValueAdded: CLASS_SIGNATURE -changes in test/ConstructorValueChanged: NONE -changes in test/ConstructorValueRemoved: CLASS_SIGNATURE +CHANGES in test/ConstructorArgumentAdded: CLASS_SIGNATURE +CHANGES in test/ConstructorArgumentRemoved: CLASS_SIGNATURE +CHANGES in test/ConstructorValueAdded: CLASS_SIGNATURE +CHANGES in test/ConstructorValueChanged: NONE +CHANGES in test/ConstructorValueRemoved: CLASS_SIGNATURE diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/result.out b/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/result.out index 529f33d6682..a0b96c26f42 100644 --- a/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/result.out +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/result.out @@ -1,4 +1,4 @@ -changes in test/A: MEMBERS +CHANGES in test/A: MEMBERS [abstractFlagAddedFun, abstractFlagAddedVal, abstractFlagRemovedFun, abstractFlagRemovedVal, infixFlagAddedFun, infixFlagRemovedFun, inlineFlagAddedFun, inlineFlagRemovedFun, internalFlagAddedFun, internalFlagAddedVal, internalFlagRemovedFun, internalFlagRemovedVal, lateinitFlagAddedVal, lateinitFlagRemovedVal, openFlagAddedFun, openFlagAddedVal, openFlagRemovedFun, openFlagRemovedVal, operatorFlagAddedFun, operatorFlagRemovedFun, privateFlagAddedFun, privateFlagAddedVal, privateFlagRemovedFun, privateFlagRemovedVal, protectedFlagAddedFun, protectedFlagAddedVal, protectedFlagRemovedFun, protectedFlagRemovedVal, tailrecFlagAddedFun, tailrecFlagRemovedFun] -changes in test/O: MEMBERS +CHANGES in test/O: MEMBERS [constFlagAddedVal, constFlagRemovedVal] diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/result.out b/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/result.out index badf90d65aa..b12544a4531 100644 --- a/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/result.out +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/result.out @@ -1,5 +1,5 @@ -ADDED: class test/Base.C -changes in test/Base: CLASS_SIGNATURE, MEMBERS +ADDED test/Base.C +CHANGES in test/Base: CLASS_SIGNATURE, MEMBERS [C] -changes in test/Base.A: NONE -changes in test/Base.B: NONE +CHANGES in test/Base.A: NONE +CHANGES in test/Base.B: NONE diff --git a/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/result.out b/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/result.out index 19c1bb7897a..16a3e70a50b 100644 --- a/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/result.out +++ b/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/result.out @@ -1,3 +1,3 @@ -changes in test/ClassWithPrivateFunAdded: NONE -changes in test/ClassWithPrivateFunRemoved: NONE -changes in test/ClassWithPrivateFunSignatureChanged: NONE +CHANGES in test/ClassWithPrivateFunAdded: NONE +CHANGES in test/ClassWithPrivateFunRemoved: NONE +CHANGES in test/ClassWithPrivateFunSignatureChanged: NONE diff --git a/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/result.out b/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/result.out index 8e093f6d40a..cb22975005a 100644 --- a/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/result.out +++ b/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/result.out @@ -1,3 +1,3 @@ -changes in test/ClassWithPrivatePrimaryConstructorAdded: NONE -changes in test/ClassWithPrivatePrimaryConstructorChanged: NONE -changes in test/ClassWithPrivatePrimaryConstructorRemoved: NONE +CHANGES in test/ClassWithPrivatePrimaryConstructorAdded: NONE +CHANGES in test/ClassWithPrivatePrimaryConstructorChanged: NONE +CHANGES in test/ClassWithPrivatePrimaryConstructorRemoved: NONE diff --git a/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/result.out b/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/result.out index 8915bd90306..8e9b3250df7 100644 --- a/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/result.out +++ b/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/result.out @@ -1,3 +1,3 @@ -changes in test/ClassWithPrivateSecondaryConstructorsAdded: NONE -changes in test/ClassWithPrivateSecondaryConstructorsAdded2: NONE -changes in test/ClassWithPrivateSecondaryConstructorsRemoved: NONE +CHANGES in test/ClassWithPrivateSecondaryConstructorsAdded: NONE +CHANGES in test/ClassWithPrivateSecondaryConstructorsAdded2: NONE +CHANGES in test/ClassWithPrivateSecondaryConstructorsRemoved: NONE diff --git a/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/result.out b/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/result.out index 42d0bb51b3f..d01b704337b 100644 --- a/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/result.out +++ b/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/result.out @@ -1,4 +1,4 @@ -changes in test/ClassWithGetterForPrivateValChanged: NONE -changes in test/ClassWithPrivateValAdded: NONE -changes in test/ClassWithPrivateValRemoved: NONE -changes in test/ClassWithPrivateValSignatureChanged: NONE +CHANGES in test/ClassWithGetterForPrivateValChanged: NONE +CHANGES in test/ClassWithPrivateValAdded: NONE +CHANGES in test/ClassWithPrivateValRemoved: NONE +CHANGES in test/ClassWithPrivateValSignatureChanged: NONE diff --git a/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/result.out b/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/result.out index 77759ffa841..58b599f0ac5 100644 --- a/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/result.out +++ b/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/result.out @@ -1,4 +1,4 @@ -changes in test/ClassWithGetterAndSetterForPrivateVarChanged: NONE -changes in test/ClassWithPrivateVarAdded: NONE -changes in test/ClassWithPrivateVarRemoved: NONE -changes in test/ClassWithPrivateVarSignatureChanged: NONE +CHANGES in test/ClassWithGetterAndSetterForPrivateVarChanged: NONE +CHANGES in test/ClassWithPrivateVarAdded: NONE +CHANGES in test/ClassWithPrivateVarRemoved: NONE +CHANGES in test/ClassWithPrivateVarSignatureChanged: NONE diff --git a/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/result.out b/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/result.out index 34b8db80090..d3cbdc7abce 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/result.out @@ -1,7 +1,7 @@ -changes in test/Ann1: NONE -changes in test/Ann2: NONE -changes in test/AnnotationAdded: NONE -changes in test/AnnotationListBecomeEmpty: CLASS_SIGNATURE -changes in test/AnnotationListBecomeNotEmpty: CLASS_SIGNATURE -changes in test/AnnotationRemoved: NONE -changes in test/AnnotationReplaced: NONE +CHANGES in test/Ann1: NONE +CHANGES in test/Ann2: NONE +CHANGES in test/AnnotationAdded: NONE +CHANGES in test/AnnotationListBecomeEmpty: CLASS_SIGNATURE +CHANGES in test/AnnotationListBecomeNotEmpty: CLASS_SIGNATURE +CHANGES in test/AnnotationRemoved: NONE +CHANGES in test/AnnotationReplaced: NONE diff --git a/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/result.out b/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/result.out index 0050cf38d22..44f6ef18797 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/result.out @@ -1,2 +1,2 @@ -changes in test/A: CLASS_SIGNATURE, MEMBERS +CHANGES in test/A: CLASS_SIGNATURE, MEMBERS [f] diff --git a/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out b/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out index 82ff2e1b0ba..b64cb2cfcf1 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out @@ -1,41 +1,41 @@ -changes in test/AbstractFlagAdded: CLASS_SIGNATURE -changes in test/AbstractFlagRemoved: CLASS_SIGNATURE -changes in test/AbstractFlagUnchanged: NONE -changes in test/AnnotationFlagAdded: CLASS_SIGNATURE -changes in test/AnnotationFlagRemoved: CLASS_SIGNATURE -changes in test/AnnotationFlagUnchanged: NONE -changes in test/DataFlagAdded: CLASS_SIGNATURE, MEMBERS +CHANGES in test/AbstractFlagAdded: CLASS_SIGNATURE +CHANGES in test/AbstractFlagRemoved: CLASS_SIGNATURE +CHANGES in test/AbstractFlagUnchanged: NONE +CHANGES in test/AnnotationFlagAdded: CLASS_SIGNATURE +CHANGES in test/AnnotationFlagRemoved: CLASS_SIGNATURE +CHANGES in test/AnnotationFlagUnchanged: NONE +CHANGES in test/DataFlagAdded: CLASS_SIGNATURE, MEMBERS [component1, copy, equals, hashCode, toString] -changes in test/DataFlagRemoved: CLASS_SIGNATURE, MEMBERS +CHANGES in test/DataFlagRemoved: CLASS_SIGNATURE, MEMBERS [component1, copy, equals, hashCode, toString] -changes in test/DataFlagUnchanged: NONE -changes in test/EnumFlagAdded: CLASS_SIGNATURE -changes in test/EnumFlagRemoved: CLASS_SIGNATURE -changes in test/EnumFlagUnchanged: NONE -changes in test/FinalFlagAdded: NONE -changes in test/FinalFlagRemoved: NONE -changes in test/FinalFlagUnchanged: NONE -changes in test/InnerClassHolder: NONE -changes in test/InnerClassHolder.InnerFlagAdded: CLASS_SIGNATURE -changes in test/InnerClassHolder.InnerFlagRemoved: CLASS_SIGNATURE -changes in test/InnerClassHolder.InnerFlagUnchanged: NONE -changes in test/InternalFlagAdded: CLASS_SIGNATURE -changes in test/InternalFlagRemoved: CLASS_SIGNATURE -changes in test/InternalFlagUnchanged: NONE -changes in test/OpenFlagAdded: CLASS_SIGNATURE -changes in test/OpenFlagRemoved: CLASS_SIGNATURE -changes in test/OpenFlagUnchanged: NONE -changes in test/PrivateFlagAdded: CLASS_SIGNATURE -changes in test/PrivateFlagRemoved: CLASS_SIGNATURE -changes in test/PrivateFlagUnchanged: NONE -changes in test/ProtectedClassHolder: NONE -changes in test/ProtectedClassHolder.ProtectedFlagAdded: CLASS_SIGNATURE -changes in test/ProtectedClassHolder.ProtectedFlagRemoved: CLASS_SIGNATURE -changes in test/ProtectedClassHolder.ProtectedFlagUnchanged: NONE -changes in test/PublicFlagAdded: NONE -changes in test/PublicFlagRemoved: NONE -changes in test/PublicFlagUnchanged: NONE -changes in test/SealedFlagAdded: CLASS_SIGNATURE -changes in test/SealedFlagRemoved: CLASS_SIGNATURE -changes in test/SealedFlagUnchanged: NONE -changes in test/UnchangedNoFlags: NONE +CHANGES in test/DataFlagUnchanged: NONE +CHANGES in test/EnumFlagAdded: CLASS_SIGNATURE +CHANGES in test/EnumFlagRemoved: CLASS_SIGNATURE +CHANGES in test/EnumFlagUnchanged: NONE +CHANGES in test/FinalFlagAdded: NONE +CHANGES in test/FinalFlagRemoved: NONE +CHANGES in test/FinalFlagUnchanged: NONE +CHANGES in test/InnerClassHolder: NONE +CHANGES in test/InnerClassHolder.InnerFlagAdded: CLASS_SIGNATURE +CHANGES in test/InnerClassHolder.InnerFlagRemoved: CLASS_SIGNATURE +CHANGES in test/InnerClassHolder.InnerFlagUnchanged: NONE +CHANGES in test/InternalFlagAdded: CLASS_SIGNATURE +CHANGES in test/InternalFlagRemoved: CLASS_SIGNATURE +CHANGES in test/InternalFlagUnchanged: NONE +CHANGES in test/OpenFlagAdded: CLASS_SIGNATURE +CHANGES in test/OpenFlagRemoved: CLASS_SIGNATURE +CHANGES in test/OpenFlagUnchanged: NONE +CHANGES in test/PrivateFlagAdded: CLASS_SIGNATURE +CHANGES in test/PrivateFlagRemoved: CLASS_SIGNATURE +CHANGES in test/PrivateFlagUnchanged: NONE +CHANGES in test/ProtectedClassHolder: NONE +CHANGES in test/ProtectedClassHolder.ProtectedFlagAdded: CLASS_SIGNATURE +CHANGES in test/ProtectedClassHolder.ProtectedFlagRemoved: CLASS_SIGNATURE +CHANGES in test/ProtectedClassHolder.ProtectedFlagUnchanged: NONE +CHANGES in test/PublicFlagAdded: NONE +CHANGES in test/PublicFlagRemoved: NONE +CHANGES in test/PublicFlagUnchanged: NONE +CHANGES in test/SealedFlagAdded: CLASS_SIGNATURE +CHANGES in test/SealedFlagRemoved: CLASS_SIGNATURE +CHANGES in test/SealedFlagUnchanged: NONE +CHANGES in test/UnchangedNoFlags: NONE diff --git a/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/result.out b/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/result.out index cde88c8ffd0..1686988a07a 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/result.out @@ -1 +1 @@ -changes in test/ClassWithTypeParameterListChanged: CLASS_SIGNATURE +CHANGES in test/ClassWithTypeParameterListChanged: CLASS_SIGNATURE diff --git a/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out b/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out index 1cd2c9c8d22..78ecf236100 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out @@ -1 +1 @@ -changes in test/ClassWithSuperTypeListChanged: CLASS_SIGNATURE +CHANGES in test/ClassWithSuperTypeListChanged: CLASS_SIGNATURE diff --git a/jps-plugin/testData/comparison/jvmOnly/classToFileFacade/result.out b/jps-plugin/testData/comparison/jvmOnly/classToFileFacade/result.out index 99630bdf273..8ea00e6c854 100644 --- a/jps-plugin/testData/comparison/jvmOnly/classToFileFacade/result.out +++ b/jps-plugin/testData/comparison/jvmOnly/classToFileFacade/result.out @@ -1,3 +1,3 @@ -REMOVED: class test/MainKt.Companion -REMOVED: class test/TestPackage -changes in test/MainKt: CLASS_SIGNATURE +REMOVED test/MainKt.Companion +REMOVED test/TestPackage +CHANGES in test/MainKt: CLASS_SIGNATURE diff --git a/jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/result.out b/jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/result.out index 3d5dfe8cff9..be2daa9d4c7 100644 --- a/jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/result.out +++ b/jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/result.out @@ -1,3 +1,2 @@ -changes in test/A: MEMBERS +CHANGES in test/A: MEMBERS [externalFlagAddedFun, externalFlagRemovedFun] - diff --git a/jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/result.out b/jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/result.out index 6408bf25bd5..1a65056bdc3 100644 --- a/jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/result.out +++ b/jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/result.out @@ -1,4 +1,4 @@ -skip test/Utils -changes in test/Utils__Main1Kt: MEMBERS +SKIPPED test/Utils +CHANGES in test/Utils__Main1Kt: MEMBERS [publicAddedFun1] -changes in test/Utils__Main2Kt: NONE +CHANGES in test/Utils__Main2Kt: NONE diff --git a/jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass/result.out b/jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass/result.out index 86df8ebe75b..aa5d9b93998 100644 --- a/jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass/result.out +++ b/jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass/result.out @@ -1,3 +1,3 @@ -ADDED: class test/MainKt.Companion -ADDED: class test/TestPackage -changes in test/MainKt: CLASS_SIGNATURE +ADDED test/MainKt.Companion +ADDED test/TestPackage +CHANGES in test/MainKt: CLASS_SIGNATURE diff --git a/jps-plugin/testData/comparison/packageMembers/defaultValues/result.out b/jps-plugin/testData/comparison/packageMembers/defaultValues/result.out index 3c50291bd28..54391eb043c 100644 --- a/jps-plugin/testData/comparison/packageMembers/defaultValues/result.out +++ b/jps-plugin/testData/comparison/packageMembers/defaultValues/result.out @@ -1,2 +1,2 @@ -changes in test/MainKt: MEMBERS +CHANGES in test/MainKt: MEMBERS [argumentAdded, argumentRemoved, valueAdded, valueRemoved] diff --git a/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/result.out b/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/result.out index a54ca374687..47c65cc3942 100644 --- a/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/result.out +++ b/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/result.out @@ -1,2 +1,2 @@ -changes in test/MainKt: MEMBERS +CHANGES in test/MainKt: MEMBERS [constFlagAddedVal, constFlagRemovedVal, externalFlagAddedFun, externalFlagRemovedFun, infixFlagAddedFun, infixFlagRemovedFun, inlineFlagAddedFun, inlineFlagRemovedFun, internalFlagAddedFun, internalFlagAddedVal, internalFlagRemovedFun, internalFlagRemovedVal, operatorFlagAddedFun, operatorFlagRemovedFun, privateFlagAddedFun, privateFlagAddedVal, privateFlagRemovedFun, privateFlagRemovedVal, tailrecFlagAddedFun, tailrecFlagRemovedFun] diff --git a/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out b/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out index f1d7bb25ec4..111fa114d7c 100644 --- a/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out +++ b/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out @@ -1 +1 @@ -changes in test/MainKt: NONE +CHANGES in test/MainKt: NONE diff --git a/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/result.out b/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/result.out index 44a87ed54f8..055561a49a3 100644 --- a/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/result.out +++ b/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/result.out @@ -1,2 +1,2 @@ -changes in test/MainKt: MEMBERS +CHANGES in test/MainKt: MEMBERS [addedFun, addedVal, changedFun, changedVal, removedFun, removedVal] diff --git a/jps-plugin/testData/comparison/unchanged/unchangedClass/result.out b/jps-plugin/testData/comparison/unchanged/unchangedClass/result.out index 7ff9822f5c7..8297e4f971e 100644 --- a/jps-plugin/testData/comparison/unchanged/unchangedClass/result.out +++ b/jps-plugin/testData/comparison/unchanged/unchangedClass/result.out @@ -1,4 +1,4 @@ -changes in test/UnchangedClass: NONE -changes in test/UnchangedClassWithFunOnly: NONE -changes in test/UnchangedClassWithValOnly: NONE -changes in test/UnchangedClassWithVarOnly: NONE +CHANGES in test/UnchangedClass: NONE +CHANGES in test/UnchangedClassWithFunOnly: NONE +CHANGES in test/UnchangedClassWithValOnly: NONE +CHANGES in test/UnchangedClassWithVarOnly: NONE diff --git a/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out b/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out index f1d7bb25ec4..111fa114d7c 100644 --- a/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out +++ b/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out @@ -1 +1 @@ -changes in test/MainKt: NONE +CHANGES in test/MainKt: NONE