From e8931d5cf5a1cf94c99e344216df1a20b1c4433a Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Mon, 21 Apr 2025 20:35:27 -0700
Subject: [PATCH] Create and use NetNewsWire.xctestplan.

---
 NetNewsWire.xcodeproj/project.pbxproj         |  2 +
 .../xcschemes/NetNewsWire.xcscheme            | 36 +++++++++++
 NetNewsWire.xctestplan                        | 60 +++++++++++++++++++
 build_and_test.sh                             | 13 ----
 4 files changed, 98 insertions(+), 13 deletions(-)
 create mode 100644 NetNewsWire.xctestplan

diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj
index aca9c453e..a1618f8a6 100644
--- a/NetNewsWire.xcodeproj/project.pbxproj
+++ b/NetNewsWire.xcodeproj/project.pbxproj
@@ -793,6 +793,7 @@
 		8483630A2262A3F000DA1D35 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Mac/Base.lproj/RenameSheet.xib; sourceTree = SOURCE_ROOT; };
 		848B937121C8C5540038DC0D /* CrashReporter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrashReporter.swift; sourceTree = "<group>"; };
 		848D578D21543519005FFAD5 /* PasteboardWebFeed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteboardWebFeed.swift; sourceTree = "<group>"; };
+		848E84CA2DB743FF0023F3BA /* NetNewsWire.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = NetNewsWire.xctestplan; sourceTree = "<group>"; };
 		848F6AE41FC29CFA002D422E /* FaviconDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FaviconDownloader.swift; sourceTree = "<group>"; };
 		849A97421ED9EAA9007D329B /* AddFolderWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddFolderWindowController.swift; sourceTree = "<group>"; };
 		849A97511ED9EAC0007D329B /* AddFeedController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AddFeedController.swift; path = AddFeed/AddFeedController.swift; sourceTree = "<group>"; };
@@ -1524,6 +1525,7 @@
 			children = (
 				845B14A51FC2299E0013CF92 /* README.md */,
 				84D2200922B0BC4B0019E085 /* CONTRIBUTING.md */,
+				848E84CA2DB743FF0023F3BA /* NetNewsWire.xctestplan */,
 				84CBDDAE1FD3674C005A61AA /* Technotes */,
 				84C9FC6522629B3900D921D6 /* Mac */,
 				84A6CFB52D1B4EC500F23315 /* iOS */,
diff --git a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme
index 286282c9c..b7afae64f 100644
--- a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme
+++ b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme
@@ -45,6 +45,12 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:NetNewsWire.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -66,6 +72,36 @@
                ReferencedContainer = "container:Account">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "RSParserTests"
+               BuildableName = "RSParserTests"
+               BlueprintName = "RSParserTests"
+               ReferencedContainer = "container:RSParser">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "RSWebTests"
+               BuildableName = "RSWebTests"
+               BlueprintName = "RSWebTests"
+               ReferencedContainer = "container:RSWeb">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "CoreTests"
+               BuildableName = "CoreTests"
+               BlueprintName = "CoreTests"
+               ReferencedContainer = "container:Core">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction
diff --git a/NetNewsWire.xctestplan b/NetNewsWire.xctestplan
new file mode 100644
index 000000000..967295866
--- /dev/null
+++ b/NetNewsWire.xctestplan
@@ -0,0 +1,60 @@
+{
+  "configurations" : [
+    {
+      "id" : "E3EAB586-DD9D-4FD6-943C-7C11807952DD",
+      "name" : "Configuration 1",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "codeCoverage" : false,
+    "targetForVariableExpansion" : {
+      "containerPath" : "container:NetNewsWire.xcodeproj",
+      "identifier" : "849C645F1ED37A5D003D8FC0",
+      "name" : "NetNewsWire"
+    }
+  },
+  "testTargets" : [
+    {
+      "skippedTests" : [
+        "ScriptingTests\/testFeedOPML()"
+      ],
+      "target" : {
+        "containerPath" : "container:NetNewsWire.xcodeproj",
+        "identifier" : "849C64701ED37A5D003D8FC0",
+        "name" : "NetNewsWireTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:Account",
+        "identifier" : "AccountTests",
+        "name" : "AccountTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:RSParser",
+        "identifier" : "RSParserTests",
+        "name" : "RSParserTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:RSWeb",
+        "identifier" : "RSWebTests",
+        "name" : "RSWebTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:Core",
+        "identifier" : "CoreTests",
+        "name" : "CoreTests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/build_and_test.sh b/build_and_test.sh
index ec45c7a3b..32c739da8 100755
--- a/build_and_test.sh
+++ b/build_and_test.sh
@@ -41,17 +41,4 @@ xcodebuild \
   -destination "$DESTINATION_IOS" \
   test | xcbeautify
 
-echo "🔎 Running Swift Package tests..."
-
-
-# Run `swift test` for each directory containing a Package.swift
-find . -type f -name Package.swift | while read -r package_file; do
-  package_dir=$(dirname "$package_file")
-  echo "📦 Testing package in: $package_dir"
-  pushd "$package_dir" > /dev/null
-  swift test
-  popd > /dev/null
-done
-
-echo "🎉 All builds and tests completed successfully."
 echo "🎉 All builds and tests completed successfully."