git.iko.soy/roboservant
on master help sign in
cleanup, change time to double
commit6e0923194f4f7b2b1c4eed827ae034715508f7cd authorMark Wotton <mwotton@gmail.com> dateFri 27 Nov 2020, 18:26 (6 years ago) parent780fb79
2 files changed+23−19
compare with master
unifiedsplit
src/Roboservant/Direct.hs+2−2 test/Spec.hs+21−17
src/Roboservant/Direct.hs+2−2
@@ -102,7 +102,7 @@ data FuzzOp
102102data Config
103103 = Config
104104 { seed :: [Dynamic],
105− maxRuntime :: Integer, -- seconds to test for
105+ maxRuntime :: Double, -- seconds to test for
106106 maxReps :: Integer,
107107 rngSeed :: Int,
108108 coverageThreshold :: Double
@@ -145,7 +145,7 @@ fuzz server Config {..} checker = handle (pure . Just . formatException) $ do
145145 let path = []
146146 stash = addToStash seed mempty
147147 currentRng = mkStdGen rngSeed
148− deadline :: UTCTime <- addUTCTime (fromInteger $ maxRuntime * 1000000) <$> getCurrentTime
148+ deadline :: UTCTime <- addUTCTime (realToFrac $ maxRuntime * 1000000) <$> getCurrentTime
149149 (stopreason, _fs) <-
150150 runStateT
151151 (untilDone (maxReps, deadline) go <* (evaluateCoverage =<< get))
test/Spec.hs+21−17
@@ -12,12 +12,10 @@ import qualified Seeded
1212import qualified Valid
1313import qualified Headers
1414import qualified Post
15−import qualified BuildFrom
16−-- import qualified UnsafeIO
15+import Test.Hspec.Core.Spec
1716
1817import Data.Dynamic(toDyn)
1918import qualified Roboservant as RS
20−import Roboservant(Breakdown, BuildFrom, Atom, Compound)
2119import Test.Hspec
2220import Data.Void
2321import Data.Maybe
@@ -29,7 +27,13 @@ noCheck :: IO ()
2927noCheck = pure ()
3028
3129defaultConfig :: RS.Config
32−defaultConfig = RS.Config [] 1 1000 1 0
30+defaultConfig = RS.Config
31+ { RS.seed = []
32+ , RS.maxRuntime = 0.5
33+ , RS.maxReps = 1000
34+ , RS.rngSeed = 0
35+ , RS.coverageThreshold = 0
36+ }
3337
3438spec :: Spec
3539spec = do
@@ -67,7 +71,7 @@ spec = do
6771
6872 -- describe "can build from pieces" $ do
6973 -- it "should find a failure that requires some assembly" $ do
70− -- RS.fuzz @BuildFrom.Api BuildFrom.server defaultConfig noCheck
74+ -- RS.fuzz @RS.BuildFrom.Api RS.BuildFrom.server defaultConfig noCheck
7175 -- >>= (`shouldSatisfy` isJust)
7276
7377
@@ -87,30 +91,30 @@ spec = do
8791 -- RS.prop_concurrent @UnsafeIO.UnsafeApi unsafeServer []
8892
8993
90−deriving via (Atom Foo.Foo) instance Breakdown Foo.Foo
91−deriving via (Atom Foo.Foo) instance BuildFrom Foo.Foo
94+deriving via (RS.Atom Foo.Foo) instance RS.Breakdown Foo.Foo
95+deriving via (RS.Atom Foo.Foo) instance RS.BuildFrom Foo.Foo
9296
93−deriving via (Atom Headers.Foo) instance Breakdown Headers.Foo
94−deriving via (Atom Headers.Foo) instance BuildFrom Headers.Foo
97+deriving via (RS.Atom Headers.Foo) instance RS.Breakdown Headers.Foo
98+deriving via (RS.Atom Headers.Foo) instance RS.BuildFrom Headers.Foo
9599
96−deriving via (Atom Seeded.Seed) instance Breakdown Seeded.Seed
97−deriving via (Atom Seeded.Seed) instance BuildFrom Seeded.Seed
100+deriving via (RS.Atom Seeded.Seed) instance RS.Breakdown Seeded.Seed
101+deriving via (RS.Atom Seeded.Seed) instance RS.BuildFrom Seeded.Seed
98102
99103
100104-- instance RS.BuildFrom Seeded.Seed
101105
102−deriving via (Atom Void) instance RS.BuildFrom Void
106+deriving via (RS.Atom Void) instance RS.BuildFrom Void
103107
104−deriving via (Atom Post.FooPost) instance RS.BuildFrom Post.FooPost
105−deriving via (Atom Post.FooPost) instance RS.Breakdown Post.FooPost
108+deriving via (RS.Atom Post.FooPost) instance RS.BuildFrom Post.FooPost
109+deriving via (RS.Atom Post.FooPost) instance RS.Breakdown Post.FooPost
106110
107111
108−--deriving via (Compound BuildFrom.Wrapped) instance RS.BuildFrom BuildFrom.Wrapped
109−--deriving via (Compound BuildFrom.Wrapped) instance RS.Breakdown BuildFrom.Wrapped
112+--deriving via (Compound RS.BuildFrom.Wrapped) instance RS.BuildFrom RS.BuildFrom.Wrapped
113+--deriving via (Compound RS.BuildFrom.Wrapped) instance RS.Breakdown RS.BuildFrom.Wrapped
110114
111115
112116
113−-- deriving via (Atom Void) instance RS.BuildFrom Void
117+-- deriving via (RS.Atom Void) instance RS.BuildFrom Void
114118
115119-- instance RS.Breakdown Post.FooPost
116120-- instance RS.BuildFrom Post.FooPost