Update Interpreter tests for id-as-Any.

Author: jckarter

test/Interpreter/SDK/Foundation_bridge.swift

@@ -8,137 +8,131 @@
 import Foundation
 
 // CHECK: 17 bridges to 17
-var i = 17
-if let obj = _bridgeToObjectiveC(i) {
+do {
+  var i = 17
+  let obj = _bridgeAnythingToObjectiveC(i)
   print("\(i) bridges to \(obj.description!)")
-} else {
-  print("\(i) is not bridged to Objective-C")
 }
 
 // CHECK: 3.14159 bridges to 3.14159
-var d = 3.14159
-if let obj = _bridgeToObjectiveC(d) {
+do {
+  var d = 3.14159
+  let obj = _bridgeAnythingToObjectiveC(d)
   print("\(d) bridges to \(obj.description!)")
-} else {
-  print("\(d) is not bridged to Objective-C")
 }
 
 // CHECK: Hello, world! bridges to Hello, world!
-var s = "Hello, world!"
-if let obj = _bridgeToObjectiveC(s) {
+do {
+  var s = "Hello, world!"
+  let obj = _bridgeAnythingToObjectiveC(s)
   print("\(s) bridges to \(obj.description!)")
-} else {
-  print("\(s) is not bridged to Objective-C")
 }
 
-// CHECK: int array bridges to (
-// CHECK:     1
-// CHECK:     2
-// CHECK:     3
-// CHECK: )
-var a = [1, 2, 3]
-if let obj = _bridgeToObjectiveC(a) {
+  // CHECK: int array bridges to (
+  // CHECK:     1
+  // CHECK:     2
+  // CHECK:     3
+  // CHECK: )
+do {
+  var a = [1, 2, 3]
+  let obj = _bridgeAnythingToObjectiveC(a)
   print("int array bridges to \(obj.description!)")
-} else {
-  print("int array is not bridged to Objective-C")
 }
 
-// CHECK: uint array bridges to (
-// CHECK:     1
-// CHECK:     2
-// CHECK:     3
-// CHECK: )
-var aui: [UInt] = [1, 2, 3]
-if let obj = _bridgeToObjectiveC(aui) {
+  // CHECK: uint array bridges to (
+  // CHECK:     1
+  // CHECK:     2
+  // CHECK:     3
+  // CHECK: )
+do {
+  var aui: [UInt] = [1, 2, 3]
+  let obj = _bridgeAnythingToObjectiveC(aui)
   print("uint array bridges to \(obj.description!)")
-} else {
-  print("uint array is not bridged to Objective-C")
 }
 
 // CHECK: float array bridges to (
 // CHECK:     1.5
 // CHECK:     2.5
 // CHECK:     3.5
 // CHECK: )
-var af: [Float] = [1.5, 2.5, 3.5]
-if let obj = _bridgeToObjectiveC(af) {
+do {
+  var af: [Float] = [1.5, 2.5, 3.5]
+  let obj = _bridgeAnythingToObjectiveC(af)
   print("float array bridges to \(obj.description!)")
-} else {
-  print("float array is not bridged to Objective-C")
 }
 
 // CHECK: double array bridges to (
 // CHECK:     1.5
 // CHECK:     2.5
 // CHECK:     3.5
 // CHECK: )
-var ad = [1.5, 2.5, 3.5]
-if let obj = _bridgeToObjectiveC(ad) {
+do {
+  var ad = [1.5, 2.5, 3.5]
+  let obj = _bridgeAnythingToObjectiveC(ad)
   print("double array bridges to \(obj.description!)")
-} else {
-  print("double array is not bridged to Objective-C")
 }
 
 // CHECK: string array bridges to (
 // CHECK:     Hello
 // CHECK:     Swift
 // CHECK:     World
 // CHECK: )
-var a2 = ["Hello", "Swift", "World"]
-if let obj = _bridgeToObjectiveC(a2) {
+do {
+  var a2 = ["Hello", "Swift", "World"]
+  let obj = _bridgeAnythingToObjectiveC(a2)
   print("string array bridges to \(obj.description!)")
-} else {
-  print("string array is not bridged to Objective-C")
 }
 
 // CHECK: bool array bridges to (
 // CHECK:     0
 // CHECK:     1
 // CHECK:     0
 // CHECK: )
-var ab = [false, true, false]
-if let obj = _bridgeToObjectiveC(ab) {
+do {
+  var ab = [false, true, false]
+  let obj = _bridgeAnythingToObjectiveC(ab)
   print("bool array bridges to \(obj.description!)")
-} else {
-  print("bool array is not bridged to Objective-C")
 }
 
-// CHECK: tuple array is not bridged to Objective-C
-var a3 = [(1, 1), (1, 1), (1, 2)]
-if let obj = _bridgeToObjectiveC(a3) {
+// CHECK: tuple array bridges to (
+// CHECK:   (1, 1)
+// CHECK:   (1, 1)
+// CHECK:   (1, 2)
+// CHECK: )
+do {
+  var a3 = [(1, 1), (1, 1), (1, 2)]
+  let obj = _bridgeAnythingToObjectiveC(a3)
   print("tuple array bridges to \(obj.description!)")
-} else {
-  print("tuple array is not bridged to Objective-C")
 }
 
 // CHECK:      dictionary bridges to {
 // CHECK-NEXT:   2 = World;
 // CHECK-NEXT:   1 = Hello;
 // CHECK-NEXT: }
-var dict: Dictionary<NSNumber, NSString> = [1: "Hello", 2: "World"]
-if let obj = _bridgeToObjectiveC(dict) {
+do {
+  var dict: Dictionary<NSNumber, NSString> = [1: "Hello", 2: "World"]
+  let obj = _bridgeAnythingToObjectiveC(dict)
   print("dictionary bridges to \(obj.description!)")
-} else {
-  print("dictionary is not bridged to Objective-C")
 }
 
 // CHECK:      dictionary bridges to {
 // CHECK-NEXT:   2 = World;
 // CHECK-NEXT:   1 = Hello;
 // CHECK-NEXT: }
-var dict2 = [1: "Hello", 2: "World"]
-if let obj = _bridgeToObjectiveC(dict2) {
+do {
+  var dict2 = [1: "Hello", 2: "World"]
+  let obj = _bridgeAnythingToObjectiveC(dict2)
   print("dictionary bridges to \(obj.description!)")
-} else {
-  print("dictionary is not bridged to Objective-C")
 }
 
-// CHECK: dictionary is not bridged to Objective-C
-var dict3 = [1: ("Hello", 1), 2: ("World", 2)]
-if let obj = _bridgeToObjectiveC(dict3) {
-  print("dictionary bridges to \(obj.description!)")
-} else {
-  print("dictionary is not bridged to Objective-C")
+// CHECK: dictionary bridges to {
+// CHECK-NEXT:   2 = "(\"World\", 2)";
+// CHECK-NEXT:   1 = "(\"Hello\", 1)";
+// CHECK-NEXT: }
+do {
+  var dict3 = [1: ("Hello", 1), 2: ("World", 2)]
+  let obj = _bridgeAnythingToObjectiveC(dict3)
+  print("dictionary bridges to \(obj)")
 }
 
 // Check dictionary bridging.
@@ -155,9 +149,9 @@ for key in dict4.keys {
 }
 
 // CHECK: Hello: 1
-print("Hello: \(dict4[hello]!.description!)")
+print("Hello: \(dict4[hello]!)")
 // CHECK: World: 2
-print("World: \(dict4[world]!.description!)")
+print("World: \(dict4[world]!)")
 
 // <rdar://problem/17035548> bridging array of blocks.
 class Foo: NSObject {

test/Interpreter/SDK/Foundation_test.swift

@@ -79,7 +79,7 @@ FoundationTestSuite.test("NSArray") {
 
   // Iteration
   var result = [String]()
-  for x: AnyObject in nsArr {
+  for x: Any in nsArr {
     result.append((x as! NSObject).description)
   }
   expectEqualSequence(["1", "2.5", "Hello"], result)
@@ -127,8 +127,8 @@ FoundationTestSuite.test("NSDictionary") {
   assert((nsDict[2]! as! NSString).isEqual("World"))
 
   let nsMutableDict: NSMutableDictionary = ["Hello" : 1, "World" : 2]
-  assert(nsMutableDict["Hello"]!.isEqual(1))
-  assert(nsMutableDict["World"]!.isEqual(2))
+  assert((nsMutableDict["Hello"]! as AnyObject).isEqual(1))
+  assert((nsMutableDict["World"]! as AnyObject).isEqual(2))
 }
 
 //===----------------------------------------------------------------------===//
@@ -190,7 +190,7 @@ FoundationTestSuite.test("rdar://17584531") {
   // <rdar://problem/17584531>
   // Type checker used to be confused by this.
   var dict: NSDictionary = ["status": 200, "people": [["id": 255, "name": ["first": "John", "last": "Appleseed"]]]]
-  var dict2 = dict["people"]?[0] as! NSDictionary
+  var dict2 = dict["people"].map { $0 as AnyObject }?[0] as! NSDictionary
   expectEqual("Optional(255)", String(dict2["id"]))
 }
 

test/Interpreter/SDK/KVO.swift

@@ -31,14 +31,14 @@ class Observer : NSObject {
     model.number = 42
   }
 
-  override func observeValue(forKeyPath keyPath: String?, of object: AnyObject?, change: [NSKeyValueChangeKey : AnyObject]?, context: UnsafeMutablePointer<Void>?) {
+  override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutablePointer<Void>?) {
     if context != &kvoContext {
       // FIXME: we shouldn't need to unwrap these here, but it doesn't work on
       // older SDKs where these are non-optional types.
       return super.observeValue(forKeyPath: keyPath!, of: object!, change: change!, context: context)
     }
 
-    print(object!.value(forKeyPath: keyPath!))
+    print((object! as AnyObject).value(forKeyPath: keyPath!))
   }
 }
 

test/Interpreter/SDK/OS_objects.swift

@@ -16,7 +16,9 @@ import DispatchObjects
 
 // CHECK: Get current queue
 print("Get current queue")
-let obj = dispatch_get_current_queue();
+// TODO: Properly implement generalized dynamic casts from Any to
+// runtime-visible classes. `as AnyObject` should be unnecessary here.
+let obj = dispatch_get_current_queue() as AnyObject
 
 // CHECK-NEXT: Object is a dispatch queue
 if let q = obj as? OS_dispatch_queue {

test/Interpreter/SDK/Reflection_KVO.swift

@@ -25,7 +25,7 @@ class ValueObserver: NSObject {
 		observedValue.removeObserver(self, forKeyPath: "amount")
 	}
 
-	override func observeValue(forKeyPath keyPath: String?, of object: AnyObject?, change: [NSKeyValueChangeKey : AnyObject]?, context: UnsafeMutablePointer<Void>?) {
+	override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutablePointer<Void>?) {
 		if context == &observeContext {
       if let change_ = change {
         if let amount = change_[.newKey] as? Int {

test/Interpreter/SDK/class_as_object.swift

@@ -12,8 +12,8 @@ classes.add(NSObject.self)
 classes.add(NSString.self)
 classes.add(NSNumber.self)
 
-for obj: AnyObject in classes {
-  print(obj.description)
+for obj in classes {
+  print((obj as AnyObject).description)
 }
 // CHECK: NSObject
 // CHECK-NEXT: NSString

test/Interpreter/SDK/errors.swift

@@ -14,23 +14,27 @@ import StdlibUnittest
 struct Problem : Error {}
 
 class ErrorImpl : NSObject, ErrorTest {
-  func succeed() throws -> AnyObject { return self }
-  func fail() throws -> AnyObject { throw Problem() }
+  func succeed() throws -> Any { return self }
+  func fail() throws -> Any { throw Problem() }
 }
 
 
 var ErrorHandlingTests = TestSuite("ErrorHandling")
 
+func sameObject(_ x: Any?, _ y: Any?) -> Bool {
+  return x.map { $0 as AnyObject } === y.map { $0 as AnyObject }
+}
+
 ErrorHandlingTests.test("succeed") {
   let obj = ErrorImpl()
   let result = testSucceed(obj)
-  expectTrue(obj === result)
+  expectTrue(sameObject(obj, result))
 }
 
 ErrorHandlingTests.test("succeedIgnoringError") {
   let obj = ErrorImpl()
   let result = testSucceedIgnoringError(obj)
-  expectTrue(obj === result)
+  expectTrue(sameObject(obj, result))
 }
 
 ErrorHandlingTests.test("fail") {

test/Interpreter/SDK/objc_array_of_classes.swift

@@ -32,9 +32,9 @@ ArrayOfClassObjectBridging.test("bridging class object array to NSArray") {
   let classesBridged: NSArray = classes as NSArray
 
   expectTrue(classesBridged.count == 3)
-  expectTrue(classesBridged[0] === NSObject.self)
-  expectTrue(classesBridged[1] === NSString.self)
-  expectTrue(classesBridged[2] === NSArray.self)
+  expectTrue(classesBridged[0] as AnyObject === NSObject.self)
+  expectTrue(classesBridged[1] as AnyObject === NSString.self)
+  expectTrue(classesBridged[2] as AnyObject === NSArray.self)
 }
 
 ArrayOfClassObjectBridging.test("bridging NSArray of class objects to [AnyObject]") {

test/Interpreter/SDK/objc_dynamic_lookup.swift

@@ -8,13 +8,13 @@ import Foundation
 // Dynamic subscripting of NSArray, dynamic method dispatch
 // CHECK: {{^3$}}
 var array : AnyObject = [1, 2, 3, 4, 5]
-print(array[2].description)
+print((array[2] as AnyObject).description)
 
 // Dynamic subscripting on an array using an object (fails)
 // CHECK: NSArray subscript with an object fails
 var optVal1 = array["Hello"]
 if optVal1 != nil {
-   print((optVal1!)!.description)
+   print(((optVal1!)! as AnyObject).description)
 } else {
    print("NSArray subscript with an object fails")
 }
@@ -23,13 +23,13 @@ if optVal1 != nil {
 // CHECK: {{^2$}}
 var nsdict : NSDictionary = ["Hello" : 1, "World" : 2]
 var dict : AnyObject = nsdict
-print((dict["World"]!)!.description)
+print(((dict["World"]!)! as AnyObject).description)
 
 // Dynamic subscripting on a dictionary using an index (fails)
 // CHECK: NSDictionary subscript with an index fails
 var optVal2 = dict[1]
 if optVal2 != nil {
-   print(optVal2!.description)
+   print((optVal2! as AnyObject).description)
 } else {
    print("NSDictionary subscript with an index fails")
 }