Skip to content

Commit

Permalink
Introduce Mozart as a test dependency
Browse files Browse the repository at this point in the history
Mozart is a centralized framework for defining function composition. We can
use it as a test dependency instead of needing to define our own compose
operator.

https://github.com/gfontenot/Mozart
  • Loading branch information
gfontenot committed Sep 6, 2016
1 parent 5c07ea7 commit e00cf68
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 23 deletions.
1 change: 1 addition & 0 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
github "typelift/SwiftCheck" "swift-develop"
github "gfontenot/Mozart" ~> 1.0.0
3 changes: 2 additions & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
github "typelift/SwiftCheck" "bd5d620660b3fb2356dea89573baa99e7f3c1c28"
github "gfontenot/Mozart" "v1.0.1"
github "typelift/SwiftCheck" "a260f94ae3cf5d430e8140ba3905d3d47663bff7"
26 changes: 18 additions & 8 deletions Runes.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
F80D6ADC1D4BE10B00505CE9 /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80D6AD61D4BE10B00505CE9 /* Functions.swift */; };
F80D6ADD1D4BE10B00505CE9 /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80D6AD61D4BE10B00505CE9 /* Functions.swift */; };
F80D6ADE1D4BE10B00505CE9 /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80D6AD61D4BE10B00505CE9 /* Functions.swift */; };
F80D6ADF1D4BE10B00505CE9 /* Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80D6AD71D4BE10B00505CE9 /* Operators.swift */; };
F80D6AE01D4BE10B00505CE9 /* Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80D6AD71D4BE10B00505CE9 /* Operators.swift */; };
F80D6AE11D4BE10B00505CE9 /* Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80D6AD71D4BE10B00505CE9 /* Operators.swift */; };
F80D6AE21D4BE10B00505CE9 /* OptionalSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80D6AD81D4BE10B00505CE9 /* OptionalSpec.swift */; };
F80D6AE31D4BE10B00505CE9 /* OptionalSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80D6AD81D4BE10B00505CE9 /* OptionalSpec.swift */; };
F80D6AE41D4BE10B00505CE9 /* OptionalSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80D6AD81D4BE10B00505CE9 /* OptionalSpec.swift */; };
Expand All @@ -42,6 +39,12 @@
F86B2E261A5F2BA400C3B8BD /* Optional.swift in Sources */ = {isa = PBXBuildFile; fileRef = F802D4F01A5F23BE005E236C /* Optional.swift */; };
F89776E51BA601D500EE823E /* SwiftCheck.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F88DE9741BA3855600A9D383 /* SwiftCheck.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
F89776E61BA601DE00EE823E /* SwiftCheck.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F88DE9721BA3854E00A9D383 /* SwiftCheck.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
F89AAC901D74D00100184D08 /* Mozart.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F89AAC8F1D74D00100184D08 /* Mozart.framework */; };
F89AAC921D74D00E00184D08 /* Mozart.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F89AAC911D74D00E00184D08 /* Mozart.framework */; };
F89AAC941D74D01A00184D08 /* Mozart.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F89AAC931D74D01A00184D08 /* Mozart.framework */; };
F89AAC951D74D03C00184D08 /* Mozart.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F89AAC931D74D01A00184D08 /* Mozart.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
F89AAC961D74D04300184D08 /* Mozart.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F89AAC8F1D74D00100184D08 /* Mozart.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
F89AAC971D74D04800184D08 /* Mozart.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F89AAC911D74D00E00184D08 /* Mozart.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
F8D430A71D5A66A800548DF0 /* SwiftCheck.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F80D6AE61D4BE1B800505CE9 /* SwiftCheck.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
F8D430A81D5A670000548DF0 /* SwiftCheck.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F80D6AE61D4BE1B800505CE9 /* SwiftCheck.framework */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -77,6 +80,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
F89AAC951D74D03C00184D08 /* Mozart.framework in CopyFiles */,
F89776E61BA601DE00EE823E /* SwiftCheck.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -87,6 +91,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
F89AAC961D74D04300184D08 /* Mozart.framework in CopyFiles */,
F89776E51BA601D500EE823E /* SwiftCheck.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -97,6 +102,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
F89AAC971D74D04800184D08 /* Mozart.framework in CopyFiles */,
F8D430A71D5A66A800548DF0 /* SwiftCheck.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -115,14 +121,16 @@
F802D4F01A5F23BE005E236C /* Optional.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Optional.swift; sourceTree = "<group>"; };
F80D6AD51D4BE10B00505CE9 /* ArraySpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArraySpec.swift; sourceTree = "<group>"; };
F80D6AD61D4BE10B00505CE9 /* Functions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Functions.swift; sourceTree = "<group>"; };
F80D6AD71D4BE10B00505CE9 /* Operators.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Operators.swift; sourceTree = "<group>"; };
F80D6AD81D4BE10B00505CE9 /* OptionalSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OptionalSpec.swift; sourceTree = "<group>"; };
F80D6AE61D4BE1B800505CE9 /* SwiftCheck.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftCheck.framework; sourceTree = "<group>"; };
F8624C261A645A9600C883B3 /* Runes-iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Runes-iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
F8624C451A645C9500C883B3 /* Runes-Mac Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Runes-Mac Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
F86B2E0B1A5F2B8D00C3B8BD /* Runes.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Runes.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F88DE9721BA3854E00A9D383 /* SwiftCheck.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftCheck.framework; path = Carthage/Build/iOS/SwiftCheck.framework; sourceTree = SOURCE_ROOT; };
F88DE9741BA3855600A9D383 /* SwiftCheck.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftCheck.framework; path = Carthage/Build/Mac/SwiftCheck.framework; sourceTree = SOURCE_ROOT; };
F89AAC8F1D74D00100184D08 /* Mozart.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Mozart.framework; path = Carthage/Build/Mac/Mozart.framework; sourceTree = SOURCE_ROOT; };
F89AAC911D74D00E00184D08 /* Mozart.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Mozart.framework; sourceTree = "<group>"; };
F89AAC931D74D01A00184D08 /* Mozart.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Mozart.framework; path = Carthage/Build/iOS/Mozart.framework; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -139,6 +147,7 @@
files = (
51DE8A261BAB36E600124320 /* Runes.framework in Frameworks */,
F8D430A81D5A670000548DF0 /* SwiftCheck.framework in Frameworks */,
F89AAC921D74D00E00184D08 /* Mozart.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -162,6 +171,7 @@
files = (
F8624C2C1A645A9600C883B3 /* Runes.framework in Frameworks */,
F80721571D4BE47500882F0F /* SwiftCheck.framework in Frameworks */,
F89AAC941D74D01A00184D08 /* Mozart.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -171,6 +181,7 @@
files = (
F8624C4B1A645C9500C883B3 /* Runes.framework in Frameworks */,
F80721581D4BE48E00882F0F /* SwiftCheck.framework in Frameworks */,
F89AAC901D74D00100184D08 /* Mozart.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -234,7 +245,6 @@
children = (
F80D6AD51D4BE10B00505CE9 /* ArraySpec.swift */,
F80D6AD61D4BE10B00505CE9 /* Functions.swift */,
F80D6AD71D4BE10B00505CE9 /* Operators.swift */,
F80D6AD81D4BE10B00505CE9 /* OptionalSpec.swift */,
);
path = Runes;
Expand All @@ -243,6 +253,7 @@
F80D6AE51D4BE19E00505CE9 /* tvOS */ = {
isa = PBXGroup;
children = (
F89AAC911D74D00E00184D08 /* Mozart.framework */,
F80D6AE61D4BE1B800505CE9 /* SwiftCheck.framework */,
);
name = tvOS;
Expand Down Expand Up @@ -271,6 +282,7 @@
F8624C521A645CE200C883B3 /* iOS */ = {
isa = PBXGroup;
children = (
F89AAC931D74D01A00184D08 /* Mozart.framework */,
F88DE9721BA3854E00A9D383 /* SwiftCheck.framework */,
);
name = iOS;
Expand All @@ -279,6 +291,7 @@
F8624C531A645CF400C883B3 /* OS X */ = {
isa = PBXGroup;
children = (
F89AAC8F1D74D00100184D08 /* Mozart.framework */,
F88DE9741BA3855600A9D383 /* SwiftCheck.framework */,
);
name = "OS X";
Expand Down Expand Up @@ -584,7 +597,6 @@
F80D6ADB1D4BE10B00505CE9 /* ArraySpec.swift in Sources */,
F80D6ADE1D4BE10B00505CE9 /* Functions.swift in Sources */,
F80D6AE41D4BE10B00505CE9 /* OptionalSpec.swift in Sources */,
F80D6AE11D4BE10B00505CE9 /* Operators.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -615,7 +627,6 @@
F80D6AD91D4BE10B00505CE9 /* ArraySpec.swift in Sources */,
F80D6ADC1D4BE10B00505CE9 /* Functions.swift in Sources */,
F80D6AE21D4BE10B00505CE9 /* OptionalSpec.swift in Sources */,
F80D6ADF1D4BE10B00505CE9 /* Operators.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -626,7 +637,6 @@
F80D6ADA1D4BE10B00505CE9 /* ArraySpec.swift in Sources */,
F80D6ADD1D4BE10B00505CE9 /* Functions.swift in Sources */,
F80D6AE31D4BE10B00505CE9 /* OptionalSpec.swift in Sources */,
F80D6AE01D4BE10B00505CE9 /* Operators.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
3 changes: 2 additions & 1 deletion Tests/Runes/ArraySpec.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import SwiftCheck
import XCTest
import SwiftCheck
import Mozart
import Runes

class ArraySpec: XCTestCase {
Expand Down
12 changes: 0 additions & 12 deletions Tests/Runes/Operators.swift

This file was deleted.

3 changes: 2 additions & 1 deletion Tests/Runes/OptionalSpec.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import SwiftCheck
import XCTest
import SwiftCheck
import Mozart
import Runes

class OptionalSpec: XCTestCase {
Expand Down

0 comments on commit e00cf68

Please sign in to comment.