Skip to content

Commit

Permalink
Merge pull request #319 from apparition47/spm-test-module-fix
Browse files Browse the repository at this point in the history 
Fix SPM tests layout
  • Loading branch information
@CodaFi
CodaFi authored Nov 20, 2016
2 parents 6baf945 + f912305 commit 13066bc
Show file tree
Hide file tree
Showing 25 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion Carthage/Checkouts/SwiftCheck
Submodule SwiftCheck updated 38 files
+2 −0 .gitignore
+1 −0 .swift-version
+15 −6 .travis.yml
+4 −4 README.md
+6 −15 Sources/Arbitrary.swift
+896 −0 Sources/Cartesian.swift
+2 −2 Sources/Compose.swift
+99 −207 Sources/Gen.swift
+3 −3 Sources/Property.swift
+1 −1 Sources/Test.swift
+2 −2 SwiftCheck.podspec
+168 −123 SwiftCheck.xcodeproj/project.pbxproj
+1 −1 SwiftCheck.xcodeproj/xcshareddata/xcschemes/SwiftCheck-iOS.xcscheme
+1 −1 SwiftCheck.xcodeproj/xcshareddata/xcschemes/SwiftCheck-tvOS.xcscheme
+1 −1 SwiftCheck.xcodeproj/xcshareddata/xcschemes/SwiftCheck.xcscheme
+62 −0 Templates/Cartesian.swift.gyb
+54 −0 Templates/CartesianSpec.swift.gyb
+30 −0 Tests/LinuxMain.swift
+0 −36 Tests/RawRepresentableSpec.swift
+6 −0 Tests/SwiftCheckTests/BooleanIdentitySpec.swift
+264 −0 Tests/SwiftCheckTests/CartesianSpec.swift
+20 −13 Tests/SwiftCheckTests/ComplexSpec.swift
+7 −0 Tests/SwiftCheckTests/DiscardSpec.swift
+13 −0 Tests/SwiftCheckTests/FailureSpec.swift
+24 −18 Tests/SwiftCheckTests/GenSpec.swift
+8 −1 Tests/SwiftCheckTests/LambdaSpec.swift
+6 −0 Tests/SwiftCheckTests/ModifierSpec.swift
+10 −4 Tests/SwiftCheckTests/PathSpec.swift
+7 −1 Tests/SwiftCheckTests/PropertySpec.swift
+7 −1 Tests/SwiftCheckTests/ReplaySpec.swift
+8 −1 Tests/SwiftCheckTests/RoseSpec.swift
+6 −0 Tests/SwiftCheckTests/ShrinkSpec.swift
+8 −12 Tests/SwiftCheckTests/SimpleSpec.swift
+7 −2 Tests/SwiftCheckTests/TestSpec.swift
+11 −11 Tutorial.playground/Contents.swift
+4 −0 Utilities/compile.sh
+3 −0 Utilities/gyb
+1,146 −0 Utilities/gyb.py
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Swiftx
Submodule Swiftx updated 2 files
+1 −1 Swiftx.xcodeproj/project.pbxproj
+0 −0 Tests/SwiftxTests/EitherSpec.swift
2 changes: 1 addition & 1 deletion Package.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let package = Package(
],
dependencies: [
.Package(url: "https://github.com/typelift/Operadics.git", versions: Version(0,2,2)...Version(0,2,2)),
.Package(url: "https://github.com/typelift/Swiftx.git", versions: Version(0,5,0)...Version(0,5,0)),
.Package(url: "https://github.com/typelift/Swiftx.git", versions: Version(0,5,1)...Version(0,5,1)),
]
)

