Migrate callsites from 'expectNotEmpty()' to 'expectNotNil()'

Author: gribozavr

test/Interpreter/SDK/Foundation_test.swift

@@ -278,7 +278,7 @@ FoundationTestSuite.test("NSKeyedUnarchiver/decodeObjectOfClass(_:forKey:)") {
   expectType((NSPredicate?).self, &missing)
 
   var decoded = KU.decodeObject(of: NSPredicate.self, forKey: KEY)
-  expectNotEmpty(decoded)
+  expectNotNil(decoded)
   expectType((NSPredicate?).self, &decoded)
 
   var wrongType = KU.decodeObject(of: DateFormatter.self, forKey: KEY)

test/Interpreter/SDK/cf_extensions.swift

@@ -70,7 +70,7 @@ CFTestSuite.test("protocols/downcast")
                             components: [1.0, 0.5, 0.25, 1.0])
   let opaquePink: AnyObject = pink
   let downcasted = opaquePink as? SwiftProto
-  expectNotEmpty(downcasted)
+  expectNotNil(downcasted)
   expectTrue(pink === downcasted!.doTheThing())
 }
 

test/Interpreter/SDK/object_literals.swift

@@ -15,7 +15,7 @@ LiteralsTestSuite.test("file") {
   // This is what requires the proper bundle folder structure.
   let resource = #fileLiteral(resourceName: "testData.plist")
   let contents = NSDictionary(contentsOf: resource) as! [String: NSObject]?
-  _ = expectNotEmpty(contents)
+  _ = expectNotNil(contents)
   expectEqual(["test": true as NSObject], contents!)
 }
 

test/Interpreter/objc_class_properties.swift

@@ -158,15 +158,15 @@ ClassProperties.test("optionalProp") {
   expectNil(noProp.optionalClassProp)
 
   let hasProp: ProtoWithClassProperty.Type = Subclass.self
-  expectNotEmpty(hasProp.optionalClassProp)
+  expectNotNil(hasProp.optionalClassProp)
   expectEqual(true, hasProp.optionalClassProp!)
 
   let hasOwnProp: ProtoWithClassProperty.Type = SwiftClass.self
-  expectNotEmpty(hasOwnProp.optionalClassProp)
+  expectNotNil(hasOwnProp.optionalClassProp)
   expectEqual(true, hasOwnProp.optionalClassProp!)
 
   let hasPropObjC: ProtoWithClassProperty.Type = ObjCSubclassWithClassProperty.self
-  expectNotEmpty(hasPropObjC.optionalClassProp)
+  expectNotNil(hasPropObjC.optionalClassProp)
   expectEqual(true, hasPropObjC.optionalClassProp!)
 }
 
@@ -183,8 +183,8 @@ ClassProperties.test("namingConflict") {
 
   let sub = NamingConflictSubclass()
   expectNil(sub.prop)
-  expectNotEmpty(type(of: sub).prop)
-  expectNotEmpty(NamingConflictSubclass.prop)
+  expectNotNil(type(of: sub).prop)
+  expectNotNil(NamingConflictSubclass.prop)
 }
 
 extension NamingConflictSubclass : PropertyNamingConflictProto {

test/Interpreter/objc_class_properties_runtime.swift

@@ -74,10 +74,10 @@ ClassProperties.test("runtime")
   .code {
   let theClass: AnyObject = SwiftClass.self
   let prop = class_getProperty(object_getClass(theClass), "value")
-  expectNotEmpty(prop)
+  expectNotNil(prop)
 
   let nameAsCString = property_getName(prop)!
-  expectNotEmpty(nameAsCString)
+  expectNotNil(nameAsCString)
   expectEqual("value", String(cString: nameAsCString))
 }
 

test/Interpreter/objc_runtime_visible.swift

@@ -47,7 +47,7 @@ ObjCRuntimeVisibleTestSuite.test("downcast") {
   let obj = HiddenClass.create()
   let opaque: AnyObject = obj
   let downcasted = opaque as? HiddenClass
-  expectNotEmpty(downcasted)
+  expectNotNil(downcasted)
   expectTrue(obj === downcasted)
 }
 
@@ -67,7 +67,7 @@ ObjCRuntimeVisibleTestSuite.test("protocols/downcast")
   let obj = HiddenClass.create()
   let opaque: AnyObject = obj
   let downcasted = opaque as? SwiftProto
-  expectNotEmpty(downcasted)
+  expectNotNil(downcasted)
   expectTrue(obj === downcasted!.doTheThing())
 }
 

test/stdlib/ArrayBridge.swift.gyb

