diff --git a/Setup.hs b/Setup.hs deleted file mode 100644 --- a/Setup.hs +++ /dev/null @@ -1,2 +0,0 @@ -import Distribution.Simple -main = defaultMain diff --git a/commutative.cabal b/commutative.cabal --- a/commutative.cabal +++ b/commutative.cabal @@ -1,5 +1,5 @@ Name: commutative -Version: 0.0.1.1 +Version: 0.0.1.2 Author: Athan Clark Maintainer: Athan Clark License: MIT @@ -28,13 +28,15 @@ Hs-Source-Dirs: src , test Ghc-Options: -Wall - Main-Is: Spec.hs + Main-Is: Main.hs Build-Depends: base , tasty , tasty-quickcheck , tasty-hunit , QuickCheck , quickcheck-instances + , random + , semigroups Source-Repository head Type: git diff --git a/src/Data/Commutative.hs b/src/Data/Commutative.hs --- a/src/Data/Commutative.hs +++ b/src/Data/Commutative.hs @@ -71,6 +71,9 @@ commute (OneOf x) (OneOf y) = OneOf $ pick1 (getFirst $ First x `mappend` First y) (getLast $ Last x `mappend` Last y) +instance CommutativeId (OneOf a) where + cempty = OneOf Nothing + -- Numbers instance Num a => Commutative (Sum a) where commute (Sum x) (Sum y) = Sum $ x + y diff --git a/test/Main.hs b/test/Main.hs new file mode 100644 --- /dev/null +++ b/test/Main.hs @@ -0,0 +1,12 @@ +module Main where + +import Data.CommutativeSpec + +import Test.Tasty + + +main :: IO () +main = defaultMain tests + +tests :: TestTree +tests = testGroup "Testing..." spec diff --git a/test/Spec.hs b/test/Spec.hs deleted file mode 100644 --- a/test/Spec.hs +++ /dev/null @@ -1,13 +0,0 @@ -module Spec where - -import Data.CommutativeSpec - -import Test.Tasty - - -main :: IO () -main = defaultMain tests - -tests :: TestTree -tests = testGroup "Testing..." - [spec]