Merge pull request #1563 from danielgindi/single-test-target

Single test target to make coverage easier
ChartsOrg · Sep 27, 2016 · 873c4eb · 873c4eb
2 parents 3a2da1b + c420794
commit 873c4eb
Show file tree

Hide file tree

Showing 39 changed files with 135 additions and 184 deletions.
diff --git a/Charts.xcodeproj/project.pbxproj b/Charts.xcodeproj/project.pbxproj
diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme b/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme
@@ -29,16 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "06165F2D1D8110E600722320"
-               BuildableName = "ChartsTests.xctest"
-               BlueprintName = "ChartsTests"
-               ReferencedContainer = "container:Charts.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
@@ -71,13 +61,6 @@
             ReferencedContainer = "container:Charts.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "FB_REFERENCE_IMAGE_DIR"
-            value = "$(SOURCE_ROOT)/Tests/Charts/ReferenceImages"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/ChartsRealm.xcscheme b/Charts.xcodeproj/xcshareddata/xcschemes/ChartsRealm.xcscheme
@@ -29,16 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "06B120FE1D811F1600D14B02"
-               BuildableName = "ChartsRealmTests.xctest"
-               BlueprintName = "ChartsRealmTests"
-               ReferencedContainer = "container:Charts.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
@@ -71,13 +61,6 @@
             ReferencedContainer = "container:Charts.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "FB_REFERENCE_IMAGE_DIR"
-            value = "$(SOURCE_ROOT)/Tests/ChartsRealm/ReferenceImages"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

diff --git a/Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme b/Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0800"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "06165F2D1D8110E600722320"
+               BuildableName = "ChartsTests.xctest"
+               BlueprintName = "ChartsTests"
+               ReferencedContainer = "container:Charts.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "06165F2D1D8110E600722320"
+               BuildableName = "ChartsTests.xctest"
+               BlueprintName = "ChartsTests"
+               ReferencedContainer = "container:Charts.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "06165F2D1D8110E600722320"
+            BuildableName = "ChartsTests.xctest"
+            BlueprintName = "ChartsTests"
+            ReferencedContainer = "container:Charts.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "FB_REFERENCE_IMAGE_DIR"
+            value = "$(SOURCE_ROOT)/Tests/ReferenceImages"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "06165F2D1D8110E600722320"
+            BuildableName = "ChartsTests.xctest"
+            BlueprintName = "ChartsTests"
+            ReferencedContainer = "container:Charts.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Rakefile b/Rakefile
@@ -19,8 +19,7 @@ end
 
 def schemes
   [
-    "Charts" #,
-    # "ChartsRealm"
+    "ChartsTests"
   ]
 end
 

diff --git a/Tests/ChartsRealm/ChartsRealmTest.swift b/Tests/ChartsRealm/ChartsRealmTest.swift
@@ -1,8 +1,9 @@
 import XCTest
 import FBSnapshotTestCase
-@testable import Charts
+import Charts
+@testable import ChartsRealm
 