@@ -259,28 +259,28 @@ tests.test("Another/${Any}") {
   let subclass2 = subclassInBaseBuffer
 
   // Explicit downcast-ability is based on element type, not buffer type
-  expectNotEmpty(subclassInBaseBuffer as? [Subclass])
+  expectNotNil(subclassInBaseBuffer as? [Subclass])
 
   // We can up-cast to array of Any
   let subclassAsAnyArray: [${Any}] = subclassInBaseBuffer
   expectEqual(subclass2, subclassAsAnyArray.map { $0 as! Base })
 
   let downcastBackToBase = subclassAsAnyArray as? [Base]
-  expectNotEmpty(downcastBackToBase)
+  expectNotNil(downcastBackToBase)
 
-  if let downcastBackToSubclass = expectNotEmpty(subclassAsAnyArray as? [Subclass]) {
+  if let downcastBackToSubclass = expectNotNil(subclassAsAnyArray as? [Subclass]) {
     expectEqual(subclass2, downcastBackToSubclass)
   }
 
-  if let downcastToProtocols = expectNotEmpty(subclassAsAnyArray as? [Fooable]) {
+  if let downcastToProtocols = expectNotNil(subclassAsAnyArray as? [Fooable]) {
     expectEqual(subclass2, downcastToProtocols.map { $0 as! Subclass })
   }
 
-  if let downcastToProtocols = expectNotEmpty(subclassAsAnyArray as? [Barable]) {
+  if let downcastToProtocols = expectNotNil(subclassAsAnyArray as? [Barable]) {
     expectEqual(subclass2, downcastToProtocols.map { $0 as! Subclass })
   }
 
-  if let downcastToProtocols = expectNotEmpty(subclassAsAnyArray as? [Barable & Fooable]) {
+  if let downcastToProtocols = expectNotNil(subclassAsAnyArray as? [Barable & Fooable]) {
     expectEqual(subclass2, downcastToProtocols.map { $0 as! Subclass })
   }
 
@@ -364,7 +364,7 @@ tests.test("testExplicitlyBridged/${Any}") {
   }
 
   // Downcasts of up-casted arrays.
-  if let downcasted = expectNotEmpty(
+  if let downcasted = expectNotNil(
     bridgeableValuesAsAnys as? [Subclass]
   ) {
     expectEqualSequence(expectedSubclasses, downcasted)

test/stdlib/Builtins.swift

@@ -164,8 +164,8 @@ class C : B {}
 tests.test("_getSuperclass") {
   expectNil(_getSuperclass(A.self))
   expectNil(_getSuperclass(Classy.self))
-  expectNotEmpty(_getSuperclass(B.self))
-  expectNotEmpty(_getSuperclass(C.self))
+  expectNotNil(_getSuperclass(B.self))
+  expectNotNil(_getSuperclass(C.self))
   expectTrue(_getSuperclass(B.self)! == A.self)
   expectTrue(_getSuperclass(C.self)! == B.self)
 }

test/stdlib/Dispatch.swift

@@ -26,12 +26,12 @@ DispatchAPI.test("OS_OBJECT support") {
   expectTrue(mainQueue is DispatchQueue)
 
   // This should not be optimized out, and should succeed.
-  expectNotEmpty(mainQueue as? DispatchQueue)
+  expectNotNil(mainQueue as? DispatchQueue)
 }
 
 DispatchAPI.test("DispatchGroup creation") {
   let group = DispatchGroup()
-  expectNotEmpty(group)
+  expectNotNil(group)
 }
 
 DispatchAPI.test("dispatch_block_t conversions") {

test/stdlib/Inputs/DictionaryKeyValueTypesObjC.swift

@@ -526,7 +526,7 @@ import SlurpFastEnumeration
       with: &state, objects: AutoreleasingUnsafeMutablePointer(stackBuf.baseAddress),
       count: stackBufLength)
     expectNotEqual(0, state.state)
-    expectNotEmpty(state.mutationsPtr)
+    expectNotNil(state.mutationsPtr)
     if returnedCount == 0 {
       break
     }
@@ -545,7 +545,7 @@ import SlurpFastEnumeration
       with: &state, objects: AutoreleasingUnsafeMutablePointer(stackBuf.baseAddress),
       count: stackBufLength)
     expectNotEqual(0, state.state)
-    expectNotEmpty(state.mutationsPtr)
+    expectNotNil(state.mutationsPtr)
     expectEqual(0, returnedCount)
   }
 }
@@ -568,7 +568,7 @@ typealias AnyObjectTuple2 = (AnyObject, AnyObject)
       with: &state, objects: AutoreleasingUnsafeMutablePointer(stackBuf.baseAddress),
       count: stackBufLength)
     expectNotEqual(0, state.state)
-    expectNotEmpty(state.mutationsPtr)
+    expectNotNil(state.mutationsPtr)
     if returnedCount == 0 {
       break
     }
@@ -778,7 +778,7 @@ typealias AnyObjectTuple2 = (AnyObject, AnyObject)
       with: &state, objects: AutoreleasingUnsafeMutablePointer(stackBuf.baseAddress),
       count: stackBufLength)
     expectNotEqual(0, state.state)
-    expectNotEmpty(state.mutationsPtr)
+    expectNotNil(state.mutationsPtr)
     if returnedCount == 0 {
       break
     }
@@ -797,7 +797,7 @@ typealias AnyObjectTuple2 = (AnyObject, AnyObject)
       with: &state, objects: AutoreleasingUnsafeMutablePointer(stackBuf.baseAddress),
       count: stackBufLength)
     expectNotEqual(0, state.state)
-    expectNotEmpty(state.mutationsPtr)
+    expectNotNil(state.mutationsPtr)
     expectEqual(0, returnedCount)
   }
 }