update integration tests

Author: tomerd

IntegrationTests/Package.swift

@@ -1,13 +1,13 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.4
 
 import PackageDescription
 
 let package = Package(
     name: "IntegrationTests",
     targets: [
         .testTarget(name: "IntegrationTests", dependencies: [
-            "SwiftToolsSupport-auto",
-            "TSCTestSupport"
+            .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
+            .product(name: "TSCTestSupport", package: "swift-tools-support-core")
         ]),
     ]
 )
@@ -20,6 +20,6 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
     ]
 } else {
     package.dependencies += [
-        .package(path: "../TSC"),
+        .package(name: "swift-tools-support-core", path: "../TSC"),
     ]
 }

IntegrationTests/Tests/IntegrationTests/BasicTests.swift

@@ -24,16 +24,12 @@ final class BasicTests: XCTestCase {
             let dealerDir = dir.appending(component: "dealer")
             try sh("git", "clone", "https://github.com/apple/example-package-dealer", dealerDir)
             let build1Output = try sh(swiftBuild, "--package-path", dealerDir).stdout
-
             // Check the build log.
-            XCTAssertContents(build1Output) { checker in
-                checker.check(.contains("Merging module FisherYates"))
-                checker.check(.contains("Merging module Dealer"))
-            }
+            XCTAssertMatch(build1Output, .contains("Build complete"))
 
-            // Verify that the build worked.
-            let dealerOutput = try sh(dealerDir.appending(RelativePath(".build/debug/Dealer"))).stdout
-            XCTAssertMatch(dealerOutput, .regex("(?:(♡|♠|♢|♣)\\s([0-9JQKA]|10)\\n)+"))
+            // Verify that the app works.
+            let dealerOutput = try sh(dealerDir.appending(RelativePath(".build/debug/dealer")), "10").stdout
+            XCTAssertEqual(dealerOutput.filter(\.isPlayingCardSuit).count, 10)
 
             // Verify that the 'git status' is clean after a build.
             try localFileSystem.changeCurrentWorkingDirectory(to: dealerDir)
@@ -42,6 +38,7 @@ final class BasicTests: XCTestCase {
 
             // Verify that another 'swift build' does nothing.
             let build2Output = try sh(swiftBuild, "--package-path", dealerDir).stdout
+            XCTAssertMatch(build2Output, .contains("Build complete"))
             XCTAssertNoMatch(build2Output, .contains("Compiling"))
         }
     }
@@ -317,3 +314,14 @@ final class BasicTests: XCTestCase {
         }
     }
 }
+
+private extension Character {
+    var isPlayingCardSuit: Bool {
+        switch self {
+        case "♠︎", "♡", "♢", "♣︎":
+            return true
+        default:
+            return false
+        }
+    }
+}