Updating Swift tests to remove outdated tests and use more current ca…

…lls.
swiftlang · Sep 16, 2022 · 7825221 · 7825221
1 parent 453fd22
commit 7825221
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 24 deletions.
diff --git a/test/Interpreter/SDK/FoundationDiagnostics.swift b/test/Interpreter/SDK/FoundationDiagnostics.swift
diff --git a/test/Interpreter/SDK/Foundation_NSRect.swift b/test/Interpreter/SDK/Foundation_NSRect.swift
@@ -4,7 +4,9 @@
 // iOS doesn't have NSRect. iOS and OS X CGRect is tested elsewhere.
 // REQUIRES: OS=macosx
 
-import Foundation
+import Coreimage
+
+_ = JSONDecoder()
 
 func printRect(_ r: NSRect) {
   // FIXME: Constraint checker takes too long to typecheck this as an

diff --git a/test/Interpreter/SDK/Quartz_without_Foundation.swift b/test/Interpreter/SDK/Quartz_without_Foundation.swift
diff --git a/test/Interpreter/SDK/objc_implicit_inner_pointer.swift b/test/Interpreter/SDK/objc_implicit_inner_pointer.swift
@@ -7,6 +7,10 @@
 // REQUIRES: executable_test
 // REQUIRES: objc_interop
 
+import Foundation
+
+_ = JSONDecoder()
+
 do {
   // The lifetime of Foo() currently gets extended using autorelease.
   autoreleasepool {

diff --git a/test/Interpreter/SDK/objc_inner_pointer.swift b/test/Interpreter/SDK/objc_inner_pointer.swift
@@ -4,6 +4,8 @@
 // REQUIRES: objc_interop
 
 import Foundation
+
+_ = JSONDecoder()
 
 class Canary: NSObject {
   deinit {

diff --git a/test/Interpreter/SDK/objc_unowned.swift b/test/Interpreter/SDK/objc_unowned.swift
@@ -5,6 +5,8 @@
 
 import Foundation
 
+_ = JSONDecoder()
+
 let x = NSObject()
 unowned let y = x
 

diff --git a/test/stdlib/NSStringAPI.swift b/test/stdlib/NSStringAPI.swift
@@ -210,9 +210,10 @@ NSStringAPIs.test("init(contentsOf:usedEncoding:error:)") {
 }
 
 NSStringAPIs.test("init(cString_:encoding:)") {
-  expectEqual("foo, a basmati bar!",
-      String(cString: 
-          "foo, a basmati bar!", encoding: String.defaultCStringEncoding))
+  "foo, a basmati bar!".withCString {
+    expectEqual("foo, a basmati bar!",
+        String(cString: $0, encoding: String.defaultCStringEncoding))
+  }
 }
 
 NSStringAPIs.test("init(utf8String:)") {

diff --git a/validation-test/compiler_crashers_2_fixed/rdar81590807.swift b/validation-test/compiler_crashers_2_fixed/rdar81590807.swift
@@ -48,6 +48,7 @@ func run(on object: PFXObject) async throws {
 
 @main struct Main {
   static func main() async throws {
+    _ = JSONDecoder()
     let object = PFXObject()
     try await run(on: object)
   }