diff --git a/current-versions.txt b/current-versions.txt --- a/current-versions.txt +++ b/current-versions.txt @@ -1,7 +1,7 @@ This package was tested to work with these dependency versions and compiler version. These are the default versions fetched by cabal install. -Tested as of: 2014-07-13 16:28:45.229908 UTC +Tested as of: 2014-07-17 15:20:42.389867 UTC Path to compiler: ghc-7.8.2 Compiler description: 7.8.2 @@ -33,11 +33,11 @@ transformers-0.3.0.0 unix-2.7.0.1 -/home/massysett/prednote/tests/sunlight-29186/db: - QuickCheck-2.7.5 +/home/massysett/prednote/tests/sunlight-17585/db: + QuickCheck-2.7.6 contravariant-0.6 - prednote-0.24.0.0 - prednote-test-0.24.0.0 + prednote-0.24.2.0 + prednote-test-0.24.2.0 primitive-0.5.3.0 quickpull-0.2.0.0 rainbow-0.14.0.2 diff --git a/exe/Decrees.hs b/exe/Decrees.hs --- a/exe/Decrees.hs +++ b/exe/Decrees.hs @@ -99,17 +99,20 @@ , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 51, qName = "prop_trueShown"} ) ( Single Prednote.Prebuilt.Properties.prop_trueShown ) , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 54, qName = "prop_false"} ) ( Single Prednote.Prebuilt.Properties.prop_false ) , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 58, qName = "prop_falseShown"} ) ( Single Prednote.Prebuilt.Properties.prop_falseShown ) - , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 62, qName = "prop_visibility"} ) ( Single Prednote.Prebuilt.Properties.prop_visibility ) - , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 69, qName = "prop_reveal"} ) ( Single Prednote.Prebuilt.Properties.prop_reveal ) - , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 73, qName = "prop_hidden"} ) ( Single Prednote.Prebuilt.Properties.prop_hidden ) - , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 77, qName = "prop_showTrue"} ) ( Single Prednote.Prebuilt.Properties.prop_showTrue ) - , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 84, qName = "prop_showFalse"} ) ( Single Prednote.Prebuilt.Properties.prop_showFalse ) - , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 104, qName = "prop_allSame"} ) ( Single Prednote.Prebuilt.Properties.prop_allSame ) - , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 108, qName = "prop_allOpSame"} ) ( Single Prednote.Prebuilt.Properties.prop_allOpSame ) - , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 113, qName = "prop_anySame"} ) ( Single Prednote.Prebuilt.Properties.prop_anySame ) - , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 117, qName = "prop_anyOpSame"} ) ( Single Prednote.Prebuilt.Properties.prop_anyOpSame ) - , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 122, qName = "prop_notSame"} ) ( Single Prednote.Prebuilt.Properties.prop_notSame ) - , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 126, qName = "prop_fanAllSame"} ) ( Single Prednote.Prebuilt.Properties.prop_fanAllSame ) - , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 130, qName = "prop_fanAnySame"} ) ( Single Prednote.Prebuilt.Properties.prop_fanAnySame ) - , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 134, qName = "prop_fanAtLeastSame"} ) ( Single Prednote.Prebuilt.Properties.prop_fanAtLeastSame ) + , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 61, qName = "prop_wrapResultSameAsChild"} ) ( Single Prednote.Prebuilt.Properties.prop_wrapResultSameAsChild ) + , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 71, qName = "prop_wrapVisible"} ) ( Single Prednote.Prebuilt.Properties.prop_wrapVisible ) + , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 81, qName = "prop_wrapNoShortCircuit"} ) ( Single Prednote.Prebuilt.Properties.prop_wrapNoShortCircuit ) + , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 93, qName = "prop_visibility"} ) ( Single Prednote.Prebuilt.Properties.prop_visibility ) + , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 100, qName = "prop_reveal"} ) ( Single Prednote.Prebuilt.Properties.prop_reveal ) + , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 104, qName = "prop_hidden"} ) ( Single Prednote.Prebuilt.Properties.prop_hidden ) + , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 108, qName = "prop_showTrue"} ) ( Single Prednote.Prebuilt.Properties.prop_showTrue ) + , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 115, qName = "prop_showFalse"} ) ( Single Prednote.Prebuilt.Properties.prop_showFalse ) + , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 135, qName = "prop_allSame"} ) ( Single Prednote.Prebuilt.Properties.prop_allSame ) + , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 139, qName = "prop_allOpSame"} ) ( Single Prednote.Prebuilt.Properties.prop_allOpSame ) + , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 144, qName = "prop_anySame"} ) ( Single Prednote.Prebuilt.Properties.prop_anySame ) + , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 148, qName = "prop_anyOpSame"} ) ( Single Prednote.Prebuilt.Properties.prop_anyOpSame ) + , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 153, qName = "prop_notSame"} ) ( Single Prednote.Prebuilt.Properties.prop_notSame ) + , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 157, qName = "prop_fanAllSame"} ) ( Single Prednote.Prebuilt.Properties.prop_fanAllSame ) + , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 161, qName = "prop_fanAnySame"} ) ( Single Prednote.Prebuilt.Properties.prop_fanAnySame ) + , Decree ( Meta {modDesc = ModDesc {modPath = "exe/Prednote/Prebuilt/Properties.hs", modName = ["Prednote","Prebuilt","Properties"]}, linenum = 165, qName = "prop_fanAtLeastSame"} ) ( Single Prednote.Prebuilt.Properties.prop_fanAtLeastSame ) ] diff --git a/exe/Prednote/Prebuilt/Properties.hs b/exe/Prednote/Prebuilt/Properties.hs --- a/exe/Prednote/Prebuilt/Properties.hs +++ b/exe/Prednote/Prebuilt/Properties.hs @@ -57,6 +57,37 @@ prop_falseShown = isShown P.false +-- # Wrap +prop_wrapResultSameAsChild = + forAll (text arbitrary) $ \st -> + forAll (fmap Blind $ function1 coarbitrary (text arbitrary)) $ + \(Blind fDyn) -> + forAll (fmap Blind arbitrary) $ \(Blind xfrm) -> + let _types = xfrm :: Int -> Int in + forAll pred $ \p -> + forAll arbitrary $ \i -> + C.test p (xfrm i) === C.test (P.wrap st fDyn xfrm p) i + +prop_wrapVisible = + forAll (text arbitrary) $ \st -> + forAll (fmap Blind $ function1 coarbitrary (text arbitrary)) $ + \(Blind fDyn) -> + forAll (fmap Blind arbitrary) $ \(Blind xfrm) -> + forAll pred $ \p -> + forAll arbitrary $ \(A i) -> + (== C.shown) . C.visible . E.rootLabel . ($ i) . C.evaluate $ + P.wrap st fDyn xfrm p + +prop_wrapNoShortCircuit = + forAll (text arbitrary) $ \st -> + forAll (fmap Blind $ function1 coarbitrary (text arbitrary)) $ + \(Blind fDyn) -> + forAll (fmap Blind arbitrary) $ \(Blind xfrm) -> + forAll pred $ \p -> + forAll arbitrary $ \(A i) -> + isNothing . C.short . E.rootLabel . ($ i) . C.evaluate $ + P.wrap st fDyn xfrm p + -- # visibility prop_visibility = diff --git a/minimum-versions.txt b/minimum-versions.txt --- a/minimum-versions.txt +++ b/minimum-versions.txt @@ -1,7 +1,7 @@ This package was tested to work with these dependency versions and compiler version. These are the minimum versions given in the .cabal file. -Tested as of: 2014-07-13 16:28:45.229908 UTC +Tested as of: 2014-07-17 15:20:42.389867 UTC Path to compiler: ghc-7.4.1 Compiler description: 7.4.1 @@ -33,11 +33,11 @@ time-1.4 unix-2.5.1.0 -/home/massysett/prednote/tests/sunlight-29186/db: +/home/massysett/prednote/tests/sunlight-17585/db: QuickCheck-2.7.5 contravariant-0.6 - prednote-0.24.0.0 - prednote-test-0.24.0.0 + prednote-0.24.2.0 + prednote-test-0.24.2.0 primitive-0.5.3.0 quickpull-0.2.0.0 rainbow-0.14.0.2 diff --git a/prednote-test.cabal b/prednote-test.cabal --- a/prednote-test.cabal +++ b/prednote-test.cabal @@ -3,10 +3,10 @@ -- http://www.github.com/massysett/cartel -- -- Script name used to generate: genCabal.hs --- Generated on: 2014-07-13 12:28:43.16095 EDT +-- Generated on: 2014-07-17 11:13:28.670981 EDT -- Cartel library version: 0.10.0.2 name: prednote-test -version: 0.24.0.0 +version: 0.24.2.0 cabal-version: >= 1.14 build-type: Simple license: BSD3 @@ -43,7 +43,7 @@ , rainbow ((> 0.14.0.2 || == 0.14.0.2) && < 0.15) , rainbow-tests ((> 0.14.0.2 || == 0.14.0.2) && < 0.15) , text ((> 0.11.2.0 || == 0.11.2.0) && < 1.2) - , prednote == 0.24.0.0 + , prednote == 0.24.2.0 , QuickCheck ((> 2.7.5 || == 2.7.5) && < 2.8) , containers ((> 0.4.2.1 || == 0.4.2.1) && < 0.6) , quickpull ((> 0.2.0.0 || == 0.2.0.0) && < 0.3) @@ -74,7 +74,7 @@ , rainbow ((> 0.14.0.2 || == 0.14.0.2) && < 0.15) , rainbow-tests ((> 0.14.0.2 || == 0.14.0.2) && < 0.15) , text ((> 0.11.2.0 || == 0.11.2.0) && < 1.2) - , prednote == 0.24.0.0 + , prednote == 0.24.2.0 , QuickCheck ((> 2.7.5 || == 2.7.5) && < 2.8) , containers ((> 0.4.2.1 || == 0.4.2.1) && < 0.6) , quickpull ((> 0.2.0.0 || == 0.2.0.0) && < 0.3) @@ -92,7 +92,7 @@ , rainbow ((> 0.14.0.2 || == 0.14.0.2) && < 0.15) , rainbow-tests ((> 0.14.0.2 || == 0.14.0.2) && < 0.15) , text ((> 0.11.2.0 || == 0.11.2.0) && < 1.2) - , prednote == 0.24.0.0 + , prednote == 0.24.2.0 , QuickCheck ((> 2.7.5 || == 2.7.5) && < 2.8) , containers ((> 0.4.2.1 || == 0.4.2.1) && < 0.6) , quickpull ((> 0.2.0.0 || == 0.2.0.0) && < 0.3) diff --git a/visual/prednote-visual-test.hs b/visual/prednote-visual-test.hs --- a/visual/prednote-visual-test.hs +++ b/visual/prednote-visual-test.hs @@ -7,12 +7,14 @@ import Prednote.Format import qualified Data.Text as X import System.Console.Rainbow +import Data.Monoid singleInt :: Pred Int singleInt = P.any [ equal "integer" 5 , greaterEq "integer" 20 - , lessEq "integer" 10 + , P.wrap "integer" (\a -> "integer " <> X.pack (show a)) + id $ lessEq "integer" 10 ] listInt :: Pred [Int]