Refine file structure for Unit tests and Carthage Support

Marxon13 · Oct 14, 2015 · 54ef980 · 54ef980
1 parent d185685
commit 54ef980
Show file tree

Hide file tree

Showing 30 changed files with 312 additions and 593 deletions.
diff --git a/M13OrderedDictionary.xcodeproj/project.pbxproj b/M13OrderedDictionary.xcodeproj/project.pbxproj
diff --git a/M13OrderedDictionary.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/M13OrderedDictionary.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...eredDictionary.xcodeproj/project.xcworkspace/xcshareddata/M13OrderedDictionary.xccheckout b/...eredDictionary.xcodeproj/project.xcworkspace/xcshareddata/M13OrderedDictionary.xccheckout
diff --git a/...odeproj/project.xcworkspace/xcuserdata/Brandon.xcuserdatad/UserInterfaceState.xcuserstate b/...odeproj/project.xcworkspace/xcuserdata/Brandon.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...ad/xcschemes/NSOrderedDictionary.xcscheme → ...a/xcschemes/M13OrderedDictionary.xcscheme b/...ad/xcschemes/NSOrderedDictionary.xcscheme → ...a/xcschemes/M13OrderedDictionary.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,45 +14,59 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "CAC53480167D3EA900E66DFC"
-               BuildableName = "M13OrderedDictionary.app"
+               BlueprintIdentifier = "FEA1B9291BCCE51600ABB2EC"
+               BuildableName = "M13OrderedDictionary"
                BlueprintName = "M13OrderedDictionary"
                ReferencedContainer = "container:M13OrderedDictionary.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "FEA1B9431BCCE56100ABB2EC"
+               BuildableName = "M13OrderedDictionaryTests.xctest"
+               BlueprintName = "M13OrderedDictionaryTests"
+               ReferencedContainer = "container:M13OrderedDictionary.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "CAC53480167D3EA900E66DFC"
-            BuildableName = "M13OrderedDictionary.app"
+            BlueprintIdentifier = "FEA1B9291BCCE51600ABB2EC"
+            BuildableName = "M13OrderedDictionary"
             BlueprintName = "M13OrderedDictionary"
             ReferencedContainer = "container:M13OrderedDictionary.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "CAC53480167D3EA900E66DFC"
-            BuildableName = "M13OrderedDictionary.app"
+            BlueprintIdentifier = "FEA1B9291BCCE51600ABB2EC"
+            BuildableName = "M13OrderedDictionary"
             BlueprintName = "M13OrderedDictionary"
             ReferencedContainer = "container:M13OrderedDictionary.xcodeproj">
          </BuildableReference>
@@ -61,16 +75,17 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "CAC53480167D3EA900E66DFC"
-            BuildableName = "M13OrderedDictionary.app"
+            BlueprintIdentifier = "FEA1B9291BCCE51600ABB2EC"
+            BuildableName = "M13OrderedDictionary"
             BlueprintName = "M13OrderedDictionary"
             ReferencedContainer = "container:M13OrderedDictionary.xcodeproj">
          </BuildableReference>

diff --git a/...eredDictionary.xcodeproj/xcuserdata/Brandon.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/...eredDictionary.xcodeproj/xcuserdata/Brandon.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
diff --git a/...redDictionary.xcodeproj/xcuserdata/Brandon.xcuserdatad/xcschemes/xcschememanagement.plist b/...redDictionary.xcodeproj/xcuserdata/Brandon.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/Makefile b/Makefile
@@ -0,0 +1,14 @@
+XCTOOL=xctool
+SCHEME=M13OrderedDictionary
+XCTOOL_FLAGS=-scheme $(SCHEME)
+
+test: check-xctool clean
+	$(XCTOOL) $(XCTOOL_FLAGS) build-tests 1>/dev/null 2>&1
+	$(XCTOOL) $(XCTOOL_FLAGS) run-tests
+
+clean: check-xctool
+	$(XCTOOL) $(XCTOOL_FLAGS) clean 1>/dev/null 2>&1
+
+check-xctool:
+	which $(XCTOOL) 1>/dev/null 2>&1 || \
+	(echo "\n\n>>> Please install xctool first. (https://github.com/facebook/xctool)\n" && exit 1)
diff --git a/NSOrderedDictionary.xcworkspace/contents.xcworkspacedata b/NSOrderedDictionary.xcworkspace/contents.xcworkspacedata
diff --git a/NSOrderedDictionary.xcworkspace/xcshareddata/NSOrderedDictionary.xccheckout b/NSOrderedDictionary.xcworkspace/xcshareddata/NSOrderedDictionary.xccheckout
diff --git a/...deredDictionary.xcworkspace/xcuserdata/Brandon.xcuserdatad/UserInterfaceState.xcuserstate b/...deredDictionary.xcworkspace/xcuserdata/Brandon.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/NSOrderedDictionary.xcworkspace/xcuserdata/Brandon.xcuserdatad/WorkspaceSettings.xcsettings b/NSOrderedDictionary.xcworkspace/xcuserdata/Brandon.xcuserdatad/WorkspaceSettings.xcsettings
diff --git a/...ictionary.xcworkspace/xcuserdata/Brandon.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...ictionary.xcworkspace/xcuserdata/Brandon.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
diff --git a/NSOrderedDictionary/AppDelegate.h b/NSOrderedDictionary/AppDelegate.h
diff --git a/NSOrderedDictionary/AppDelegate.m b/NSOrderedDictionary/AppDelegate.m
diff --git a/NSOrderedDictionary/[email protected] b/NSOrderedDictionary/[email protected]
diff --git a/NSOrderedDictionary/Default.png b/NSOrderedDictionary/Default.png
diff --git a/NSOrderedDictionary/[email protected] b/NSOrderedDictionary/[email protected]
diff --git a/NSOrderedDictionary/M13OrderedDictionary-Info.plist b/NSOrderedDictionary/M13OrderedDictionary-Info.plist