Skip to content

Commit c2a10a9

Browse files
authored
Add support for Firestore unit tests on macOS (#2641)
* Rename Firestore/Example/App/macOS_example to macOS * Update paths to macOS and names to Firestore_Example_macOS * Add Firestore_Tests_macOS target This uses a shared Tests Info.plist. This is important because it configures NSPrincipalClass * Teach sync_project about Firestore_Tests_macOS * Add files to Firestore_Tests_macOS * Add Firestore_Tests_macOS target to the Podfile * Add HEADER_SEARCH_PATHS to match iOS * Force C99/C++11 conformance * pod install after adding Firestore_Tests_macOS * Get macOS tests to link * Add spec test json files to the macOS tests * Remove development code signing * Disable app sandboxing to allow GoogleTest death tests to succeed.
1 parent 97a7c47 commit c2a10a9

File tree

13 files changed

+868
-70
lines changed

13 files changed

+868
-70
lines changed

Firestore/Example/App/macOS_example/Base.lproj/MainMenu.xib renamed to Firestore/Example/App/macOS/Base.lproj/MainMenu.xib

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
2020
<menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
2121
<items>
22-
<menuItem title="macOS_example" id="1Xt-HY-uBw">
22+
<menuItem title="Firestore_Example_macOS" id="1Xt-HY-uBw">
2323
<modifierMask key="keyEquivalentModifierMask"/>
24-
<menu key="submenu" title="macOS_example" systemMenu="apple" id="uQy-DD-JDr">
24+
<menu key="submenu" title="Firestore_Example_macOS" systemMenu="apple" id="uQy-DD-JDr">
2525
<items>
26-
<menuItem title="About macOS_example" id="5kV-Vb-QxS">
26+
<menuItem title="About Firestore_Example_macOS" id="5kV-Vb-QxS">
2727
<modifierMask key="keyEquivalentModifierMask"/>
2828
<connections>
2929
<action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
@@ -37,7 +37,7 @@
3737
<menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
3838
</menuItem>
3939
<menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
40-
<menuItem title="Hide macOS_example" keyEquivalent="h" id="Olw-nP-bQN">
40+
<menuItem title="Hide Firestore_Example_macOS" keyEquivalent="h" id="Olw-nP-bQN">
4141
<connections>
4242
<action selector="hide:" target="-1" id="PnN-Uc-m68"/>
4343
</connections>
@@ -55,7 +55,7 @@
5555
</connections>
5656
</menuItem>
5757
<menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
58-
<menuItem title="Quit macOS_example" keyEquivalent="q" id="4sb-4s-VLi">
58+
<menuItem title="Quit Firestore_Example_macOS" keyEquivalent="q" id="4sb-4s-VLi">
5959
<connections>
6060
<action selector="terminate:" target="-1" id="Te7-pn-YzF"/>
6161
</connections>
@@ -668,7 +668,7 @@
668668
<modifierMask key="keyEquivalentModifierMask"/>
669669
<menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
670670
<items>
671-
<menuItem title="macOS_example Help" keyEquivalent="?" id="FKE-Sm-Kum">
671+
<menuItem title="Firestore_Example_macOS Help" keyEquivalent="?" id="FKE-Sm-Kum">
672672
<connections>
673673
<action selector="showHelp:" target="-1" id="y7X-2Q-9no"/>
674674
</connections>
@@ -678,7 +678,7 @@
678678
</menuItem>
679679
</items>
680680
</menu>
681-
<window title="macOS_example" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g">
681+
<window title="Firestore_Example_macOS" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g">
682682
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
683683
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
684684
<rect key="contentRect" x="335" y="390" width="480" height="360"/>

Firestore/Example/App/macOS_example/macOS_example.entitlements renamed to Firestore/Example/App/macOS/macOS.entitlements

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>com.apple.security.app-sandbox</key>
6-
<true/>
6+
<false/>
77
<key>com.apple.security.files.user-selected.read-only</key>
88
<true/>
99
<key>com.apple.security.network.client</key>

Firestore/Example/Firestore.xcodeproj/project.pbxproj

Lines changed: 644 additions & 47 deletions
Large diffs are not rendered by default.
Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1010"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "DAFF0CF421E64AC30062958F"
18+
BuildableName = "Firestore_Example_macOS.app"
19+
BlueprintName = "Firestore_Example_macOS"
20+
ReferencedContainer = "container:Firestore.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "544AB1912248072200F851E6"
36+
BuildableName = "Firestore_Tests_macOS.xctest"
37+
BlueprintName = "Firestore_Tests_macOS"
38+
ReferencedContainer = "container:Firestore.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
<MacroExpansion>
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "DAFF0CF421E64AC30062958F"
46+
BuildableName = "Firestore_Example_macOS.app"
47+
BlueprintName = "Firestore_Example_macOS"
48+
ReferencedContainer = "container:Firestore.xcodeproj">
49+
</BuildableReference>
50+
</MacroExpansion>
51+
<AdditionalOptions>
52+
</AdditionalOptions>
53+
</TestAction>
54+
<LaunchAction
55+
buildConfiguration = "Debug"
56+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
57+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
58+
launchStyle = "0"
59+
useCustomWorkingDirectory = "NO"
60+
ignoresPersistentStateOnLaunch = "NO"
61+
debugDocumentVersioning = "YES"
62+
debugServiceExtension = "internal"
63+
allowLocationSimulation = "YES">
64+
<BuildableProductRunnable
65+
runnableDebuggingMode = "0">
66+
<BuildableReference
67+
BuildableIdentifier = "primary"
68+
BlueprintIdentifier = "DAFF0CF421E64AC30062958F"
69+
BuildableName = "Firestore_Example_macOS.app"
70+
BlueprintName = "Firestore_Example_macOS"
71+
ReferencedContainer = "container:Firestore.xcodeproj">
72+
</BuildableReference>
73+
</BuildableProductRunnable>
74+
<AdditionalOptions>
75+
</AdditionalOptions>
76+
</LaunchAction>
77+
<ProfileAction
78+
buildConfiguration = "Release"
79+
shouldUseLaunchSchemeArgsEnv = "YES"
80+
savedToolIdentifier = ""
81+
useCustomWorkingDirectory = "NO"
82+
debugDocumentVersioning = "YES">
83+
<BuildableProductRunnable
84+
runnableDebuggingMode = "0">
85+
<BuildableReference
86+
BuildableIdentifier = "primary"
87+
BlueprintIdentifier = "DAFF0CF421E64AC30062958F"
88+
BuildableName = "Firestore_Example_macOS.app"
89+
BlueprintName = "Firestore_Example_macOS"
90+
ReferencedContainer = "container:Firestore.xcodeproj">
91+
</BuildableReference>
92+
</BuildableProductRunnable>
93+
</ProfileAction>
94+
<AnalyzeAction
95+
buildConfiguration = "Debug">
96+
</AnalyzeAction>
97+
<ArchiveAction
98+
buildConfiguration = "Release"
99+
revealArchiveInOrganizer = "YES">
100+
</ArchiveAction>
101+
</Scheme>

0 commit comments

Comments
 (0)