Use syntaxes and themes in main bundle for test

coteditor · Oct 20, 2024 · 4d1a43b · 4d1a43b
1 parent 4c8242d
commit 4d1a43b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/CotEditor.xcodeproj/project.pbxproj b/CotEditor.xcodeproj/project.pbxproj
@@ -104,14 +104,6 @@
 			);
 			target = 8D15AC270486D014006FF6A4 /* CotEditor -Sparkle */;
 		};
-		2AEBC8B42CBB745800230895 /* Exceptions for "CotEditor" folder in "Tests" target */ = {
-			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
-			membershipExceptions = (
-				Resources/Syntaxes,
-				Resources/Themes,
-			);
-			target = 2AC71DDE1BF0BDBC002E1434 /* Tests */;
-		};
 /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
 
 /* Begin PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet section */
@@ -164,7 +156,6 @@
 				2AEBC8B12CBB745800230895 /* Exceptions for "CotEditor" folder in "Copy Command-Line Tools" phase from "CotEditor" target */,
 				2AEBC8B22CBB745800230895 /* Exceptions for "CotEditor" folder in "CotEditor -Sparkle" target */,
 				2AEBC8B32CBB745800230895 /* Exceptions for "CotEditor" folder in "Copy Command-Line Tools" phase from "CotEditor -Sparkle" target */,
-				2AEBC8B42CBB745800230895 /* Exceptions for "CotEditor" folder in "Tests" target */,
 			);
 			explicitFileTypes = {
 				Resources/cot = text.script.python;

diff --git a/Tests/Sources/Models/SyntaxTests.swift b/Tests/Sources/Models/SyntaxTests.swift
@@ -38,8 +38,7 @@ actor SyntaxTests {
 
     init() throws {
 
-        let bundle = Bundle(for: type(of: self))
-        let urls = try #require(bundle.urls(forResourcesWithExtension: "yml", subdirectory: "Syntaxes"))
+        let urls = try #require(Bundle.main.urls(forResourcesWithExtension: "yml", subdirectory: "Syntaxes"))
 
         // load syntaxes
         let decoder = YAMLDecoder()

diff --git a/Tests/Sources/Models/ThemeTests.swift b/Tests/Sources/Models/ThemeTests.swift
@@ -81,7 +81,7 @@ actor ThemeTests {
     /// Tests if all of bundled themes are valid.
     @Test func bundledThemes() throws {
 
-        let themeDirectoryURL = try #require(Bundle(for: type(of: self)).url(forResource: self.themeDirectoryName, withExtension: nil))
+        let themeDirectoryURL = try #require(Bundle.main.url(forResource: self.themeDirectoryName, withExtension: nil))
         let urls = try FileManager.default.contentsOfDirectory(at: themeDirectoryURL, includingPropertiesForKeys: nil, options: [.skipsSubdirectoryDescendants, .skipsHiddenFiles])
             .filter { UTType.cotTheme.preferredFilenameExtension == $0.pathExtension }
 
@@ -100,7 +100,7 @@ private extension ThemeTests {
     func loadThemeWithName(_ name: String) throws -> Theme {
 
         guard
-            let url = Bundle(for: type(of: self)).url(forResource: name, withExtension: UTType.cotTheme.preferredFilenameExtension, subdirectory: self.themeDirectoryName)
+            let url = Bundle.main.url(forResource: name, withExtension: UTType.cotTheme.preferredFilenameExtension, subdirectory: self.themeDirectoryName)
         else { throw CocoaError(.fileNoSuchFile) }
 
         return try Theme(contentsOf: url)