From dd44644da91d8460afc81fde1249592f06736447 Mon Sep 17 00:00:00 2001 From: Matthew Fennell Date: Sat, 18 Jan 2025 14:50:53 +0000 Subject: [PATCH] Set product name for MonalUITests XCTest prepends the product name to the name of the .xctest file. For instance - if the target's product name is xyz, the xctest file would be named xyz.xctest. Since we have multiple test targets in the project, the lack of a product name caused two xctest files to be generated with the same name, and copied to the same build location. This caused build errors when trying to run the test targets. Therefore - ensure there is a product name provided for each test target, so that we can build and run the tests. --- Monal/Monal.xcodeproj/project.pbxproj | 12 +++++++++--- .../xcshareddata/xcschemes/Monal Tests.xcscheme | 8 ++++---- .../xcshareddata/xcschemes/Monal.xcscheme | 2 +- .../xcschemes/NotificaionService.xcscheme | 2 +- .../xcshareddata/xcschemes/Quicksy.xcscheme | 2 +- .../xcshareddata/xcschemes/shareSheet.xcscheme | 2 +- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Monal/Monal.xcodeproj/project.pbxproj b/Monal/Monal.xcodeproj/project.pbxproj index 1bbab876ce..57e43f98ff 100644 --- a/Monal/Monal.xcodeproj/project.pbxproj +++ b/Monal/Monal.xcodeproj/project.pbxproj @@ -694,7 +694,7 @@ C16D18342792A4AF00F869A0 /* DataLayerMigrations.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DataLayerMigrations.m; sourceTree = ""; }; C176F1EB2AF11C31002034E5 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.0.sdk/System/Library/Frameworks/UserNotifications.framework; sourceTree = DEVELOPER_DIR; }; C1850E6625F37EC0003D506A /* Monal Tests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Monal Tests-Bridging-Header.h"; sourceTree = ""; }; - C1850EB525F38A2D003D506A /* .xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = .xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + C1850EB525F38A2D003D506A /* MonalUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MonalUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; C1850EB725F38A2D003D506A /* MonalUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonalUITests.swift; sourceTree = ""; }; C1850EB925F38A2D003D506A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; C1850EC525F3C5EB003D506A /* TestHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestHelper.swift; sourceTree = ""; }; @@ -903,7 +903,7 @@ 26AA70112146BBB800598605 /* shareSheet.appex */, 260773C0232FC4E800BFD50F /* NotificationService.appex */, 26CC579223A0867400ABB92A /* monalxmpp.framework */, - C1850EB525F38A2D003D506A /* .xctest */, + C1850EB525F38A2D003D506A /* MonalUITests.xctest */, C1049186261301530054AC9E /* MonalXMPPUnitTests.xctest */, ); name = Products; @@ -1700,7 +1700,7 @@ ); name = MonalUITests; productName = MonalUITests; - productReference = C1850EB525F38A2D003D506A /* .xctest */; + productReference = C1850EB525F38A2D003D506A /* MonalUITests.xctest */; productType = "com.apple.product-type.bundle.ui-testing"; }; /* End PBXNativeTarget section */ @@ -3751,6 +3751,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + PRODUCT_NAME = MonalUITests; STRIP_INSTALLED_PRODUCT = NO; STRIP_SWIFT_SYMBOLS = NO; TEST_TARGET_NAME = Monal; @@ -4108,6 +4109,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + PRODUCT_NAME = MonalUITests; STRIP_INSTALLED_PRODUCT = NO; STRIP_SWIFT_SYMBOLS = NO; TEST_TARGET_NAME = Monal; @@ -4199,6 +4201,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + PRODUCT_NAME = MonalUITests; STRIP_INSTALLED_PRODUCT = NO; STRIP_SWIFT_SYMBOLS = NO; TEST_TARGET_NAME = Monal; @@ -4217,6 +4220,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + PRODUCT_NAME = MonalUITests; STRIP_INSTALLED_PRODUCT = NO; STRIP_SWIFT_SYMBOLS = NO; TEST_TARGET_NAME = Monal; @@ -4236,6 +4240,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + PRODUCT_NAME = MonalUITests; STRIP_INSTALLED_PRODUCT = NO; STRIP_SWIFT_SYMBOLS = NO; TEST_TARGET_NAME = Monal; @@ -4520,6 +4525,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + PRODUCT_NAME = MonalUITests; STRIP_INSTALLED_PRODUCT = NO; STRIP_SWIFT_SYMBOLS = NO; TEST_TARGET_NAME = Monal; diff --git a/Monal/Monal.xcodeproj/xcshareddata/xcschemes/Monal Tests.xcscheme b/Monal/Monal.xcodeproj/xcshareddata/xcschemes/Monal Tests.xcscheme index 104c7237e4..81a3cd4d48 100644 --- a/Monal/Monal.xcodeproj/xcshareddata/xcschemes/Monal Tests.xcscheme +++ b/Monal/Monal.xcodeproj/xcshareddata/xcschemes/Monal Tests.xcscheme @@ -33,7 +33,7 @@ @@ -43,7 +43,7 @@ @@ -53,7 +53,7 @@ @@ -63,7 +63,7 @@ diff --git a/Monal/Monal.xcodeproj/xcshareddata/xcschemes/Monal.xcscheme b/Monal/Monal.xcodeproj/xcshareddata/xcschemes/Monal.xcscheme index ef87982de0..0e2d608417 100644 --- a/Monal/Monal.xcodeproj/xcshareddata/xcschemes/Monal.xcscheme +++ b/Monal/Monal.xcodeproj/xcshareddata/xcschemes/Monal.xcscheme @@ -71,7 +71,7 @@ diff --git a/Monal/Monal.xcodeproj/xcshareddata/xcschemes/NotificaionService.xcscheme b/Monal/Monal.xcodeproj/xcshareddata/xcschemes/NotificaionService.xcscheme index 4807841ff9..58a2463944 100644 --- a/Monal/Monal.xcodeproj/xcshareddata/xcschemes/NotificaionService.xcscheme +++ b/Monal/Monal.xcodeproj/xcshareddata/xcschemes/NotificaionService.xcscheme @@ -48,7 +48,7 @@ diff --git a/Monal/Monal.xcodeproj/xcshareddata/xcschemes/Quicksy.xcscheme b/Monal/Monal.xcodeproj/xcshareddata/xcschemes/Quicksy.xcscheme index 758703552c..808f0b816c 100644 --- a/Monal/Monal.xcodeproj/xcshareddata/xcschemes/Quicksy.xcscheme +++ b/Monal/Monal.xcodeproj/xcshareddata/xcschemes/Quicksy.xcscheme @@ -71,7 +71,7 @@ diff --git a/Monal/Monal.xcodeproj/xcshareddata/xcschemes/shareSheet.xcscheme b/Monal/Monal.xcodeproj/xcshareddata/xcschemes/shareSheet.xcscheme index f89e8f8682..11059e207f 100644 --- a/Monal/Monal.xcodeproj/xcshareddata/xcschemes/shareSheet.xcscheme +++ b/Monal/Monal.xcodeproj/xcshareddata/xcschemes/shareSheet.xcscheme @@ -48,7 +48,7 @@