Expand Down
42 changes: 21 additions & 21 deletions Swiftz.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,27 +378,27 @@
/* Begin PBXFileReference section */
821B76AF1BC43C1000AF97D6 /* Operators.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; name = Operators.swift; path = Carthage/Checkouts/Operadics/Operators.swift; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
821B76B41BC43DE100AF97D6 /* SwiftCheck.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SwiftCheck.xcodeproj; path = Carthage/Checkouts/SwiftCheck/SwiftCheck.xcodeproj; sourceTree = SOURCE_ROOT; };
821BEED21D8F3EA5009F8D58 /* ArrayExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ArrayExtSpec.swift; path = Tests/ArrayExtSpec.swift; sourceTree = SOURCE_ROOT; };
821BEED31D8F3EA5009F8D58 /* ArrowExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ArrowExtSpec.swift; path = Tests/ArrowExtSpec.swift; sourceTree = SOURCE_ROOT; };
821BEED41D8F3EA5009F8D58 /* DictionaryExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DictionaryExtSpec.swift; path = Tests/DictionaryExtSpec.swift; sourceTree = SOURCE_ROOT; };
821BEED51D8F3EA5009F8D58 /* EitherSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EitherSpec.swift; path = Tests/EitherSpec.swift; sourceTree = SOURCE_ROOT; };
821BEED61D8F3EA5009F8D58 /* FunctionSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FunctionSpec.swift; path = Tests/FunctionSpec.swift; sourceTree = SOURCE_ROOT; };
821BEED71D8F3EA5009F8D58 /* FunctorSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FunctorSpec.swift; path = Tests/FunctorSpec.swift; sourceTree = SOURCE_ROOT; };
821BEED81D8F3EA5009F8D58 /* HListSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HListSpec.swift; path = Tests/HListSpec.swift; sourceTree = SOURCE_ROOT; };
821BEED91D8F3EA5009F8D58 /* IdentitySpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = IdentitySpec.swift; path = Tests/IdentitySpec.swift; sourceTree = SOURCE_ROOT; };
821BEEDA1D8F3EA5009F8D58 /* ListSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ListSpec.swift; path = Tests/ListSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEDB1D8F3EA5009F8D58 /* MonoidSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MonoidSpec.swift; path = Tests/MonoidSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEDC1D8F3EA5009F8D58 /* NonEmptyListSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NonEmptyListSpec.swift; path = Tests/NonEmptyListSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEDD1D8F3EA5009F8D58 /* OptionalExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OptionalExtSpec.swift; path = Tests/OptionalExtSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEDE1D8F3EA5009F8D58 /* ProxySpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ProxySpec.swift; path = Tests/ProxySpec.swift; sourceTree = SOURCE_ROOT; };
821BEEDF1D8F3EA5009F8D58 /* ReaderSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ReaderSpec.swift; path = Tests/ReaderSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEE01D8F3EA5009F8D58 /* StateSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StateSpec.swift; path = Tests/StateSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEE11D8F3EA5009F8D58 /* StreamSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StreamSpec.swift; path = Tests/StreamSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEE21D8F3EA5009F8D58 /* StringExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StringExtSpec.swift; path = Tests/StringExtSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEE31D8F3EA5009F8D58 /* ThoseSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ThoseSpec.swift; path = Tests/ThoseSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEE41D8F3EA5009F8D58 /* TupleExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TupleExtSpec.swift; path = Tests/TupleExtSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEE51D8F3EA5009F8D58 /* UnitSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UnitSpec.swift; path = Tests/UnitSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEE61D8F3EA5009F8D58 /* WriterSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WriterSpec.swift; path = Tests/WriterSpec.swift; sourceTree = SOURCE_ROOT; };
821BEED21D8F3EA5009F8D58 /* ArrayExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ArrayExtSpec.swift; path = Tests/SwiftzTests/ArrayExtSpec.swift; sourceTree = SOURCE_ROOT; };
821BEED31D8F3EA5009F8D58 /* ArrowExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ArrowExtSpec.swift; path = Tests/SwiftzTests/ArrowExtSpec.swift; sourceTree = SOURCE_ROOT; };
821BEED41D8F3EA5009F8D58 /* DictionaryExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DictionaryExtSpec.swift; path = Tests/SwiftzTests/DictionaryExtSpec.swift; sourceTree = SOURCE_ROOT; };
821BEED51D8F3EA5009F8D58 /* EitherSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EitherSpec.swift; path = Tests/SwiftzTests/EitherSpec.swift; sourceTree = SOURCE_ROOT; };
821BEED61D8F3EA5009F8D58 /* FunctionSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FunctionSpec.swift; path = Tests/SwiftzTests/FunctionSpec.swift; sourceTree = SOURCE_ROOT; };
821BEED71D8F3EA5009F8D58 /* FunctorSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = FunctorSpec.swift; path = Tests/SwiftzTests/FunctorSpec.swift; sourceTree = SOURCE_ROOT; };
821BEED81D8F3EA5009F8D58 /* HListSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HListSpec.swift; path = Tests/SwiftzTests/HListSpec.swift; sourceTree = SOURCE_ROOT; };
821BEED91D8F3EA5009F8D58 /* IdentitySpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = IdentitySpec.swift; path = Tests/SwiftzTests/IdentitySpec.swift; sourceTree = SOURCE_ROOT; };
821BEEDA1D8F3EA5009F8D58 /* ListSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ListSpec.swift; path = Tests/SwiftzTests/ListSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEDB1D8F3EA5009F8D58 /* MonoidSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MonoidSpec.swift; path = Tests/SwiftzTests/MonoidSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEDC1D8F3EA5009F8D58 /* NonEmptyListSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = NonEmptyListSpec.swift; path = Tests/SwiftzTests/NonEmptyListSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEDD1D8F3EA5009F8D58 /* OptionalExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = OptionalExtSpec.swift; path = Tests/SwiftzTests/OptionalExtSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEDE1D8F3EA5009F8D58 /* ProxySpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ProxySpec.swift; path = Tests/SwiftzTests/ProxySpec.swift; sourceTree = SOURCE_ROOT; };
821BEEDF1D8F3EA5009F8D58 /* ReaderSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ReaderSpec.swift; path = Tests/SwiftzTests/ReaderSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEE01D8F3EA5009F8D58 /* StateSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StateSpec.swift; path = Tests/SwiftzTests/StateSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEE11D8F3EA5009F8D58 /* StreamSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StreamSpec.swift; path = Tests/SwiftzTests/StreamSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEE21D8F3EA5009F8D58 /* StringExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StringExtSpec.swift; path = Tests/SwiftzTests/StringExtSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEE31D8F3EA5009F8D58 /* ThoseSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ThoseSpec.swift; path = Tests/SwiftzTests/ThoseSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEE41D8F3EA5009F8D58 /* TupleExtSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TupleExtSpec.swift; path = Tests/SwiftzTests/TupleExtSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEE51D8F3EA5009F8D58 /* UnitSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UnitSpec.swift; path = Tests/SwiftzTests/UnitSpec.swift; sourceTree = SOURCE_ROOT; };
821BEEE61D8F3EA5009F8D58 /* WriterSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WriterSpec.swift; path = Tests/SwiftzTests/WriterSpec.swift; sourceTree = SOURCE_ROOT; };
821BEF261D8F3EB0009F8D58 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Tests/Info.plist; sourceTree = SOURCE_ROOT; };
821BEF281D8F3EF8009F8D58 /* Applicative.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Applicative.swift; path = Sources/Applicative.swift; sourceTree = SOURCE_ROOT; };
821BEF291D8F3EF8009F8D58 /* ArrayExt.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ArrayExt.swift; path = Sources/ArrayExt.swift; sourceTree = SOURCE_ROOT; };
Expand Down
0 Tests/ArrayExtSpec.swift → Tests/SwiftzTests/ArrayExtSpec.swift
View file
File renamed without changes.
0 Tests/ArrowExtSpec.swift → Tests/SwiftzTests/ArrowExtSpec.swift
View file
File renamed without changes.
0 Tests/DictionaryExtSpec.swift → Tests/SwiftzTests/DictionaryExtSpec.swift
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion Tests/EitherSpec.swift → Tests/SwiftzTests/EitherSpec.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ struct EitherOf<A : Arbitrary, B : Arbitrary> : Arbitrary {
}

static var arbitrary : Gen<EitherOf<A, B>> {
return Gen.oneOf([
return Gen.one(of: [
A.arbitrary.map(Either.Left),
B.arbitrary.map(Either.Right),
]).map(EitherOf.init)
Expand Down
0 Tests/FunctionSpec.swift → Tests/SwiftzTests/FunctionSpec.swift
View file
File renamed without changes.
0 Tests/FunctorSpec.swift → Tests/SwiftzTests/FunctorSpec.swift
View file
File renamed without changes.
0 Tests/HListSpec.swift → Tests/SwiftzTests/HListSpec.swift
View file
File renamed without changes.
0 Tests/IdentitySpec.swift → Tests/SwiftzTests/IdentitySpec.swift
View file
File renamed without changes.
0 Tests/ListSpec.swift → Tests/SwiftzTests/ListSpec.swift
View file
File renamed without changes.
0 Tests/MonoidSpec.swift → Tests/SwiftzTests/MonoidSpec.swift
View file
File renamed without changes.
0 Tests/NonEmptyListSpec.swift → Tests/SwiftzTests/NonEmptyListSpec.swift
View file
File renamed without changes.
0 Tests/OptionalExtSpec.swift → Tests/SwiftzTests/OptionalExtSpec.swift
View file
File renamed without changes.
0 Tests/ProxySpec.swift → Tests/SwiftzTests/ProxySpec.swift
View file
File renamed without changes.
0 Tests/ReaderSpec.swift → Tests/SwiftzTests/ReaderSpec.swift
View file
File renamed without changes.
0 Tests/StateSpec.swift → Tests/SwiftzTests/StateSpec.swift
View file
File renamed without changes.
0 Tests/StreamSpec.swift → Tests/SwiftzTests/StreamSpec.swift
View file
File renamed without changes.
0 Tests/StringExtSpec.swift → Tests/SwiftzTests/StringExtSpec.swift
View file
File renamed without changes.
0 Tests/ThoseSpec.swift → Tests/SwiftzTests/ThoseSpec.swift
View file
File renamed without changes.
0 Tests/TupleExtSpec.swift → Tests/SwiftzTests/TupleExtSpec.swift
View file
File renamed without changes.
0 Tests/UnitSpec.swift → Tests/SwiftzTests/UnitSpec.swift
View file
File renamed without changes.
0 Tests/WriterSpec.swift → Tests/SwiftzTests/WriterSpec.swift
View file
File renamed without changes.

0 comments on commit 13066bc

Please sign in to comment.