Address test availability for current and older OSes

Author: glessard

Package.swift

@@ -10,7 +10,7 @@ let availabilityTags: [_Availability] = [
     _Availability("FoundationPreview"), // Default FoundationPreview availability,
     _Availability("FoundationPredicate"), // Predicate relies on pack parameter runtime support
     _Availability("FoundationPredicateRegex"), // Predicate regexes rely on new stdlib APIs
-    _Availability("FoundationSpan"), // Availability of Span types
+    _Availability("FoundationSpan", availability: .future), // Availability of Span types
 ]
 let versionNumbers = ["0.1", "0.2", "0.3", "0.4", "6.0.2", "6.1", "6.2"]
 

Tests/FoundationEssentialsTests/DataTests.swift

@@ -1636,6 +1636,9 @@ class DataTests : XCTestCase {
 
     @available(FoundationSpan 6.2, *)
     func test_InlineDataSpan() throws {
+#if compiler(<6.2)
+      throw XCTSkip("Span not available")
+#else
         var source = Data()
         var span = source.span
         XCTAssertTrue(span.isEmpty)
@@ -1645,18 +1648,26 @@ 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
         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
 #if _pointerBitWidth(_64)
         let count = Int(Int32.max)
 #elseif _pointerBitWidth(_32)
@@ -1669,10 +1680,14 @@ 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
         var source = Data()
         var span = source.mutableSpan
         XCTAssertTrue(span.isEmpty)
@@ -1686,28 +1701,36 @@ 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
         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 _pointerBitWidth(_64)
+#if compiler(<6.2)
+      throw XCTSkip("Span not available")
+#else
+#if _pointerBitWidth(_64)
         var count = Int(Int32.max)
-  #elseif _pointerBitWidth(_32)
+#elseif _pointerBitWidth(_32)
         var count = Int(Int16.max)
-  #else
+#else
         #error("This test needs updating")
-  #endif
+#endif
 
         var source = Data(repeating: 0, count: count).dropFirst()
         XCTAssertNotEqual(source.startIndex, 0)
@@ -1718,10 +1741,14 @@ 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
         var source = Data()
         var span = source.mutableBytes
         XCTAssertTrue(span.isEmpty)
@@ -1735,21 +1762,29 @@ 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
         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
 #if _pointerBitWidth(_64)
         var count = Int(Int32.max)
 #elseif _pointerBitWidth(_32)
@@ -1767,6 +1802,7 @@ 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