Update Swift tools version to 6.0 and refactor test cases to use new …

…testing framework

exercises/practice/matrix/.meta/template.swift

@@ -1,20 +1,22 @@
-import XCTest
+import Testing
+import Foundation
 @testable import {{exercise|camelCase}}
-class {{exercise|camelCase}}Tests: XCTestCase {
-    let runAll = Bool(ProcessInfo.processInfo.environment["RUNALL", default: "false"]) ?? false
 
+let RUNALL = Bool(ProcessInfo.processInfo.environment["RUNALL", default: "false"]) ?? false
+
+@Suite struct {{exercise|camelCase}}Tests {
     {% for case in cases %}
     {% if forloop.first -%}
-        func test{{case.description |camelCase }}() {
+        @Test("{{case.description}}")
     {% else -%}
-        func test{{case.description |camelCase }}() throws {
-        try XCTSkipIf(true && !runAll) // change true to false to run this test
+        @Test("{{case.description}}", .enabled(if: RUNALL))
     {% endif -%}
+    func test{{case.description |camelCase }}() {
         let matrix = Matrix("{{case.input.string | inspect}}")
         {% if case.property == "row" -%}
-        XCTAssertEqual({{case.expected}}, matrix.rows[{{case.input.index | minus: 1}}])
+        #expect({{case.expected}} == matrix.rows[{{case.input.index | minus: 1}}])
         {% else -%}
-        XCTAssertEqual({{case.expected}}, matrix.columns[{{case.input.index | minus: 1}}])
+        #expect({{case.expected}} == matrix.columns[{{case.input.index | minus: 1}}])
         {% endif -%}
     }
     {% endfor -%}

exercises/practice/matrix/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:6.0
 
 import PackageDescription
 

exercises/practice/matrix/Tests/MatrixTests/MatrixTests.swift

@@ -1,54 +1,57 @@
-import XCTest
+import Foundation
+import Testing
 
 @testable import Matrix
 
-class MatrixTests: XCTestCase {
-  let runAll = Bool(ProcessInfo.processInfo.environment["RUNALL", default: "false"]) ?? false
+let RUNALL = Bool(ProcessInfo.processInfo.environment["RUNALL", default: "false"]) ?? false
 
+@Suite struct MatrixTests {
+
+  @Test("extract row from one number matrix")
   func testExtractRowFromOneNumberMatrix() {
     let matrix = Matrix("1")
-    XCTAssertEqual([1], matrix.rows[0])
+    #expect([1] == matrix.rows[0])
   }
 
-  func testCanExtractRow() throws {
-    try XCTSkipIf(true && !runAll)  // change true to false to run this test
+  @Test("can extract row", .enabled(if: RUNALL))
+  func testCanExtractRow() {
     let matrix = Matrix("1 2\n3 4")
-    XCTAssertEqual([3, 4], matrix.rows[1])
+    #expect([3, 4] == matrix.rows[1])
   }
 
-  func testExtractRowWhereNumbersHaveDifferentWidths() throws {
-    try XCTSkipIf(true && !runAll)  // change true to false to run this test
+  @Test("extract row where numbers have different widths", .enabled(if: RUNALL))
+  func testExtractRowWhereNumbersHaveDifferentWidths() {
     let matrix = Matrix("1 2\n10 20")
-    XCTAssertEqual([10, 20], matrix.rows[1])
+    #expect([10, 20] == matrix.rows[1])
   }
 
-  func testCanExtractRowFromNonSquareMatrixWithNoCorrespondingColumn() throws {
-    try XCTSkipIf(true && !runAll)  // change true to false to run this test
+  @Test("can extract row from non-square matrix with no corresponding column", .enabled(if: RUNALL))
+  func testCanExtractRowFromNonSquareMatrixWithNoCorrespondingColumn() {
     let matrix = Matrix("1 2 3\n4 5 6\n7 8 9\n8 7 6")
-    XCTAssertEqual([8, 7, 6], matrix.rows[3])
+    #expect([8, 7, 6] == matrix.rows[3])
   }
 
-  func testExtractColumnFromOneNumberMatrix() throws {
-    try XCTSkipIf(true && !runAll)  // change true to false to run this test
+  @Test("extract column from one number matrix", .enabled(if: RUNALL))
+  func testExtractColumnFromOneNumberMatrix() {
     let matrix = Matrix("1")
-    XCTAssertEqual([1], matrix.columns[0])
+    #expect([1] == matrix.columns[0])
   }
 
-  func testCanExtractColumn() throws {
-    try XCTSkipIf(true && !runAll)  // change true to false to run this test
+  @Test("can extract column", .enabled(if: RUNALL))
+  func testCanExtractColumn() {
     let matrix = Matrix("1 2 3\n4 5 6\n7 8 9")
-    XCTAssertEqual([3, 6, 9], matrix.columns[2])
+    #expect([3, 6, 9] == matrix.columns[2])
   }
 
-  func testCanExtractColumnFromNonSquareMatrixWithNoCorrespondingRow() throws {
-    try XCTSkipIf(true && !runAll)  // change true to false to run this test
+  @Test("can extract column from non-square matrix with no corresponding row", .enabled(if: RUNALL))
+  func testCanExtractColumnFromNonSquareMatrixWithNoCorrespondingRow() {
     let matrix = Matrix("1 2 3 4\n5 6 7 8\n9 8 7 6")
-    XCTAssertEqual([4, 8, 6], matrix.columns[3])
+    #expect([4, 8, 6] == matrix.columns[3])
   }
 
-  func testExtractColumnWhereNumbersHaveDifferentWidths() throws {
-    try XCTSkipIf(true && !runAll)  // change true to false to run this test
+  @Test("extract column where numbers have different widths", .enabled(if: RUNALL))
+  func testExtractColumnWhereNumbersHaveDifferentWidths() {
     let matrix = Matrix("89 1903 3\n18 3 1\n9 4 800")
-    XCTAssertEqual([1903, 3, 4], matrix.columns[1])
+    #expect([1903, 3, 4] == matrix.columns[1])
   }
 }

exercises/practice/meetup/.meta/template.swift

@@ -1,17 +1,19 @@
-import XCTest
+import Testing
+import Foundation
 @testable import {{exercise|camelCase}}
-class {{exercise|camelCase}}Tests: XCTestCase {
-    let runAll = Bool(ProcessInfo.processInfo.environment["RUNALL", default: "false"]) ?? false
 
+let RUNALL = Bool(ProcessInfo.processInfo.environment["RUNALL", default: "false"]) ?? false
+
+@Suite struct {{exercise|camelCase}}Tests {
     {% for case in cases %}
     {% if forloop.first -%}
-        func test{{case.description |camelCase }}() {
+        @Test("{{case.description}}")
     {% else -%}
-        func test{{case.description |camelCase }}() throws {
-        try XCTSkipIf(true && !runAll) // change true to false to run this test
+        @Test("{{case.description}}", .enabled(if: RUNALL))
     {% endif -%}
+    func test{{case.description |camelCase }}() {
         let meetUp = Meetup(year: {{case.input.year}}, month: {{case.input.month}}, week: "{{case.input.week}}", weekday: "{{case.input.dayofweek}}")
-        XCTAssertEqual(meetUp.description, "{{case.expected}}")
+        #expect(meetUp.description == "{{case.expected}}")
     }
     {% endfor -%}
 }

exercises/practice/meetup/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.3
+// swift-tools-version:6.0
 
 import PackageDescription