Address test availability for current and older OSes

Author: glessard

Tests/FoundationEssentialsTests/DataTests.swift

@@ -1634,11 +1634,9 @@ class DataTests : XCTestCase {
         // source.advanced(by: 5)
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_InlineDataSpan() throws {
-#if compiler(<6.2)
-      throw XCTSkip("Span not available")
-#else
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
         var source = Data()
         var span = source.span
         XCTAssertTrue(span.isEmpty)
@@ -1648,26 +1646,20 @@ class DataTests : XCTestCase {
         XCTAssertFalse(span.isEmpty)
         XCTAssertEqual(span.count, source.count)
         XCTAssertEqual(span[0], 1)
-#endif
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_InlineSliceDataSpan() throws {
-#if compiler(<6.2)
-      throw XCTSkip("Span not available")
-#else
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
         let source = Data(0 ... .max)
         let span = source.span
         XCTAssertEqual(span.count, source.count)
         XCTAssertEqual(span[span.indices.last!], .max)
-#endif
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_LargeSliceDataSpan() throws {
-#if compiler(<6.2)
-      throw XCTSkip("Span not available")
-#else
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
 #if _pointerBitWidth(_64)
         let count = Int(Int32.max)
 #elseif _pointerBitWidth(_32)
@@ -1680,14 +1672,11 @@ class DataTests : XCTestCase {
         XCTAssertNotEqual(source.startIndex, 0)
         let span = source.span
         XCTAssertFalse(span.isEmpty)
-#endif
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_InlineDataMutableSpan() throws {
-#if compiler(<6.2)
-      throw XCTSkip("Span not available")
-#else
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
         var source = Data()
         var span = source.mutableSpan
         XCTAssertTrue(span.isEmpty)
@@ -1701,29 +1690,23 @@ class DataTests : XCTestCase {
         let v = UInt8.random(in: 10..<100)
         span[i] = v
         XCTAssertEqual(source[i], v)
-#endif
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_InlineSliceDataMutableSpan() throws {
-#if compiler(<6.2)
-      throw XCTSkip("Span not available")
-#else
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
         var source = Data(0..<100)
         let count = source.count
         var span = source.mutableSpan
         XCTAssertEqual(span.count, count)
         let i = try XCTUnwrap(span.indices.randomElement())
         span[i] = .max
         XCTAssertEqual(source[i], .max)
-#endif
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_LargeSliceDataMutableSpan() throws {
-#if compiler(<6.2)
-      throw XCTSkip("Span not available")
-#else
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
 #if _pointerBitWidth(_64)
         var count = Int(Int32.max)
 #elseif _pointerBitWidth(_32)
@@ -1741,14 +1724,11 @@ class DataTests : XCTestCase {
         span[i] = .max
         XCTAssertEqual(source[i], 0)
         XCTAssertEqual(source[i+1], .max)
-#endif
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_InlineDataMutableRawSpan() throws {
-#if compiler(<6.2)
-      throw XCTSkip("Span not available")
-#else
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
         var source = Data()
         var span = source.mutableBytes
         XCTAssertTrue(span.isEmpty)
@@ -1762,29 +1742,23 @@ class DataTests : XCTestCase {
         let v = UInt8.random(in: 10..<100)
         span.storeBytes(of: v, toByteOffset: i, as: UInt8.self)
         XCTAssertEqual(source[i], v)
-#endif
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_InlineSliceDataMutableRawSpan() throws {
-#if compiler(<6.2)
-      throw XCTSkip("Span not available")
-#else
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
         var source = Data(0..<100)
         let count = source.count
         var span = source.mutableBytes
         XCTAssertEqual(span.byteCount, count)
         let i = try XCTUnwrap(span.byteOffsets.randomElement())
         span.storeBytes(of: -1, toByteOffset: i, as: Int8.self)
         XCTAssertEqual(source[i], .max)
-#endif
     }
 
-    @available(FoundationSpan 6.2, *)
     func test_LargeSliceDataMutableRawSpan() throws {
-#if compiler(<6.2)
-      throw XCTSkip("Span not available")
-#else
+        guard #available(FoundationSpan 6.2, *) else { throw XCTSkip("Span not available") }
+
 #if _pointerBitWidth(_64)
         var count = Int(Int32.max)
 #elseif _pointerBitWidth(_32)
@@ -1802,7 +1776,6 @@ class DataTests : XCTestCase {
         span.storeBytes(of: -1, toByteOffset: i, as: Int8.self)
         XCTAssertEqual(source[i], 0)
         XCTAssertEqual(source[i+1], .max)
-#endif
     }
 
     #if false // FIXME: XCTest doesn't support crash tests yet rdar://20195010&22387653