Evolution tests: Don't bother testing changing a class's superclass (#15000)

We're okay with saying this is a binary-breaking change, and its
presence in these tests is interfering with testing other things.

rdar://problem/36932507

Author: jrose-apple

validation-test/Evolution/Inputs/superclass_methods.swift

@@ -14,15 +14,9 @@ open class Base {
   open class func classMethod() -> String {
     return "Base.classMethod()"
   }
-}
 
-open class OtherBase {
-  public init() {}
-  open func method() -> String {
-    return "OtherBase.method()"
-  }
-  open class func classMethod() -> String {
-    return "OtherBase.classMethod()"
+  open func nonOverriddenMethod() -> String {
+    return "Base.nonOverriddenMethod()"
   }
 }
 
@@ -66,9 +60,3 @@ open class InsertSuperclass : Base {}
 #else
 open class InsertSuperclass : InBetween {}
 #endif
-
-#if BEFORE
-open class ChangeRoot : Base {}
-#else
-open class ChangeRoot : OtherBase {}
-#endif

validation-test/Evolution/Inputs/superclass_properties.swift

@@ -11,18 +11,11 @@ open class Base {
   open var property: String {
     return "Base.property"
   }
-  open class var classProperty: String {
-    return "Base.classProperty"
-  }
-}
-
-open class OtherBase {
-  public init() {}
-  open var property: String {
-    return "OtherBase.property"
+  open var nonOverriddenProperty: String {
+    return "Base.nonOverriddenProperty"
   }
   open class var classProperty: String {
-    return "OtherBase.classProperty"
+    return "Base.classProperty"
   }
 }
 
@@ -66,9 +59,3 @@ open class InsertSuperclass : Base {}
 #else
 open class InsertSuperclass : InBetween {}
 #endif
-
-#if BEFORE
-open class ChangeRoot : Base {}
-#else
-open class ChangeRoot : OtherBase {}
-#endif

validation-test/Evolution/test_superclass_methods.swift

@@ -59,33 +59,15 @@ SuperclassMethodsTest.test("InsertSuperclass") {
     }
     if getVersion() == 0 {
       expectEqual(Leaf().method(), "Base.method()")
+      expectEqual(Leaf().nonOverriddenMethod(), "Base.nonOverriddenMethod()")
       expectEqual(Leaf.classMethod(), "Base.classMethod()")
     } else {
       expectEqual(Leaf().method(), "InBetween.method()")
+      expectEqual(Leaf().nonOverriddenMethod(), "Base.nonOverriddenMethod()")
       expectEqual(Leaf.classMethod(), "InBetween.classMethod()")
     }
   }
 }
 
-SuperclassMethodsTest.test("ChangeRoot") {
-  do {
-    class Leaf : ChangeRoot {
-      override func method() -> String {
-        return super.method()
-      }
-      override class func classMethod() -> String {
-        return super.classMethod()
-      }
-    }
-    if getVersion() == 0 {
-      expectEqual(Leaf().method(), "Base.method()")
-      expectEqual(Leaf.classMethod(), "Base.classMethod()")
-    } else {
-      expectEqual(Leaf().method(), "OtherBase.method()")
-      expectEqual(Leaf.classMethod(), "OtherBase.classMethod()")
-    }
-  }
-}
-
 runAllTests()
 

validation-test/Evolution/test_superclass_properties.swift

@@ -59,32 +59,14 @@ SuperclassPropertiesTest.test("InsertSuperclass") {
     }
     if getVersion() == 0 {
       expectEqual(Leaf().property, "Base.property")
+      expectEqual(Leaf().nonOverriddenProperty, "Base.nonOverriddenProperty")
       expectEqual(Leaf.classProperty, "Base.classProperty")
     } else {
       expectEqual(Leaf().property, "InBetween.property")
+      expectEqual(Leaf().nonOverriddenProperty, "Base.nonOverriddenProperty")
       expectEqual(Leaf.classProperty, "InBetween.classProperty")
     }
   }
 }
 
-SuperclassPropertiesTest.test("ChangeRoot") {
-  do {
-    class Leaf : ChangeRoot {
-      override var property: String {
-        return super.property
-      }
-      override class var classProperty: String {
-        return super.classProperty
-      }
-    }
-    if getVersion() == 0 {
-      expectEqual(Leaf().property, "Base.property")
-      expectEqual(Leaf.classProperty, "Base.classProperty")
-    } else {
-      expectEqual(Leaf().property, "OtherBase.property")
-      expectEqual(Leaf.classProperty, "OtherBase.classProperty")
-    }
-  }
-}
-
 runAllTests()