Merge pull request #75883 from benlangmuir/stdlib-61-else-branch

benlangmuir · web-flow · commit ccfd7da0200d · 2024-08-15T13:19:49.000-07:00
[stdlib][test] Remove problematic `else` branches in availability checks
diff --git a/test/stdlib/BridgedObjectDebuggerSupport.swift b/test/stdlib/BridgedObjectDebuggerSupport.swift
@@ -80,8 +80,6 @@ StringForPrintObjectTests.test("NSStringUTF8") {
 
   if #available(SwiftStdlib 6.1, *) {
     expectEqual("🏂☃❅❆❄︎⛄️❄️\n", printed)
-  } else {
-    expectEqual("\"🏂☃❅❆❄︎⛄️❄️\"\n", printed)
   }
 
   expectEqual(printed, debug)
diff --git a/test/stdlib/DebuggerSupport.swift b/test/stdlib/DebuggerSupport.swift
@@ -106,11 +106,6 @@ if #available(SwiftStdlib 6.1, *) {
     let printed = _stringForPrintObject("hello\nworld")
     expectEqual(printed, "hello\nworld\n")
   }
-} else {
-  StringForPrintObjectTests.test("String") {
-    let printed = _stringForPrintObject("hello\nworld")
-    expectEqual(printed, "\"hello\\nworld\"\n")
-  }
 }
 
 class RefCountedObj {

Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,6 @@ StringForPrintObjectTests.test("NSStringUTF8") {`
`80`	`80`
`81`	`81`	`if #available(SwiftStdlib 6.1, *) {`
`82`	`82`	`expectEqual("🏂☃❅❆❄︎⛄️❄️\n", printed)`
`83`		`- } else {`
`84`		`- expectEqual("\"🏂☃❅❆❄︎⛄️❄️\"\n", printed)`
`85`	`83`	`}`
`86`	`84`
`87`	`85`	`expectEqual(printed, debug)`
Original file line number	Diff line number	Diff line change
`@@ -106,11 +106,6 @@ if #available(SwiftStdlib 6.1, *) {`
`106`	`106`	`let printed = _stringForPrintObject("hello\nworld")`
`107`	`107`	`expectEqual(printed, "hello\nworld\n")`
`108`	`108`	`}`
`109`		`-} else {`
`110`		`- StringForPrintObjectTests.test("String") {`
`111`		`- let printed = _stringForPrintObject("hello\nworld")`
`112`		`- expectEqual(printed, "\"hello\\nworld\"\n")`
`113`		`- }`
`114`	`109`	`}`
`115`	`110`
`116`	`111`	`class RefCountedObj {`