Do not print NONE changes in proto tests

otherwise MainKt: NONE is added in all js tests Original commit: 61b3c1c429
2017-06-17 00:29:24 +03:00
parent 0a78d2d299
commit bf22bdadc1
16 changed files with 1 additions and 55 deletions
@@ -63,7 +63,7 @@ abstract class AbstractProtoComparisonTest<PROTO_DATA> : TestWithWorkingDir() {
                changes.add("MEMBERS\n    ${diff.changedMembersNames.sorted()}")
            }
            if (changes.isEmpty()) {
-                changes.add("NONE")
+                return@forEach
            }

            p.println("CHANGES in $classId: ${changes.joinToString()}")
@@ -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]
@@ -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
@@ -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
@@ -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
@@ -1,3 +0,0 @@
-CHANGES in test/ClassWithPrivateFunAdded: NONE
-CHANGES in test/ClassWithPrivateFunRemoved: NONE
-CHANGES in test/ClassWithPrivateFunSignatureChanged: NONE
@@ -1,3 +0,0 @@
-CHANGES in test/ClassWithPrivatePrimaryConstructorAdded: NONE
-CHANGES in test/ClassWithPrivatePrimaryConstructorChanged: NONE
-CHANGES in test/ClassWithPrivatePrimaryConstructorRemoved: NONE
@@ -1,3 +0,0 @@
-CHANGES in test/ClassWithPrivateSecondaryConstructorsAdded: NONE
-CHANGES in test/ClassWithPrivateSecondaryConstructorsAdded2: NONE
-CHANGES in test/ClassWithPrivateSecondaryConstructorsRemoved: NONE
@@ -1,4 +0,0 @@
-CHANGES in test/ClassWithGetterForPrivateValChanged: NONE
-CHANGES in test/ClassWithPrivateValAdded: NONE
-CHANGES in test/ClassWithPrivateValRemoved: NONE
-CHANGES in test/ClassWithPrivateValSignatureChanged: NONE
@@ -1,4 +0,0 @@
-CHANGES in test/ClassWithGetterAndSetterForPrivateVarChanged: NONE
-CHANGES in test/ClassWithPrivateVarAdded: NONE
-CHANGES in test/ClassWithPrivateVarRemoved: NONE
-CHANGES in test/ClassWithPrivateVarSignatureChanged: NONE
@@ -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
@@ -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
@@ -1,4 +1,3 @@
 SKIPPED test/Utils
 CHANGES in test/Utils__Main1Kt: MEMBERS
    [publicAddedFun1]
-CHANGES in test/Utils__Main2Kt: NONE
@@ -1 +0,0 @@
-CHANGES in test/MainKt: NONE
@@ -1,4 +0,0 @@
-CHANGES in test/UnchangedClass: NONE
-CHANGES in test/UnchangedClassWithFunOnly: NONE
-CHANGES in test/UnchangedClassWithValOnly: NONE
-CHANGES in test/UnchangedClassWithVarOnly: NONE
@@ -1 +0,0 @@
-CHANGES in test/MainKt: NONE