-class BarChartTests: FBSnapshotTestCase
+class ChartsRealmTest: FBSnapshotTestCase
 {
     override func setUp()
     {

diff --git a/...Tests.BarChartTests/testDefaultValues.png → ...Tests.BarChartTests/testDefaultValues.png b/...Tests.BarChartTests/testDefaultValues.png → ...Tests.BarChartTests/testDefaultValues.png
diff --git a/...ts.BarChartTests/[email protected] → ...ts.BarChartTests/[email protected] b/...ts.BarChartTests/[email protected] → ...ts.BarChartTests/[email protected]
diff --git a/...ts.BarChartTests/[email protected] → ...ts.BarChartTests/[email protected] b/...ts.BarChartTests/[email protected] → ...ts.BarChartTests/[email protected]
diff --git a/...hartTests/testHideHorizontalGridlines.png → ...hartTests/testHideHorizontalGridlines.png b/...hartTests/testHideHorizontalGridlines.png → ...hartTests/testHideHorizontalGridlines.png
diff --git a/...tTests/[email protected] → ...tTests/[email protected] b/...tTests/[email protected] → ...tTests/[email protected]
diff --git a/...tTests/[email protected] → ...tTests/[email protected] b/...tTests/[email protected] → ...tTests/[email protected]
diff --git a/...sTests.BarChartTests/testHideLeftAxis.png → ...sTests.BarChartTests/testHideLeftAxis.png b/...sTests.BarChartTests/testHideLeftAxis.png → ...sTests.BarChartTests/testHideLeftAxis.png
diff --git a/...sts.BarChartTests/[email protected] → ...sts.BarChartTests/[email protected] b/...sts.BarChartTests/[email protected] → ...sts.BarChartTests/[email protected]
diff --git a/...sts.BarChartTests/[email protected] → ...sts.BarChartTests/[email protected] b/...sts.BarChartTests/[email protected] → ...sts.BarChartTests/[email protected]
diff --git a/...Tests.BarChartTests/testHideRightAxis.png → ...Tests.BarChartTests/testHideRightAxis.png b/...Tests.BarChartTests/testHideRightAxis.png → ...Tests.BarChartTests/testHideRightAxis.png
diff --git a/...ts.BarChartTests/[email protected] → ...ts.BarChartTests/[email protected] b/...ts.BarChartTests/[email protected] → ...ts.BarChartTests/[email protected]
diff --git a/...ts.BarChartTests/[email protected] → ...ts.BarChartTests/[email protected] b/...ts.BarChartTests/[email protected] → ...ts.BarChartTests/[email protected]
diff --git a/...rChartTests/testHideVerticalGridlines.png → ...rChartTests/testHideVerticalGridlines.png b/...rChartTests/testHideVerticalGridlines.png → ...rChartTests/testHideVerticalGridlines.png
diff --git a/...artTests/[email protected] → ...artTests/[email protected] b/...artTests/[email protected] → ...artTests/[email protected]
diff --git a/...artTests/[email protected] → ...artTests/[email protected] b/...artTests/[email protected] → ...artTests/[email protected]
diff --git a/...tsTests.BarChartTests/testHidesValues.png → ...tsTests.BarChartTests/testHidesValues.png b/...tsTests.BarChartTests/testHidesValues.png → ...tsTests.BarChartTests/testHidesValues.png
diff --git a/...ests.BarChartTests/[email protected] → ...ests.BarChartTests/[email protected] b/...ests.BarChartTests/[email protected] → ...ests.BarChartTests/[email protected]
diff --git a/...ests.BarChartTests/[email protected] → ...ests.BarChartTests/[email protected] b/...ests.BarChartTests/[email protected] → ...ests.BarChartTests/[email protected]
diff --git a/...ests.LineChartTests/testDefaultValues.png → ...ests.LineChartTests/testDefaultValues.png b/...ests.LineChartTests/testDefaultValues.png → ...ests.LineChartTests/testDefaultValues.png
diff --git a/...s.LineChartTests/[email protected] → ...s.LineChartTests/[email protected] b/...s.LineChartTests/[email protected] → ...s.LineChartTests/[email protected]
diff --git a/...s.LineChartTests/[email protected] → ...s.LineChartTests/[email protected] b/...s.LineChartTests/[email protected] → ...s.LineChartTests/[email protected]
diff --git a/...neChartTests/testDoesntDrawCircleHole.png → ...neChartTests/testDoesntDrawCircleHole.png b/...neChartTests/testDoesntDrawCircleHole.png → ...neChartTests/testDoesntDrawCircleHole.png
diff --git a/...hartTests/[email protected] → ...hartTests/[email protected] b/...hartTests/[email protected] → ...hartTests/[email protected]
diff --git a/...hartTests/[email protected] → ...hartTests/[email protected] b/...hartTests/[email protected] → ...hartTests/[email protected]
diff --git a/....LineChartTests/testDoesntDrawCircles.png → ....LineChartTests/testDoesntDrawCircles.png b/....LineChartTests/testDoesntDrawCircles.png → ....LineChartTests/testDoesntDrawCircles.png
diff --git a/...neChartTests/[email protected] → ...neChartTests/[email protected] b/...neChartTests/[email protected] → ...neChartTests/[email protected]
diff --git a/...neChartTests/[email protected] → ...neChartTests/[email protected] b/...neChartTests/[email protected] → ...neChartTests/[email protected]
diff --git a/...sTests.LineChartTests/testHidesValues.png → ...sTests.LineChartTests/testHidesValues.png b/...sTests.LineChartTests/testHidesValues.png → ...sTests.LineChartTests/testHidesValues.png
diff --git a/...sts.LineChartTests/[email protected] → ...sts.LineChartTests/[email protected] b/...sts.LineChartTests/[email protected] → ...sts.LineChartTests/[email protected]
diff --git a/...sts.LineChartTests/[email protected] → ...sts.LineChartTests/[email protected] b/...sts.LineChartTests/[email protected] → ...sts.LineChartTests/[email protected]
diff --git a/...hartsTests.LineChartTests/testIsCubic.png → ...hartsTests.LineChartTests/testIsCubic.png b/...hartsTests.LineChartTests/testIsCubic.png → ...hartsTests.LineChartTests/testIsCubic.png
diff --git a/...tsTests.LineChartTests/[email protected] → ...tsTests.LineChartTests/[email protected] b/...tsTests.LineChartTests/[email protected] → ...tsTests.LineChartTests/[email protected]
diff --git a/...tsTests.LineChartTests/[email protected] → ...tsTests.LineChartTests/[email protected] b/...tsTests.LineChartTests/[email protected] → ...tsTests.LineChartTests/[email protected]