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 6d7cc01c6e5..15d4cc39b00 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 @@ -63,7 +63,7 @@ abstract class AbstractProtoComparisonTest : TestWithWorkingDir() { changes.add("MEMBERS\n ${diff.changedMembersNames.sorted()}") } if (changes.isEmpty()) { - changes.add("NONE") + return@forEach } p.println("CHANGES in $classId: ${changes.joinToString()}") diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out b/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out index 23a2f727ee7..7d374bcdda8 100644 --- a/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out @@ -6,7 +6,6 @@ CHANGES in test/ClassWithAddedCompanionObject: CLASS_SIGNATURE, MEMBERS [Companion] 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 [Companion] diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/result.out b/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/result.out index 6d3a21a9224..323cb44c9cb 100644 --- a/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/result.out +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/result.out @@ -1,9 +1,7 @@ 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 diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/result.out b/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/result.out index fa961dc605b..8478b460dd7 100644 --- a/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/result.out +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/result.out @@ -3,5 +3,4 @@ CHANGES in test/A: MEMBERS 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/sealedClassImplAdded/result.out b/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/result.out index b12544a4531..d87510103c5 100644 --- a/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/result.out +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/result.out @@ -1,5 +1,3 @@ ADDED test/Base.C CHANGES in test/Base: CLASS_SIGNATURE, MEMBERS [C] -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 16a3e70a50b..e69de29bb2d 100644 --- a/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/result.out +++ b/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/result.out @@ -1,3 +0,0 @@ -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 cb22975005a..e69de29bb2d 100644 --- a/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/result.out +++ b/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/result.out @@ -1,3 +0,0 @@ -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 8e9b3250df7..e69de29bb2d 100644 --- a/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/result.out +++ b/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/result.out @@ -1,3 +0,0 @@ -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 d01b704337b..e69de29bb2d 100644 --- a/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/result.out +++ b/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/result.out @@ -1,4 +0,0 @@ -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 58b599f0ac5..e69de29bb2d 100644 --- a/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/result.out +++ b/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/result.out @@ -1,4 +0,0 @@ -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 d3cbdc7abce..1cdfdbe80dc 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/result.out @@ -1,7 +1,2 @@ -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/classFlagsChanged/result.out b/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out index b64cb2cfcf1..d756f31b514 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out +++ b/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out @@ -1,41 +1,22 @@ 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 [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 diff --git a/jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/result.out b/jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/result.out index 1a65056bdc3..2b9979196bc 100644 --- a/jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/result.out +++ b/jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/result.out @@ -1,4 +1,3 @@ SKIPPED test/Utils CHANGES in test/Utils__Main1Kt: MEMBERS [publicAddedFun1] -CHANGES in test/Utils__Main2Kt: NONE diff --git a/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out b/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out index 111fa114d7c..e69de29bb2d 100644 --- a/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out +++ b/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out @@ -1 +0,0 @@ -CHANGES in test/MainKt: NONE diff --git a/jps-plugin/testData/comparison/unchanged/unchangedClass/result.out b/jps-plugin/testData/comparison/unchanged/unchangedClass/result.out index 8297e4f971e..e69de29bb2d 100644 --- a/jps-plugin/testData/comparison/unchanged/unchangedClass/result.out +++ b/jps-plugin/testData/comparison/unchanged/unchangedClass/result.out @@ -1,4 +0,0 @@ -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 111fa114d7c..e69de29bb2d 100644 --- a/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out +++ b/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out @@ -1 +0,0 @@ -CHANGES in test/MainKt: NONE