Evolution: Clean up superclass insertion tests a bit

- We don't want to support changing a root class of a class, so don't
  pretend that works. Some of these tests got removed recently in
  d8104e7 but one still remained.

- For the tests that insert a non-root superclass in the inheritance
  hierarchy, also test calling a method of the derived class. This
  works now that we no longer hardcode vtable offsets and instead use
  dispatch thunks.

Author: slavapestov

validation-test/Evolution/Inputs/class_insert_superclass.swift

@@ -1,7 +1,8 @@
+open class Root {}
 
 #if BEFORE
 
-open class FirstMiddle {
+open class FirstMiddle : Root {
   let x: String
 
   public init(x: String) {
@@ -13,7 +14,7 @@ open class FirstMiddle {
   }
 }
 
-open class SecondMiddle {
+open class SecondMiddle : Root {
   let x: String
 
   public init(x: String) {
@@ -25,7 +26,7 @@ open class SecondMiddle {
   }
 }
 
-open class GenericMiddle<T> {
+open class GenericMiddle<T> : Root {
   let x: T
 
   public init(x: T) {
@@ -40,7 +41,7 @@ open class GenericMiddle<T> {
 #else
 
 // Insert concrete superclass
-open class Base {
+open class Base : Root {
   let x: String
 
   public init(t: String) {
@@ -59,7 +60,7 @@ open class FirstMiddle : Base {
 }
 
 // Insert generic superclass
-open class GenericBase<T> {
+open class GenericBase<T> : Root {
   let x: T
 
   public init(t: T) {

validation-test/Evolution/test_class_resilient_superclass_methods.swift

@@ -16,6 +16,9 @@ SuperclassMethodsTest.test("AddInterposingMethod") {
       override class func classMethod() -> String {
         return super.classMethod()
       }
+      func newMethod() -> String {
+        return "still works"
+      }
     }
     if getVersion() == 0 {
       expectEqual(Leaf().method(), "Base.method()")
@@ -24,6 +27,7 @@ SuperclassMethodsTest.test("AddInterposingMethod") {
       expectEqual(Leaf().method(), "AddInterposingMethod.method()")
       expectEqual(Leaf.classMethod(), "AddInterposingMethod.classMethod()")
     }
+    expectEqual(Leaf().newMethod(), "still works")
   }
 }
 
@@ -36,6 +40,9 @@ SuperclassMethodsTest.test("RemoveInterposingMethod") {
       override class func classMethod() -> String {
         return super.classMethod()
       }
+      func newMethod() -> String {
+        return "still works"
+      }
     }
     if getVersion() == 0 {
       expectEqual(Leaf().method(), "RemoveInterposingMethod.method()")
@@ -44,6 +51,7 @@ SuperclassMethodsTest.test("RemoveInterposingMethod") {
       expectEqual(Leaf().method(), "Base.method()")
       expectEqual(Leaf.classMethod(), "Base.classMethod()")
     }
+    expectEqual(Leaf().newMethod(), "still works")
   }
 }
 
@@ -56,6 +64,9 @@ SuperclassMethodsTest.test("InsertSuperclass") {
       override class func classMethod() -> String {
         return super.classMethod()
       }
+      func newMethod() -> String {
+        return "still works"
+      }
     }
     if getVersion() == 0 {
       expectEqual(Leaf().method(), "Base.method()")
@@ -66,6 +77,7 @@ SuperclassMethodsTest.test("InsertSuperclass") {
       expectEqual(Leaf().nonOverriddenMethod(), "Base.nonOverriddenMethod()")
       expectEqual(Leaf.classMethod(), "InBetween.classMethod()")
     }
+    expectEqual(Leaf().newMethod(), "still works")
   }
 }
 

validation-test/Evolution/test_class_resilient_superclass_properties.swift

@@ -16,6 +16,7 @@ SuperclassPropertiesTest.test("AddInterposingProperty") {
       override class var classProperty: String {
         return super.classProperty
       }
+      var newProperty: String = "still works"
     }
     if getVersion() == 0 {
       expectEqual(Leaf().property, "Base.property")
@@ -24,6 +25,7 @@ SuperclassPropertiesTest.test("AddInterposingProperty") {
       expectEqual(Leaf().property, "AddInterposingProperty.property")
       expectEqual(Leaf.classProperty, "AddInterposingProperty.classProperty")
     }
+    expectEqual(Leaf().newProperty, "still works")
   }
 }
 
@@ -36,6 +38,7 @@ SuperclassPropertiesTest.test("RemoveInterposingProperty") {
       override class var classProperty: String {
         return super.classProperty
       }
+      var newProperty: String = "still works"
     }
     if getVersion() == 0 {
       expectEqual(Leaf().property, "RemoveInterposingProperty.property")
@@ -44,6 +47,7 @@ SuperclassPropertiesTest.test("RemoveInterposingProperty") {
       expectEqual(Leaf().property, "Base.property")
       expectEqual(Leaf.classProperty, "Base.classProperty")
     }
+    expectEqual(Leaf().newProperty, "still works")
   }
 }
 
@@ -56,6 +60,7 @@ SuperclassPropertiesTest.test("InsertSuperclass") {
       override class var classProperty: String {
         return super.classProperty
       }
+      var newProperty: String = "still works"
     }
     if getVersion() == 0 {
       expectEqual(Leaf().property, "Base.property")
@@ -66,6 +71,7 @@ SuperclassPropertiesTest.test("InsertSuperclass") {
       expectEqual(Leaf().nonOverriddenProperty, "Base.nonOverriddenProperty")
       expectEqual(Leaf.classProperty, "InBetween.classProperty")
     }
+    expectEqual(Leaf().newProperty, "still works")
   }
 }