git.iko.soy/servant-quickcheck
on master help sign in
23 files changed+1868−560
since splitsnapshots
unifiedsplit
.gitignore+5 .travis.yml+154−30 CHANGELOG.yaml+214 cabal.haskell-ci+7 cabal.project+4 doc/posts/Announcement.anansi+171−8 doc/posts/Makefile+6−3 doc/posts/announcement.md+224−24 doc/posts/src/Main.hs+2−2 doc/posts/src/Spec.hs+9−3 example/Main.hs+31 servant-quickcheck.cabal+126−89 src/Servant/QuickCheck.hs+16−2 src/Servant/QuickCheck/Internal.hs+4−4 src/Servant/QuickCheck/Internal/Benchmarking.hs−83 src/Servant/QuickCheck/Internal/Equality.hs+42−4 src/Servant/QuickCheck/Internal/ErrorTypes.hs+82 src/Servant/QuickCheck/Internal/HasGenRequest.hs+113−52 src/Servant/QuickCheck/Internal/Predicates.hs+246−134 src/Servant/QuickCheck/Internal/QuickCheck.hs+112−34 stack.yaml+5−31 test/Doctest.hs−44 test/Servant/QuickCheck/InternalSpec.hs+295−13
.gitignore+5
@@ -1 +1,6 @@
11doc/_build/
2+scripts/
3+samples/
4+test-servers/
5+/doc/
6+.stack-work/
.travis.yml+154−30
@@ -1,34 +1,158 @@
1−sudo: false
2−
1+# This Travis job script has been generated by a script via
2+#
3+# haskell-ci '--config=cabal.haskell-ci' 'servant-quickcheck.cabal'
4+#
5+# To regenerate the script (for example after adjusting tested-with) run
6+#
7+# haskell-ci regenerate
8+#
9+# For more information, see https://github.com/haskell-CI/haskell-ci
10+#
11+# version: 0.10.1
12+#
13+version: ~> 1.0
314language: c
4−
5−env:
6− - GHCVER=7.8.4
7− - GHCVER=7.10.2
8−
9−addons:
10− apt:
11− sources:
12− - hvr-ghc
13− packages:
14− - ghc-7.8.4
15− - ghc-7.10.2
16− - cabal-install-1.22
17− - libgmp-dev
18− - wrk
19−
15+os: linux
16+dist: xenial
17+git:
18+ # whether to recursively clone submodules
19+ submodules: false
20+branches:
21+ only:
22+ - master
23+cache:
24+ directories:
25+ - $HOME/.cabal/packages
26+ - $HOME/.cabal/store
27+ - $HOME/.hlint
28+before_cache:
29+ - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
30+ # remove files that are regenerated by 'cabal update'
31+ - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
32+ - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
33+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
34+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
35+ - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
36+ - rm -rfv $CABALHOME/packages/head.hackage
37+jobs:
38+ include:
39+ - compiler: ghc-8.8.3
40+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.3","cabal-install-3.2"]}}
41+ os: linux
42+ - compiler: ghc-8.6.5
43+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.2"]}}
44+ os: linux
45+ - compiler: ghc-8.4.4
46+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.2"]}}
47+ os: linux
48+ - compiler: ghc-8.2.2
49+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.2"]}}
50+ os: linux
51+ - compiler: ghc-8.0.2
52+ addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.2"]}}
53+ os: linux
54+before_install:
55+ - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
56+ - WITHCOMPILER="-w $HC"
57+ - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
58+ - HCPKG="$HC-pkg"
59+ - unset CC
60+ - CABAL=/opt/ghc/bin/cabal
61+ - CABALHOME=$HOME/.cabal
62+ - export PATH="$CABALHOME/bin:$PATH"
63+ - TOP=$(pwd)
64+ - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
65+ - echo $HCNUMVER
66+ - CABAL="$CABAL -vnormal+nowrap"
67+ - set -o pipefail
68+ - TEST=--enable-tests
69+ - BENCH=--enable-benchmarks
70+ - HEADHACKAGE=false
71+ - rm -f $CABALHOME/config
72+ - |
73+ echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
74+ echo "remote-build-reporting: anonymous" >> $CABALHOME/config
75+ echo "write-ghc-environment-files: always" >> $CABALHOME/config
76+ echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
77+ echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
78+ echo "world-file: $CABALHOME/world" >> $CABALHOME/config
79+ echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
80+ echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
81+ echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
82+ echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
83+ echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
84+ echo "install-dirs user" >> $CABALHOME/config
85+ echo " prefix: $CABALHOME" >> $CABALHOME/config
86+ echo "repository hackage.haskell.org" >> $CABALHOME/config
87+ echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
2088install:
21− - (mkdir -p $HOME/.local/bin && cd $HOME/.local/bin && wget https://zalora-public.s3.amazonaws.com/tinc && chmod +x tinc)
22− - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/1.22/bin:$PATH
23− - ghc --version
24− - cabal --version
25− - travis_retry cabal update
26− - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
27−
89+ - ${CABAL} --version
90+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
91+ - |
92+ echo "program-default-options" >> $CABALHOME/config
93+ echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
94+ - cat $CABALHOME/config
95+ - rm -fv cabal.project cabal.project.local cabal.project.freeze
96+ - travis_retry ${CABAL} v2-update -v
97+ # Generate cabal.project
98+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
99+ - touch cabal.project
100+ - |
101+ echo "packages: ." >> cabal.project
102+ - if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-quickcheck' >> cabal.project ; fi
103+ - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
104+ - |
105+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-quickcheck)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
106+ - cat cabal.project || true
107+ - cat cabal.project.local || true
108+ - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
109+ - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
110+ - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
111+ - rm cabal.project.freeze
112+ - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
113+ - travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
28114script:
29− - tinc && cabal configure --enable-tests && cabal build && cabal test
30− #- (cd doc && tinc cabal configure --enable-tests && cabal build && cabal test)
115+ - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
116+ # Packaging...
117+ - ${CABAL} v2-sdist all
118+ # Unpacking...
119+ - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
120+ - cd ${DISTDIR} || false
121+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
122+ - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
123+ - PKGDIR_servant_quickcheck="$(find . -maxdepth 1 -type d -regex '.*/servant-quickcheck-[0-9.]*')"
124+ # Generate cabal.project
125+ - rm -rf cabal.project cabal.project.local cabal.project.freeze
126+ - touch cabal.project
127+ - |
128+ echo "packages: ${PKGDIR_servant_quickcheck}" >> cabal.project
129+ - if [ $HCNUMVER -ge 80200 ] ; then echo 'package servant-quickcheck' >> cabal.project ; fi
130+ - "if [ $HCNUMVER -ge 80200 ] ; then echo ' ghc-options: -Werror=missing-methods' >> cabal.project ; fi"
131+ - |
132+ - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(servant-quickcheck)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
133+ - cat cabal.project || true
134+ - cat cabal.project.local || true
135+ # Building...
136+ # this builds all libraries and executables (without tests/benchmarks)
137+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
138+ # Building with tests and benchmarks...
139+ # build & run tests, build benchmarks
140+ - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all
141+ # Testing...
142+ - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all
143+ # cabal check...
144+ - (cd ${PKGDIR_servant_quickcheck} && ${CABAL} -vnormal check)
145+ # haddock...
146+ - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
147+ # Building without installed constraints for packages in global-db...
148+ - rm -f cabal.project.local
149+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
150+ # Constraint sets
151+ - rm -rf cabal.project.local
152+ # Constraint set base-compat-0.10
153+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.10.*' all
154+ # Constraint set base-compat-0.11
155+ - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='base-compat ==0.11.*' all
31156
32−cache:
33− directories:
34− - $HOME/.tinc/cache
157+# REGENDATA ("0.10.1",["--config=cabal.haskell-ci","servant-quickcheck.cabal"])
158+# EOF
CHANGELOG.yamlnew file+214
@@ -0,0 +1,214 @@
1+releases:
2+ - version: "0.0.9.0"
3+ changes:
4+ - description: "Support servant-0.15 (#65)"
5+ authors: fizruk
6+ date: 2020-06-25
7+
8+ - description: "Relax constraints for GHC 8.10 (#70)"
9+ authors: felixmulder
10+ date: 2020-06-20
11+
12+ - version: "0.0.8.0"
13+ changes:
14+ - description: Support for servant-0.17
15+ authors: phadej
16+ date: 2019-01-23
17+
18+ - version: "0.0.7.3"
19+ changes:
20+ - description: Support for servant-0.14
21+ issue: 53
22+ authors: phadej
23+ date: 2018-06-12
24+
25+ - description: Fix a failure from OnlyJsonObjects when there is no content-type.
26+ issue: 55
27+ authors: Phenitei
28+ date: 2018-08-27
29+
30+ - description: A bug fix where notAllowedContainsAllowHeader would print the initial request alongside the failure instead of the request causing the failure when it failed.
31+ issue: 57
32+ authors: Phenitei
33+ date: 2018-08-29
34+
35+ - description: QuickCheck 2.12 compatibility
36+ issue: 58
37+ authors: parsonsmatt
38+ date: 2018-10-12
39+
40+ - description: GHC 8.6 compatibility
41+ issue: 59
42+ authors: phadej
43+ date: 2018-10-15
44+
45+ - version: "0.0.7.2"
46+ changes:
47+
48+ - description: Allow client to pass an HTTP Manager in to functions
49+ issue: 47
50+ authors: parsonsmatt
51+ date: 2018-05-10
52+
53+ - description: Fix "should not happen" error when exceptions are thrown
54+ issue: 48
55+ authors: parsonsmatt
56+ date: 2018-05-10
57+
58+ - version: "0.0.7.0"
59+ changes:
60+
61+ - description: Support for base-compat-0.10
62+ issue: none
63+ authors: phadej
64+ date: 2018-04-12
65+
66+ - version: "0.0.7.0"
67+ changes:
68+
69+ - description: Support for GHC-8.4.1
70+ issue: none
71+ authors: phadej
72+ date: 2018-03-23
73+
74+ - description: Requires hspec-2.5
75+ issue: none
76+ authors: phadej
77+ date: 2018-03-23
78+
79+ - version: "0.0.6.0"
80+ changes:
81+
82+ - description: Support for servant-0.12
83+ issue: none
84+ authors: phadej
85+ date: 2018-02-09
86+
87+ - version: "0.0.5.0"
88+ changes:
89+
90+ - description: Export forgotten predicates
91+ issue: none
92+ pr: 40
93+ authors: Phenitei
94+ date: 2017-12-14
95+
96+ - version: "0.0.4"
97+ changes:
98+
99+ - description: Support for Servant 0.12
100+ issue: none
101+ authors: phadej
102+ date: 2017-11-07
103+
104+ - description: Support for Servant 0.11
105+ issue: none
106+ pr: 32
107+ authors: adinapoli-iohk
108+ date: 2017-10-18
109+ notes: Includes 0-weighted instance for EmptyAPI
110+
111+ - version: "0.0.3.0"
112+ changes:
113+
114+ - description: Add jsonEquality
115+ issue: 2
116+ pr: 30
117+ authors: erewok
118+ date: 2017-10-15
119+
120+ - description: Support hspec >= 2.4
121+ issue: 27
122+ pr: 29
123+ authors: erewok, jkarni
124+ date: 2017-10-15
125+
126+ - version: "0.0.2.4"
127+ changes:
128+
129+ - description: Don't append slashes to paths
130+ issue: 22
131+ authors: declension
132+ date: 2017-03-11
133+
134+ - version: "0.0.2.3"
135+ changes:
136+
137+ - description: Fix QueryParam and QueryFlag requests
138+ issue: 23
139+ authors: declension
140+ date: 2017-03-10
141+
142+ - version: "0.0.2.2"
143+ changes:
144+
145+ - description: Make onlyJsonObjects succeed in non-JSON endpoints
146+ issue: 20
147+ authors: jkarni
148+ date: 2016-10-18
149+
150+
151+ - version: "0.0.2.1"
152+ changes:
153+
154+ - description: Add notLongerThan predicate
155+ pr: 17
156+ authors: jkarni
157+ date: 2016-10-05
158+
159+ - description: Add getsHaveLastModifiedHeader predicate
160+ pr: none
161+ authors: jkarni
162+ date: 2016-10-03
163+
164+ - description: Raise upper bounds
165+ notes: >
166+ For Quickcheck, aeson, http-client, servant, servant-client and
167+ servant-server.
168+ pr: none
169+ authors: jkarni
170+ date: 2016-10-03
171+
172+
173+ - version: "0.0.2.0"
174+ changes:
175+
176+ - description: Update CHANGELOG to YAML syntax.
177+ pr: 16
178+ authors: jkarni
179+ date: 2016-09-14
180+
181+ - description: Support new CaptureAll combinator
182+ pr: 16
183+ authors: jkarni
184+ date: 2016-09-14
185+
186+ - description: Support GHC 8
187+ pr: 16
188+ authors: jkarni
189+ date: 2016-09-14
190+
191+ - version: "0.0.1.1"
192+ changes:
193+
194+ - description: Exclude GHC 7.8 (by bumping base lower bound to 4.8)
195+ pr: none
196+ authors: jkarni
197+
198+ - description: More generous bounds for other packages.
199+ pr: none
200+ authors: jkarni
201+
202+ - version: "0.0.1.0"
203+ changes:
204+
205+ - description: Better error messages.
206+ notes: >
207+ Error messages now contain failing predicate, failing response and
208+ (except for response predicates), failing requests.
209+ pr: none
210+ authors: jkarni
211+
212+ - description: Signicant changes to RequestPredicate and ResponsePredicate types.
213+ pr: none
214+ authors: jkarni
cabal.haskell-cinew file+7
@@ -0,0 +1,7 @@
1+branches: master
2+
3+constraint-set base-compat-0.10
4+ constraints: base-compat ==0.10.*
5+
6+constraint-set base-compat-0.11
7+ constraints: base-compat ==0.11.*
cabal.projectnew file+4
@@ -0,0 +1,4 @@
1+packages: .
2+tests: true
3+
4+allow-newer: servant-blaze:servant
doc/posts/Announcement.anansi+171−8
@@ -10,13 +10,62 @@ an API description.
1010
1111This is much closer to the traditional use of `QuickCheck`. The most obvious
1212use-case is checking that properties hold of an *entire* server rather than of
13−individual endpoints.
13+individual endpoints. (But there are other uses that you can skip to if they
14+sound more interesting.)
1415
1516## `serverSatisfies`
1617
17−There are a variety of best practices in writing web APIs that aren't always
18−obvious. As a running example, let's use a simple service that allows adding,
19−removing, and querying biological species. Our SQL schema is:
18+A useful guideline when writing and maintaing software is that, if there isn't
19+a test for a behaviour or property, sooner or later that property will be broken.
20+Another important perspective is that tests are a form of documentation - the
21+present developer telling future ones "this matters, and should be this way".
22+
23+The advantage of using tests for this form of documentation is that there's
24+simply too much information to convey, some of it only relevant to very specific
25+use cases, and rather than overload developers with an inexhaustible quantity of
26+details that would be hard to keep track of or remember, tests are a mechanism
27+of reminding developers of *only the relevant information, at the right time*.
28+<<EXAMPLE>>.
29+
30+We might hope that we could use tests to communicate the wide array of best
31+practices that have developed around APIs. About to return a top-level integer
32+in JSON? A test should say that's bad practice. About to not catch exceptions
33+and give a more meaningful HTTP status code? Another test there to stop you.
34+
35+Traditionally, in web services these things get done at the level of *individual*
36+endpoints. But this means that if a developer who hasn't had extensive experience with web
37+programming best practices writes a *new* endpoint which *does* return a top-level
38+integer literal, there's no test there to stop her. Code review might help, but
39+code review is much more error prone than tests, and really only meant for those
40+things that are too subtle to automate. (Indeed, if code review were such a reliable
41+defense mechanism against bugs and bad code, why have tests and linters at all?)
42+
43+The problem, then, with thinking about tests as only existing at the level of individual
44+endpoints is that there are no tests *for* tests - tests that check that new
45+behaviour and tests conforms to higher-level, more general best practices.
46+
47+`servant-quickcheck` aims to solve that. It allows describing properties that
48+*all* endpoints must satisfy. If a new endpoint comes along, it too will be
49+tested for that property, without any further work.
50+
51+Why isn't this idea already popular? Well, most web frameworks don't have a
52+reified description of APIs (beyond perhaps the routes). When you don't know
53+what the endpoints of an application are, and what request body they expect,
54+trying to generate arbitrary requests is almost entirely going to result in
55+404s (not found) and 400s (bad request). Maybe one in a thousand requests will
56+actually test a handler. Not very useful.
57+
58+`servant` applications, on the other hand, have a machine-readable API description
59+already available. And they already associate "correct" requests with particular
60+types. It's a small step, therefore, to generate 'arbitrary' values for these
61+requests, and all of them will go through to your handlers. (Note: all of the
62+uses of `servant-quickcheck` work with applications *not* written with servant-server -
63+and indeed not *in Haskell - but the API must be described with the servant
64+DSL.)
65+
66+Let's see how this works in practice. As a running example, let's use a simple
67+service that allows adding, removing, and querying biological species. Our SQL
68+schema is:
2069
2170:d schema.sql
2271
@@ -53,9 +102,8 @@ import Control.Monad.IO.Class (liftIO)
53102type API
54103 = "species" :> (Capture "species-name" Text :> ( Get '[JSON] Species
55104 :<|> Delete '[JSON] ())
56− :<|> ReqBody '[JSON] Species :> Post '[JSON] ())
57− -- The plural of 'species' is unfortunately also 'species'
58− :<|> "speciess" :> Get '[JSON] [Species]
105+ :<|> ReqBody '[JSON] Species :> Post '[JSON] ()
106+ :<|> Get '[JSON] [Species])
59107
60108api :: Proxy API
61109api = Proxy
@@ -116,6 +164,8 @@ If you want to run this example.)
116164This is a plausible effort. You might want to spend a moment thinking about what
117165could be improved.
118166
167+Here are some `servant-quickcheck`-based tests for this API:
168+
119169:d Spec.hs
120170
121171{-# LANGUAGE OverloadedStrings #-}
@@ -129,11 +179,12 @@ import Test.QuickCheck (Arbitrary(..))
129179import Database.PostgreSQL.Simple (connectPostgreSQL)
130180
131181spec :: Spec
132−spec = describe "the species application" $ do
182+spec = describe "the species application" $ beforeAll check $ do
133183 let pserver = do
134184 conn <- connectPostgreSQL "dbname=servant-quickcheck"
135185 return $ server conn
136186
187+
137188 it "should not return 500s" $ do
138189 withServantServer api pserver $ \url ->
139190 serverSatisfies api url defaultArgs (not500 <%> mempty)
@@ -142,6 +193,30 @@ spec = describe "the species application" $ do
142193 withServantServer api pserver $ \url ->
143194 serverSatisfies api url defaultArgs (onlyJsonObjects <%> mempty)
144195
196+ it "should return valid locations for 201" $ do
197+ withServantServer api pserver $ \url ->
198+ serverSatisfies api url defaultArgs (createContainsValidLocation <%> mempty)
199+
200+ it "honours Accept header" $ do
201+ withServantServer api pserver $ \url ->
202+ serverSatisfies api url defaultArgs (honoursAcceptHeader <%> mempty)
203+
204+ it "405s contain Allow header" $ do
205+ withServantServer api pserver $ \url ->
206+ serverSatisfies api url defaultArgs (notAllowedContainsValidAllow <%> mempty)
207+
208+ it "should contain WWW-Authenticate header when returning 401s" $ do
209+ withServantServer api pserver $ \url ->
210+ serverSatisfies api url defaultArgs (unauthorizedContainsWWWAuthenticate <%> mempty)
211+
212+ it "GETs should have Cache-Control header" $ do
213+ withServantServer api pserver $ \url ->
214+ serverSatisfies api url defaultArgs (getsHaveCacheControlHeader <%> mempty)
215+
216+ it "HEADs should have Cache-Control header" $ do
217+ withServantServer api pserver $ \url ->
218+ serverSatisfies api url defaultArgs (headsHaveCacheControlHeader <%> mempty)
219+
145220main :: IO ()
146221main = do
147222 hspec spec
@@ -151,6 +226,94 @@ instance Arbitrary Species where
151226:
152227
153228
229+I won't go through all of the failures; as this is a literate haskell file, you
230+can go through them yourself if you're interested. But worth mentioning:
231+
232+ - The possible pattern match failure in `lookupSpecies` is caught.
233+ - Returning a top-level list is caught.
234+ - Not having a link for the `PostCreated` is caught.
235+
236+This last test failure illustrates an important point.
237+
238+
239+This was an example created with the knowledge of what it was supposed to
240+exemplify. To try to get a more accurate assessment of the practical usefulness
241+of `servant-quickcheck`, I tried running `serverSatisfies` with a few
242+predicates over some of the open-source `servant` servers I could find, and
243+results were also promising.
244+
245+There are probably a lot of other interesting properties that one might to add
246+besides those I've included. As an example, we could have a property that
247+all HTML is checked against, which is sometimes tricky for HTML that's
248+generated dynamically. Or check that every page has a Portuguese translation.
249+
250+### Why best practices are good
251+
252+As a side note: you might have wondered "why bother with API best practices?".
253+It is, it has to be said, a lot of extra (as in not only getting the feature done)
254+work to do, for dubious benefit. And indeed, the relevance of discoverability, for
255+example, unclear, since not that many tools use it as perhaps was anticipated.
256+
257+But `servant-quickcheck` both makes it *easier* to conform to best practices,
258+and exemplifies their advantage in enabling better tooling. If we pick 201 (Success, the 'resource' was
259+created), rather than the more generic 200 (Success), and do a *little* more work
260+by knowing to make this decision, `servant-quickcheck` knows this means there
261+should be some representation of the resource created. So it knows to ask you
262+for a link to it (the RFC creators thought to ask for this). And if you do (again,
263+a little more work), `servant-quickcheck` will know to try to look at that
264+resource by following the link, checking that it's not broken, and maybe even
265+returns a response that equivalent to the original POST request). And then it
266+finds a real bug - your application allows species with '/' in their name to
267+be created, but not queried with a 'GET' for! This, I think, is already a win.
268+
269+
270+## `serversEqual`
271+
272+There's another very appealing application of the ability to generate "sensible"
273+arbitrary requests. It's for testing that two applications are equal. We can generate arbitrary
274+requests, send them to both servers (in the same order), and check that the responses
275+are equivalent. (This was, incidentally, one of the first applications of
276+`servant-client`, albeit in a much more manual way, when we rewrote a microservice
277+originally in Python in Haskell.) Generally with rewrites, even if there's some
278+behaviour that isn't optimal, perhaps a lot of things already depend on that service
279+and make interace poorly with "improvements", so it makes sense to first mimick
280+*exactly* the original behaviour, and only then aim for improvements.
281+
282+`servant-quickcheck` provides a single function, `serversEqual`, that attempts
283+to verify the equivalence of servers. Since some aspects of responses might not
284+be relevant (for example, whether the the `Server` header is the same, or whether
285+two JSON responses have the same formatting), it allows you to provide a custom
286+equivalence function. Other than that, you need only provide an API type and two
287+URLs for testing, and the rest `serversEqual` handles.
288+
289+## Future directions: benchmarking
290+
291+What else could benefit from tooling that can automatically generate sensible
292+(*vis-a-vis* a particular application's expectations) requests?
293+
294+One area is extensive automatic benchmarking. Currently we use tools such as
295+`ab`, `wrk`, `httperf` in a very manual way - we pick a particular request that
296+we are interested in, and write a request that gets made thousands of times.
297+But now we can have a multiplicity of requests to benchmark with! This allows
298+*finding* slow endpoints, as well as (I would imagine, though I haven't actually
299+tried this yet) finding synchronization issues that make threads wait for too
300+long (such as waiting on an MVar that's not really needed), bad asymptotics
301+with respect to some other type of request.
302+
303+(On this last point, imagine not having an index in a database for "people",
304+ and having a tool that discovers that the latency on a search by first name
305+ grows linearly with the number of POST requests to a *different* endpoint! We'd
306+ need to do some work to do this well, possibly involving some machine
307+ learning, but it's an interesting and probably useful idea.)
308+
309+
310+# Conclusion
311+
312+I hope this library presents some useful functionality already, but I hope
313+you'll also think how it could be improved!
314+
315+There'll be a few more packages in the comings weeks - check back soon!
316+
154317**Note**: This post is an anansi literate file that generates multiple source
155318files. They are:
156319
doc/posts/Makefile+6−3
@@ -4,12 +4,15 @@ src/$(FILES): Announcement.anansi
44 anansi tangle -o "src" Announcement.anansi
55
66announcement.md: Announcement.anansi
7− anansi weave -o "announcement.md" Announcement.anansi
7+ anansi weave -o "announcement.tmp" Announcement.anansi
8+ cat announcement.tmp | tr -d '«' | tr -d '»' > announcement.md
9+ rm announcement.tmp
810
911.stack-work/bin/posts: $(FILES) stack.yaml posts.cabal
1012 stack build
1113
12−
14+announcement.html: announcement.md
15+ pandoc announcement.md -t html > announcement.html
1316
1417run: .stack-work/bin/posts
1518 stack exec posts
@@ -17,6 +20,6 @@ run: .stack-work/bin/posts
1720test: .stack-work/bin/posts
1821 stack test
1922
20−post: announcement.md
23+post: announcement.html
2124
2225.PHONY: post run test
doc/posts/announcement.md+224−24
@@ -9,22 +9,71 @@ an API description.
99
1010This is much closer to the traditional use of `QuickCheck`. The most obvious
1111use-case is checking that properties hold of an *entire* server rather than of
12−individual endpoints.
12+individual endpoints. (But there are other uses that you can skip to if they
13+sound more interesting.)
1314
1415## `serverSatisfies`
1516
16−There are a variety of best practices in writing web APIs that aren't always
17−obvious. As a running example, let's use a simple service that allows adding,
18−removing, and querying biological species. Our SQL schema is:
17+A useful guideline when writing and maintaing software is that, if there isn't
18+a test for a behaviour or property, sooner or later that property will be broken.
19+Another important perspective is that tests are a form of documentation - the
20+present developer telling future ones "this matters, and should be this way".
1921
22+The advantage of using tests for this form of documentation is that there's
23+simply too much information to convey, some of it only relevant to very specific
24+use cases, and rather than overload developers with an inexhaustible quantity of
25+details that would be hard to keep track of or remember, tests are a mechanism
26+of reminding developers of *only the relevant information, at the right time*.
27+<<EXAMPLE>>.
2028
21−> **«schema.sql»**
29+We might hope that we could use tests to communicate the wide array of best
30+practices that have developed around APIs. About to return a top-level integer
31+in JSON? A test should say that's bad practice. About to not catch exceptions
32+and give a more meaningful HTTP status code? Another test there to stop you.
33+
34+Traditionally, in web services these things get done at the level of *individual*
35+endpoints. But this means that if a developer who hasn't had extensive experience with web
36+programming best practices writes a *new* endpoint which *does* return a top-level
37+integer literal, there's no test there to stop her. Code review might help, but
38+code review is much more error prone than tests, and really only meant for those
39+things that are too subtle to automate. (Indeed, if code review were such a reliable
40+defense mechanism against bugs and bad code, why have tests and linters at all?)
41+
42+The problem, then, with thinking about tests as only existing at the level of individual
43+endpoints is that there are no tests *for* tests - tests that check that new
44+behaviour and tests conforms to higher-level, more general best practices.
45+
46+`servant-quickcheck` aims to solve that. It allows describing properties that
47+*all* endpoints must satisfy. If a new endpoint comes along, it too will be
48+tested for that property, without any further work.
49+
50+Why isn't this idea already popular? Well, most web frameworks don't have a
51+reified description of APIs (beyond perhaps the routes). When you don't know
52+what the endpoints of an application are, and what request body they expect,
53+trying to generate arbitrary requests is almost entirely going to result in
54+404s (not found) and 400s (bad request). Maybe one in a thousand requests will
55+actually test a handler. Not very useful.
56+
57+`servant` applications, on the other hand, have a machine-readable API description
58+already available. And they already associate "correct" requests with particular
59+types. It's a small step, therefore, to generate 'arbitrary' values for these
60+requests, and all of them will go through to your handlers. (Note: all of the
61+uses of `servant-quickcheck` work with applications *not* written with servant-server -
62+and indeed not *in Haskell - but the API must be described with the servant
63+DSL.)
64+
65+Let's see how this works in practice. As a running example, let's use a simple
66+service that allows adding, removing, and querying biological species. Our SQL
67+schema is:
68+
69+
70+> **schema.sql**
2271
2372>
2473> CREATE TABLE genus (
2574> genus_name text PRIMARY KEY,
2675> genus_family text NOT NULL
27−> )
76+> );
2877>
2978> CREATE TABLE species (
3079> species_name text PRIMARY KEY,
@@ -35,7 +84,7 @@ removing, and querying biological species. Our SQL schema is:
3584And our actual application:
3685
3786
38−> **«Main.hs»**
87+> **Main.hs**
3988
4089> {-# LANGUAGE DataKinds #-}
4190> {-# LANGUAGE DeriveAnyClass #-}
@@ -43,6 +92,8 @@ And our actual application:
4392> {-# LANGUAGE TypeOperators #-}
4493> {-# LANGUAGE OverloadedStrings #-}
4594> {-# LANGUAGE RecordWildCards #-}
95+> module Main where
96+>
4697> import Servant
4798> import Data.Aeson
4899> import Database.PostgreSQL.Simple
@@ -54,8 +105,9 @@ And our actual application:
54105> type API
55106> = "species" :> (Capture "species-name" Text :> ( Get '[JSON] Species
56107> :<|> Delete '[JSON] ())
57−> :<|> ReqBody '[JSON] Species :> Post '[JSON] ()
58−> :<|> "count" :> Get '[JSON] Int)
108+> :<|> ReqBody '[JSON] Species :> Post '[JSON] ())
109+> -- The plural of 'species' is unfortunately also 'species'
110+> :<|> "speciess" :> Get '[JSON] [Species]
59111>
60112> api :: Proxy API
61113> api = Proxy
@@ -74,19 +126,19 @@ And our actual application:
74126> instance FromRow Species
75127>
76128> server :: Connection -> Server API
77−> server conn = (\sname -> liftIO (lookupSpecies conn sname)
78−> :<|> liftIO (deleteSpecies conn sname))
79−> :<|> (\species -> liftIO $ insertSpecies conn species)
80−> :<|> (liftIO $ countSpecies conn)
129+> server conn = ((\sname -> liftIO (lookupSpecies conn sname)
130+> :<|> liftIO (deleteSpecies conn sname))
131+> :<|> (\species -> liftIO $ insertSpecies conn species))
132+> :<|> (liftIO $ allSpecies conn)
81133>
82134> lookupSpecies :: Connection -> Text -> IO Species
83135> lookupSpecies conn name = do
84−> [s] <- query conn "SELECT * FROM species WHERE species_name == ?" (Only name)
136+> [s] <- query conn "SELECT * FROM species WHERE species_name = ?" (Only name)
85137> return s
86138>
87139> deleteSpecies :: Connection -> Text -> IO ()
88140> deleteSpecies conn name = do
89−> _ <- execute conn "DELETE FROM species WHERE species_name == ?" (Only name)
141+> _ <- execute conn "DELETE FROM species WHERE species_name = ?" (Only name)
90142> return ()
91143>
92144> insertSpecies :: Connection -> Species -> IO ()
@@ -94,25 +146,173 @@ And our actual application:
94146> _ <- execute conn "INSERT INTO species (species_name, species_genus) VALUES (?)" (speciesName, speciesGenus)
95147> return ()
96148>
97−> countSpecies :: Connection -> IO Int
98−> countSpecies conn = do
99−> [Only count] <- query_ conn "SELECT count(*) FROM species"
100−> return count
149+> allSpecies :: Connection -> IO [Species]
150+> allSpecies conn = do
151+> query_ conn "SELECT * FROM species"
101152>
102153> main :: IO ()
103154> main = do
104−> conn <- connectPostgreSQL ""
155+> conn <- connectPostgreSQL "dbname=servant-quickcheck"
105156> run 8090 (serve api $ server conn)
106157
107158
159+(You'll also also need to run:
160+
161+```
162+createdb servant-quickcheck
163+psql --file schema.sql -d servant-quickcheck
164+```
165+
166+If you want to run this example.)
167+
168+This is a plausible effort. You might want to spend a moment thinking about what
169+could be improved.
170+
171+
172+> **Spec.hs**
173+
174+>
175+> {-# LANGUAGE OverloadedStrings #-}
176+> module Spec (main) where
177+>
178+> import Main (server, api, Species(..))
179+> import Test.Hspec
180+> import Test.QuickCheck.Instances
181+> import Servant.QuickCheck
182+> import Test.QuickCheck (Arbitrary(..))
183+> import Database.PostgreSQL.Simple (connectPostgreSQL)
184+>
185+> spec :: Spec
186+> spec = describe "the species application" $ beforeAll check $ do
187+> let pserver = do
188+> conn <- connectPostgreSQL "dbname=servant-quickcheck"
189+> return $ server conn
190+>
191+>
192+> it "should not return 500s" $ do
193+>
194+> it "should not return 500s" $ do
195+> withServantServer api pserver $ \url ->
196+> serverSatisfies api url defaultArgs (not500 <%> mempty)
197+>
198+> it "should not return top-level json" $ do
199+> withServantServer api pserver $ \url ->
200+> serverSatisfies api url defaultArgs (onlyJsonObjects <%> mempty)
201+>
202+> where
203+> check = do
204+> mvar <- newMVar []
205+> withServantServer api pserver $ \url ->
206+> serverSatisfies api url defaultArgs (onlyJsonObjects <%> mempty)
207+>
208+> main :: IO ()
209+> main = do
210+> hspec spec
211+>
212+> instance Arbitrary Species where
213+> arbitrary = Species <$> arbitrary <*> arbitrary
214+
215+
216+But this fails in quite a few ways.
217+
218+
219+<<TODO>>
220+
221+This was an example created with the knowledge of what it was supposed to
222+exemplify. To try to get a more accurate assessment of the practical usefulness
223+of `servant-quickcheck`, I tried running `serverSatisfies` with a few
224+predicates over some of the open-source `servant` servers I could find, and
225+results were also promising.
226+
227+There are probably a lot of other interesting properties that one might to add
228+besides those I've included. As an example, we could have a property that
229+all HTML is checked against, which is sometimes tricky for HTML that's
230+generated dynamically. Or check that every page has a Portuguese translation.
231+
232+### Why best practices are good
233+
234+As a side note: you might have wondered "why bother with API best practices?".
235+It is, it has to be said, a lot of extra (as in not only getting the feature done)
236+work to do, for dubious benefit. And indeed, the relevance of discoverability, for
237+example, unclear, since not that many tools use it as perhaps was anticipated.
238+
239+But `servant-quickcheck` both makes it *easier* to conform to best practices,
240+and exemplifies their advantage in enabling better tooling. If we pick 201 (Success, the 'resource' was
241+created), rather than the more generic 200 (Success), and do a *little* more work
242+by knowing to make this decision, `servant-quickcheck` knows this means there
243+should be some representation of the resource created. So it knows to ask you
244+for a link to it (the RFC creators thought to ask for this). And if you do (again,
245+a little more work), `servant-quickcheck` will know to try to look at that
246+resource by following the link, checking that it's not broken, and maybe even
247+returns a response that equivalent to the original POST request). And then it
248+finds a real bug - your application allows species with '/' in their name to
249+be created, but not queried with a 'GET' for! This, I think, is already a win.
250+
251+
252+## `serversEqual`
253+
254+There's another very appealing application of the ability to generate "sensible"
255+arbitrary requests. It's for testing that two applications are equal. We can generate arbitrary
256+requests, send them to both servers (in the same order), and check that the responses
257+are equivalent. (This was, incidentally, one of the first applications of
258+`servant-client`, albeit in a much more manual way, when we rewrote a microservice
259+originally in Python in Haskell.) Generally with rewrites, even if there's some
260+behaviour that isn't optimal, perhaps a lot of things already depend on that service
261+and make interace poorly with "improvements", so it makes sense to first mimick
262+*exactly* the original behaviour, and only then aim for improvements.
263+
264+`servant-quickcheck` provides a single function, `serversEqual`, that attempts
265+to verify the equivalence of servers. Since some aspects of responses might not
266+be relevant (for example, whether the the `Server` header is the same, or whether
267+two JSON responses have the same formatting), it allows you to provide a custom
268+equivalence function. Other than that, you need only provide an API type and two
269+URLs for testing, and the rest `serversEqual` handles.
270+
271+## Future directions: benchmarking
272+
273+What else could benefit from tooling that can automatically generate sensible
274+(*vis-a-vis* a particular application's expectations) requests?
275+
276+One area is extensive automatic benchmarking. Currently we use tools such as
277+`ab`, `wrk`, `httperf` in a very manual way - we pick a particular request that
278+we are interested in, and write a request that gets made thousands of times.
279+But now we can have a multiplicity of requests to benchmark with! This allows
280+*finding* slow endpoints, as well as (I would imagine, though I haven't actually
281+tried this yet) finding synchronization issues that make threads wait for too
282+long (such as waiting on an MVar that's not really needed), bad asymptotics
283+with respect to some other type of request.
284+
285+(On this last point, imagine not having an index in a database for "people",
286+ and having a tool that discovers that the latency on a search by first name
287+ grows linearly with the number of POST requests to a *different* endpoint! We'd
288+ need to do some work to do this well, possibly involving some machine
289+ learning, but it's an interesting and probably useful idea.)
290+
291+
292+# Conclusion
293+
294+I hope this library presents some useful functionality already, but I hope
295+you'll also think how it could be improved!
296+
297+There'll be a few more packages in the comings weeks - check back soon!
298+
299+**Note**: This post is an anansi literate file that generates multiple source
300+files. They are:
301+
302+
303+> ** Main.hs**
304+
305+> Main.hs
306+
307+
108308
109−> **» Main.hs**
309+> ** schema.sql**
110310
111−> «Main.hs»
311+> schema.sql
112312
113313
114314
115−> **» schema.sql**
315+> ** Spec.hs**
116316
117−> «schema.sql»
317+> Spec.hs
118318
doc/posts/src/Main.hs+2−2
@@ -1,6 +1,6 @@
1−#line 158 "Announcement.anansi"
1+#line 296 "Announcement.anansi"
22
3−#line 37 "Announcement.anansi"
3+#line 86 "Announcement.anansi"
44{-# LANGUAGE DataKinds #-}
55{-# LANGUAGE DeriveAnyClass #-}
66{-# LANGUAGE DeriveGeneric #-}
doc/posts/src/Spec.hs+9−3
@@ -1,6 +1,6 @@
1−#line 166 "Announcement.anansi"
1+#line 304 "Announcement.anansi"
22
3−#line 120 "Announcement.anansi"
3+#line 171 "Announcement.anansi"
44
55{-# LANGUAGE OverloadedStrings #-}
66module Spec (main) where
@@ -13,11 +13,12 @@ import Test.QuickCheck (Arbitrary(..))
1313import Database.PostgreSQL.Simple (connectPostgreSQL)
1414
1515spec :: Spec
16−spec = describe "the species application" $ do
16+spec = describe "the species application" $ beforeAll check $ do
1717 let pserver = do
1818 conn <- connectPostgreSQL "dbname=servant-quickcheck"
1919 return $ server conn
2020
21+
2122 it "should not return 500s" $ do
2223 withServantServer api pserver $ \url ->
2324 serverSatisfies api url defaultArgs (not500 <%> mempty)
@@ -26,6 +27,11 @@ spec = describe "the species application" $ do
2627 withServantServer api pserver $ \url ->
2728 serverSatisfies api url defaultArgs (onlyJsonObjects <%> mempty)
2829
30+ it "should return valid locations for 201" $ do
31+ withServantServer api pserver $ \url ->
32+ serverSatisfies api url defaultArgs (createContainsValidLocation <%> mempty)
33+
34+
2935main :: IO ()
3036main = do
3137 hspec spec
example/Main.hsnew file+31
@@ -0,0 +1,31 @@
1+{-# LANGUAGE OverloadedStrings, DataKinds #-}
2+module Main (main) where
3+
4+import Servant
5+import Servant.QuickCheck
6+import Test.Hspec
7+import Data.Text (Text)
8+import System.Environment (getArgs)
9+
10+main :: IO ()
11+main = do
12+ args <- getArgs
13+ case args of
14+ [] -> putStrLn "Not running without arguments. Try --help or --fail-fast."
15+ _ -> hspec spec
16+
17+-- Change to String to reproduce
18+-- https://github.com/haskell-servant/servant-quickcheck/issues/41
19+type API = Get '[PlainText] Text
20+
21+api :: Proxy API
22+api = Proxy
23+
24+server :: Server API
25+server = return "Sigurð Fáfnirslayer"
26+
27+spec :: Spec
28+spec = describe "example server" $
29+ it "mangles UTF-8 in error messages" $
30+ withServantServer api (return server) $ \burl ->
31+ serverSatisfies api burl defaultArgs (getsHaveCacheControlHeader <%> mempty)
servant-quickcheck.cabal+126−89
@@ -1,101 +1,138 @@
1−name: servant-quickcheck
2−version: 0.1.0.0
3−synopsis: QuickCheck entire APIs
1+name: servant-quickcheck
2+version: 0.0.9.1
3+synopsis: QuickCheck entire APIs
44description:
5− This packages provides QuickCheck properties that are tested across an entire
6− API.
5+ This packages provides QuickCheck properties that are tested across an entire
6+ API.
77
8−license: BSD3
9−license-file: LICENSE
10−author: Julian K. Arni
11−maintainer: jkarni@gmail.com
12−category: Web
13−build-type: Simple
14−cabal-version: >=1.10
8+license: BSD3
9+license-file: LICENSE
10+author: Julian K. Arni
11+maintainer: jkarni@gmail.com
12+category: Web
13+build-type: Simple
14+cabal-version: >=1.10
15+extra-source-files: CHANGELOG.yaml
16+tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || == 8.8.3
17+
18+source-repository head
19+ type: git
20+ location: https://github.com/haskell-servant/servant-quickcheck
1521
1622flag long-tests
1723 description: Run more QuickCheck tests
1824 default: False
1925
2026library
21− exposed-modules: Servant.QuickCheck
22− , Servant.QuickCheck.Internal
23− -- , Servant.QuickCheck.Internal.Benchmarking
24− , Servant.QuickCheck.Internal.Predicates
25− , Servant.QuickCheck.Internal.HasGenRequest
26− , Servant.QuickCheck.Internal.QuickCheck
27− , Servant.QuickCheck.Internal.Equality
28− build-depends: base >=4.7 && <4.9
29− , QuickCheck == 2.8.*
30− , bytestring == 0.10.*
31− , aeson > 0.10 && < 0.12
32− , mtl == 2.2.*
33− , http-client == 0.4.*
34− , http-types == 0.9.*
35− , http-media
36− , servant-client == 0.7.*
37− , servant-server == 0.7.*
38− , string-conversions == 0.4.*
39− , data-default-class == 0.0.*
40− , servant == 0.7.*
41− , warp >= 3.2.4 && < 3.3
42− , process == 1.2.*
43− , temporary == 1.2.*
44− , split == 0.2.*
45− , case-insensitive
46− , hspec
47− , text == 1.*
48− hs-source-dirs: src
49− default-extensions: TypeOperators
50− , FlexibleInstances
51− , FlexibleContexts
52− , DataKinds
53− , GADTs
54− , MultiParamTypeClasses
55− , DeriveFunctor
56− , KindSignatures
57− , RankNTypes
58− , ConstraintKinds
59− , DeriveGeneric
60− , ScopedTypeVariables
61− , OverloadedStrings
62− , FunctionalDependencies
63− default-language: Haskell2010
27+ exposed-modules:
28+ Servant.QuickCheck
29+ Servant.QuickCheck.Internal
30+ Servant.QuickCheck.Internal.Equality
31+ Servant.QuickCheck.Internal.ErrorTypes
32+ Servant.QuickCheck.Internal.HasGenRequest
33+ Servant.QuickCheck.Internal.Predicates
34+ Servant.QuickCheck.Internal.QuickCheck
35+
36+ build-depends:
37+ aeson >=0.8 && <2
38+ , base >=4.9 && <4.15
39+ , base-compat-batteries >=0.10.1 && <0.12
40+ , bytestring >=0.10 && <0.11
41+ , case-insensitive >=1.2 && <1.3
42+ , clock >=0.7 && <0.9
43+ , data-default-class >=0.0 && <0.2
44+ , hspec >=2.5.6 && <2.8
45+ , http-client >=0.4.30 && <0.8
46+ , http-media >=0.6 && <0.9
47+ , http-types >=0.8 && <0.13
48+ , mtl >=2.1 && <2.3
49+ , pretty >=1.1 && <1.2
50+ , process >=1.2 && <1.7
51+ , QuickCheck >=2.7 && <2.15
52+ , servant >=0.17 && <0.19
53+ , servant-client >=0.17 && <0.19
54+ , servant-server >=0.17 && <0.19
55+ , split >=0.2 && <0.3
56+ , string-conversions >=0.3 && <0.5
57+ , temporary >=1.2 && <1.4
58+ , text >=1 && <2
59+ , time >=1.5 && <1.11
60+ , warp >=3.2.4 && <3.4
61+
62+ if !impl(ghc >=8.0)
63+ build-depends: semigroups >=0.18.3 && <0.20
64+
65+ hs-source-dirs: src
66+ default-extensions:
67+ NoImplicitPrelude
68+ ConstraintKinds
69+ DataKinds
70+ DeriveDataTypeable
71+ DeriveFunctor
72+ DeriveGeneric
73+ FlexibleContexts
74+ FlexibleInstances
75+ FunctionalDependencies
76+ GADTs
77+ KindSignatures
78+ MultiParamTypeClasses
79+ OverloadedStrings
80+ RankNTypes
81+ ScopedTypeVariables
82+ TypeOperators
83+
84+ default-language: Haskell2010
6485
6586test-suite spec
66− type: exitcode-stdio-1.0
67− ghc-options: -Wall -O2 -threaded
68− default-language: Haskell2010
69− hs-source-dirs: test
70− main-is: Spec.hs
71− other-modules: Servant.QuickCheck.InternalSpec
72− build-depends: base == 4.*
73− , servant-quickcheck
74− , hspec
75− , http-client
76− , warp
77− , servant-server
78− , servant-client
79− , servant
80− , transformers
81− , QuickCheck
82− , quickcheck-io
83− default-extensions: TypeOperators
84− , FlexibleInstances
85− , FlexibleContexts
86− , DataKinds
87+ type: exitcode-stdio-1.0
88+ ghc-options: -Wall -threaded
89+ default-language: Haskell2010
90+ hs-source-dirs: test
91+ main-is: Spec.hs
92+ other-modules: Servant.QuickCheck.InternalSpec
93+ build-tool-depends: hspec-discover:hspec-discover -any
94+ build-depends:
95+ aeson
96+ , base
97+ , base-compat-batteries
98+ , blaze-html
99+ , bytestring
100+ , hspec
101+ , hspec-core >=2.5.5 && <2.8
102+ , http-client
103+ , QuickCheck
104+ , quickcheck-io
105+ , servant
106+ , servant-blaze
107+ , servant-client
108+ , servant-quickcheck
109+ , servant-server
110+ , transformers
111+ , warp
112+
113+ default-extensions:
114+ NoImplicitPrelude
115+ DataKinds
116+ FlexibleContexts
117+ FlexibleInstances
118+ GADTs
119+ OverloadedStrings
120+ ScopedTypeVariables
121+ TypeOperators
122+
87123 if flag(long-tests)
88− cpp-options: -DLONG_TESTS
124+ cpp-options: -DLONG_TESTS
125+
126+test-suite example
127+ type: exitcode-stdio-1.0
128+ main-is: Main.hs
129+ hs-source-dirs: example
130+ ghc-options: -Wall
131+ build-depends:
132+ base
133+ , hspec
134+ , servant-quickcheck
135+ , servant-server
136+ , text
89137
90−-- test-suite doctests
91−-- default-language: Haskell2010
92−-- type: exitcode-stdio-1.0
93−-- ghc-options: -threaded
94−-- main-is: Doctest.hs
95−-- hs-source-dirs: test
96−-- build-depends: base >4 && <5
97−-- , doctest
98−-- , filemanip
99−-- , directory
100−-- , filepath
101−-- HS-Source-Dirs: test
138+ default-language: Haskell2010
src/Servant/QuickCheck.hs+16−2
@@ -27,12 +27,18 @@ module Servant.QuickCheck
2727 -- in RFCs. The __Best Practices__ includes, in addition to RFC
2828 -- recommendations, recommendations found elsewhere or generally accepted.
2929 , not500
30+ , notLongerThan
3031 , onlyJsonObjects
32+ , honoursAcceptHeader
3133 , notAllowedContainsAllowHeader
3234 , unauthorizedContainsWWWAuthenticate
35+ , getsHaveLastModifiedHeader
3336 , getsHaveCacheControlHeader
3437 , headsHaveCacheControlHeader
3538 , createContainsValidLocation
39+ -- * Html Predicates
40+ , htmlIncludesDoctype
41+
3642 -- *** Predicate utilities and types
3743 , (<%>)
3844 , Predicates
@@ -48,6 +54,7 @@ module Servant.QuickCheck
4854 -- represents other means of checking equality
4955 -- *** Useful @ResponseEquality@s
5056 , bodyEquality
57+ , jsonEquality
5158 , allEquality
5259 -- ** Response equality type
5360 , ResponseEquality(..)
@@ -59,16 +66,23 @@ module Servant.QuickCheck
5966 , defaultArgs
6067
6168 -- ** Re-exports
69+ -- | Types and constructors from other packages that are generally needed for
70+ -- using @servant-quickcheck@.
6271 , BaseUrl(..)
6372 , Scheme(..)
6473 , Args(..)
74+ , Proxy(..)
6575
6676
6777 ) where
6878
79+import Data.Proxy (Proxy (..))
80+import Servant.Client (BaseUrl (..), Scheme (..))
6981import Servant.QuickCheck.Internal
70−import Servant.Client (BaseUrl(..), Scheme(..))
71−import Test.QuickCheck (Args(..), stdArgs)
82+import Test.QuickCheck (Args (..), stdArgs)
7283
84+-- | QuickCheck @Args@ with 1000 rather than 100 test cases.
85+--
86+-- /Since 0.0.0.0/
7387defaultArgs :: Args
7488defaultArgs = stdArgs { maxSuccess = 1000 }
src/Servant/QuickCheck/Internal.hs+4−4
@@ -1,7 +1,7 @@
11module Servant.QuickCheck.Internal (module X) where
22
3+import Servant.QuickCheck.Internal.Equality as X
4+import Servant.QuickCheck.Internal.ErrorTypes as X
35import Servant.QuickCheck.Internal.HasGenRequest as X
4−import Servant.QuickCheck.Internal.Predicates as X
5−import Servant.QuickCheck.Internal.QuickCheck as X
6−import Servant.QuickCheck.Internal.Equality as X
7−import Servant.QuickCheck.Internal.Benchmarking as X
6+import Servant.QuickCheck.Internal.Predicates as X
7+import Servant.QuickCheck.Internal.QuickCheck as X
src/Servant/QuickCheck/Internal/Benchmarking.hsdeleted−83
@@ -1,83 +0,0 @@
1−-- This is a WIP module that shouldn't be used.
2−module Servant.QuickCheck.Internal.Benchmarking where
3−
4−import Data.ByteString (ByteString)
5−import Data.ByteString.Lazy (toStrict)
6−import Network.HTTP.Client
7−import Network.HTTP.Types
8−import Servant.Client
9−
10−data BenchOptions = BenchOptions
11− { duration :: Int
12− , threads :: Int
13− , connections :: Int
14− , noOfTests :: Int
15− } deriving (Eq, Show, Read)
16−
17−defaultBenchOptions :: BenchOptions
18−defaultBenchOptions = BenchOptions
19− { duration = 10
20− , threads = 1
21− , connections = 10
22− , noOfTests = 10
23− }
24−
25−data WrkScript = WrkScript
26− { wrkScheme :: Scheme
27− , wrkHost :: ByteString
28− , wrkPort :: Int
29− , wrkMethod :: Method
30− , wrkPath :: ByteString
31− , wrkHeaders :: [Header]
32− , wrkBody :: ByteString
33− } deriving (Eq, Show)
34−
35−mkScript :: WrkScript -> String
36−mkScript w
37− = "wrk.scheme = \"" ++ sscheme (wrkScheme w) ++ "\""
38− ++ "\nwrk.host = " ++ show (wrkHost w)
39− ++ "\nwrk.port = " ++ show (wrkPort w)
40− ++ "\nwrk.method = " ++ show (wrkMethod w)
41− ++ "\nwrk.path = " ++ show (wrkPath w)
42− ++ foldr (\(h,v) old -> old ++ "\nwrk.headers[" ++ show h ++ "] = " ++ show v)
43− ""
44− (wrkHeaders w)
45− ++ "\nwrk.body = " ++ show (wrkBody w)
46− ++ "\n" ++ reportFmt
47− where
48− sscheme Http = "http"
49− sscheme Https = "https"
50−
51−reqToWrk :: Request -> WrkScript
52−reqToWrk r = WrkScript
53− { wrkScheme = Http
54− , wrkHost = host r
55− , wrkPort = port r
56− , wrkMethod = method r
57− , wrkPath = path r
58− , wrkHeaders = requestHeaders r
59− , wrkBody = case requestBody r of
60− RequestBodyLBS r' -> toStrict r'
61− _ -> error "expecting RequestBodyLBS"
62− }
63−
64−reportFmt :: String
65−reportFmt
66− = "done = function(summary, latency, requests)\n"
67− ++ " for _, p in pairs({ 50, 75, 99, 99.999 }) do\n"
68− ++ " n = latency:percentile(p)\n"
69− ++ " io.write(string.format(\"%g%%, %d\\n\", p, n))\n"
70− ++ " end\n"
71− ++ "end\n"
72−
73−{-data BenchResult = BenchResult-}
74− {-{ benchReq :: Request-}
75− {-, benchLatencyDist :: [(Percentile, Microsecs)]-}
76− {-, benchLatencyAvg :: Microsecs-}
77− {-} deriving (Eq, Show, Read, Generic)-}
78−
79−{-newtype Microsecs = Microsecs { unMicroSecs :: Int }-}
80− {-deriving (Eq, Show, Read, Generic)-}
81−
82−{-newtype Percentile = Percentile { unPercentile :: Int }-}
83− {-deriving (Eq, Show, Read, Generic)-}
src/Servant/QuickCheck/Internal/Equality.hs+42−4
@@ -1,20 +1,58 @@
11module Servant.QuickCheck.Internal.Equality where
22
3−import Network.HTTP.Client
4−import Data.Function (on)
3+import Data.Aeson (Value, decode, decodeStrict)
4+import Data.ByteString (ByteString)
5+import qualified Data.ByteString.Lazy as LB
6+import Data.Function (on)
7+import Network.HTTP.Client (Response, responseBody)
8+import Data.Semigroup (Semigroup (..))
9+import Prelude.Compat
510
611newtype ResponseEquality b
712 = ResponseEquality { getResponseEquality :: Response b -> Response b -> Bool }
813
14+instance Semigroup (ResponseEquality b) where
15+ ResponseEquality a <> ResponseEquality b = ResponseEquality $ \x y ->
16+ a x y && b x y
17+
918instance Monoid (ResponseEquality b) where
1019 mempty = ResponseEquality $ \_ _ -> True
11− ResponseEquality a `mappend` ResponseEquality b = ResponseEquality $ \x y ->
12− a x y && b x y
20+ mappend = (<>)
1321
1422-- | Use `Eq` instance for `Response`
23+--
24+-- /Since 0.0.0.0/
1525allEquality :: Eq b => ResponseEquality b
1626allEquality = ResponseEquality (==)
1727
1828-- | ByteString `Eq` instance over the response body.
29+--
30+-- /Since 0.0.0.0/
1931bodyEquality :: Eq b => ResponseEquality b
2032bodyEquality = ResponseEquality ((==) `on` responseBody)
33+
34+-- | Equality as 'Value'. This means that if two bodies are equal as JSON
35+-- (e.g., insignificant whitespace difference) they are considered equal.
36+--
37+-- /Since 0.0.3.0/
38+jsonEquality :: (JsonEq b) => ResponseEquality b
39+jsonEquality = ResponseEquality (jsonEq `on` responseBody)
40+
41+class JsonEq a where
42+ decode' :: a -> Maybe Value
43+ jsonEq :: a -> a -> Bool
44+ jsonEq first second = compareDecodedResponses (decode' first) (decode' second)
45+
46+instance JsonEq LB.ByteString where
47+ decode' = decode
48+
49+instance JsonEq ByteString where
50+ decode' = decodeStrict
51+
52+compareDecodedResponses :: Maybe Value -> Maybe Value -> Bool
53+compareDecodedResponses resp1 resp2 =
54+ case resp1 of
55+ Nothing -> False -- if decoding fails we assume failure
56+ (Just r1) -> case resp2 of
57+ Nothing -> False -- another decode failure
58+ (Just r2) -> r1 == r2
src/Servant/QuickCheck/Internal/ErrorTypes.hsnew file+82
@@ -0,0 +1,82 @@
1+{-# LANGUAGE CPP #-}
2+module Servant.QuickCheck.Internal.ErrorTypes where
3+
4+import Control.Exception (Exception (..))
5+import qualified Data.ByteString.Lazy as LBS
6+import Data.String.Conversions (cs)
7+import qualified Data.Text as T
8+import Data.Typeable (Typeable)
9+import GHC.Generics (Generic)
10+import qualified Network.HTTP.Client as C
11+import Network.HTTP.Types (Header, statusCode)
12+import Text.PrettyPrint
13+
14+import Prelude.Compat hiding ((<>))
15+
16+data PredicateFailure
17+ = PredicateFailure T.Text (Maybe C.Request) (C.Response LBS.ByteString)
18+ deriving (Typeable, Generic)
19+
20+instance Exception ServerEqualityFailure where
21+
22+instance Show PredicateFailure where
23+ show = render . prettyPredicateFailure
24+
25+
26+data ServerEqualityFailure
27+ = ServerEqualityFailure C.Request (C.Response LBS.ByteString) (C.Response LBS.ByteString)
28+ deriving (Typeable, Generic)
29+
30+instance Show ServerEqualityFailure where
31+ show = render . prettyServerEqualityFailure
32+
33+
34+instance Exception PredicateFailure where
35+
36+-- * Pretty printing
37+
38+prettyHeaders :: [Header] -> Doc
39+prettyHeaders hdrs = vcat $ prettyHdr <$> hdrs
40+ where
41+ prettyHdr (hn, h) = text (show hn) <> colon <+> text (show h)
42+
43+prettyReq :: C.Request -> Doc
44+prettyReq r =
45+ text "Request:" $$ (nest 5 $
46+ text "Method:" <+> (nest 5 $ text . show $ C.method r)
47+ $$ text "Path:" <+> (nest 5 $ text . cs $ C.path r)
48+ $$ text "Headers:" <+> (nest 5 $ prettyHeaders $ C.requestHeaders r)
49+ $$ text "Body:" <+> (nest 5 $ text . getReqBody $ C.requestBody r))
50+ where
51+ getReqBody (C.RequestBodyLBS lbs ) = cs lbs
52+ getReqBody (C.RequestBodyBS bs ) = cs bs
53+ getReqBody _ = error "expected bytestring body"
54+
55+prettyResp :: C.Response LBS.ByteString -> Doc
56+prettyResp r =
57+ text "Response:" $$ (nest 5 $
58+ text "Status code:" <+> (nest 5 $ text . show . statusCode $ C.responseStatus r)
59+ $$ text "Headers:" $$ (nest 10 $ prettyHeaders $ C.responseHeaders r)
60+ $$ text "Body:" <+> (nest 5 $ text . cs $ C.responseBody r))
61+
62+
63+
64+prettyServerEqualityFailure :: ServerEqualityFailure -> Doc
65+prettyServerEqualityFailure (ServerEqualityFailure req resp1 resp2) =
66+ text "Server equality failed" $$ (nest 5 $
67+ prettyReq req
68+ $$ prettyResp resp1
69+ $$ prettyResp resp2)
70+
71+
72+prettyPredicateFailure :: PredicateFailure -> Doc
73+prettyPredicateFailure (PredicateFailure predicate req resp) =
74+ text "Predicate failed" $$ (nest 5 $
75+ text "Predicate:" <+> (text $ T.unpack predicate)
76+ $$ r
77+ $$ prettyResp resp)
78+ where
79+ r = case req of
80+ Nothing -> text ""
81+ Just v -> prettyReq v
82+
src/Servant/QuickCheck/Internal/HasGenRequest.hs+113−52
@@ -1,97 +1,148 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE PolyKinds #-}
23module Servant.QuickCheck.Internal.HasGenRequest where
34
4−import Data.Default.Class (def)
5−import Data.Monoid ((<>))
6−import Data.String (fromString)
7−import Data.String.Conversions (cs)
8−import GHC.TypeLits
9−import Network.HTTP.Client (Request, RequestBody (..), host,
10− method, path, port, requestBody,
11− requestHeaders, secure, queryString)
12−import Network.HTTP.Media (renderHeader)
13−import Servant
14−import Servant.API.ContentTypes
15−import Servant.Client (BaseUrl (..), Scheme (..))
16−import Test.QuickCheck
17−
18−
5+import Data.String (fromString)
6+import Data.String.Conversions (cs)
7+import GHC.TypeLits (KnownSymbol, Nat, symbolVal)
8+import Network.HTTP.Client (Request, RequestBody (..), host, method, path,
9+ port, queryString, requestBody, requestHeaders,
10+ secure, defaultRequest)
11+import Network.HTTP.Media (renderHeader)
12+import Prelude.Compat
13+import Servant
14+import Servant.API.ContentTypes (AllMimeRender (..))
15+import Servant.Client (BaseUrl (..), Scheme (..))
16+import Test.QuickCheck (Arbitrary (..), Gen, elements, frequency)
17+
18+import qualified Data.ByteString as BS
19+import qualified Data.ByteString.Internal as BS (c2w)
20+
21+
22+-- -----------------------------------------------------------------------------
23+-- runGenRequest
24+
25+-- | This function returns a QuickCheck `Gen a` when passed a servant API value,
26+-- typically a `Proxy API`. The generator returned is a function
27+-- that accepts a `BaseUrl` and returns a `Request`, which can then be used
28+-- to issue network requests. This `Gen` type makes it easier to compare distinct
29+-- APIs across different `BaseUrl`s.
30+runGenRequest :: HasGenRequest a => Proxy a -> Gen (BaseUrl -> Request)
31+runGenRequest = snd . genRequest
32+
33+
34+-- -----------------------------------------------------------------------------
35+-- HasGenRequest
36+
37+-- | This is the core Servant-Quickcheck generator, which, when given a `Proxy API`
38+-- will return a pair of `Int` and `Gen a`, where `a` is a function from
39+-- `BaseUrl` to a `Network.Http.Client.Request`. The `Int` is a weight for the
40+-- QuickCheck `frequency` function which ensures a random distribution across
41+-- all endpoints in an API.
1942class HasGenRequest a where
20− genRequest :: Proxy a -> Gen (BaseUrl -> Request)
43+ genRequest :: Proxy a -> (Int, Gen (BaseUrl -> Request))
44+
2145
2246instance (HasGenRequest a, HasGenRequest b) => HasGenRequest (a :<|> b) where
2347 genRequest _
24− = oneof [ genRequest (Proxy :: Proxy a)
25− , genRequest (Proxy :: Proxy b)
26− ]
48+ = (lf + rf, frequency [l, r])
49+ where
50+ l@(lf, _) = genRequest (Proxy :: Proxy a)
51+ r@(rf, _) = genRequest (Proxy :: Proxy b)
52+
2753
2854instance (KnownSymbol path, HasGenRequest b) => HasGenRequest (path :> b) where
29− genRequest _ = do
55+ genRequest _ = (oldf, do
3056 old' <- old
31− return $ \burl -> let r = old' burl in r { path = new <> "/" <> path r }
57+ return $ \burl -> let r = old' burl
58+ oldPath = path r
59+ oldPath' = BS.dropWhile (== BS.c2w '/') oldPath
60+ paths = filter (not . BS.null) [new, oldPath']
61+ in r { path = "/" <> BS.intercalate "/" paths })
3262 where
33− old = genRequest (Proxy :: Proxy b)
63+ (oldf, old) = genRequest (Proxy :: Proxy b)
3464 new = cs $ symbolVal (Proxy :: Proxy path)
3565
66+instance HasGenRequest EmptyAPI where
67+ genRequest _ = (0, error "EmptyAPIs cannot be queried.")
68+
69+instance HasGenRequest api => HasGenRequest (Summary d :> api) where
70+ genRequest _ = genRequest (Proxy :: Proxy api)
71+
72+instance HasGenRequest api => HasGenRequest (Description d :> api) where
73+ genRequest _ = genRequest (Proxy :: Proxy api)
74+
3675instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
37− => HasGenRequest (Capture x c :> b) where
38− genRequest _ = do
76+ => HasGenRequest (Capture' mods x c :> b) where
77+ genRequest _ = (oldf, do
3978 old' <- old
4079 new' <- toUrlPiece <$> new
41− return $ \burl -> let r = old' burl in r { path = cs new' <> "/" <> path r }
80+ return $ \burl -> let r = old' burl in r { path = cs new' <> path r })
4281 where
43− old = genRequest (Proxy :: Proxy b)
82+ (oldf, old) = genRequest (Proxy :: Proxy b)
4483 new = arbitrary :: Gen c
4584
85+instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
86+ => HasGenRequest (CaptureAll x c :> b) where
87+ genRequest _ = (oldf, do
88+ old' <- old
89+ new' <- fmap (cs . toUrlPiece) <$> new
90+ let new'' = BS.intercalate "/" new'
91+ return $ \burl -> let r = old' burl in r { path = new'' <> path r })
92+ where
93+ (oldf, old) = genRequest (Proxy :: Proxy b)
94+ new = arbitrary :: Gen [c]
95+
4696instance (Arbitrary c, KnownSymbol h, HasGenRequest b, ToHttpApiData c)
47− => HasGenRequest (Header h c :> b) where
48− genRequest _ = do
97+ => HasGenRequest (Header' mods h c :> b) where
98+ genRequest _ = (oldf, do
4999 old' <- old
50− new' <- toUrlPiece <$> new
100+ new' <- toUrlPiece <$> new -- TODO: generate lenient or/and optional
51101 return $ \burl -> let r = old' burl in r {
52− requestHeaders = (hdr, cs new') : requestHeaders r }
102+ requestHeaders = (hdr, cs new') : requestHeaders r })
53103 where
54− old = genRequest (Proxy :: Proxy b)
104+ (oldf, old) = genRequest (Proxy :: Proxy b)
55105 hdr = fromString $ symbolVal (Proxy :: Proxy h)
56106 new = arbitrary :: Gen c
57107
58108instance (AllMimeRender x c, Arbitrary c, HasGenRequest b)
59− => HasGenRequest (ReqBody x c :> b) where
60− genRequest _ = do
61− old' <- old
109+ => HasGenRequest (ReqBody' mods x c :> b) where
110+ genRequest _ = (oldf, do
111+ old' <- old -- TODO: generate lenient
62112 new' <- new
63113 (ct, bd) <- elements $ allMimeRender (Proxy :: Proxy x) new'
64114 return $ \burl -> let r = old' burl in r {
65115 requestBody = RequestBodyLBS bd
66116 , requestHeaders = ("Content-Type", renderHeader ct) : requestHeaders r
67− }
117+ })
68118 where
69− old = genRequest (Proxy :: Proxy b)
119+ (oldf, old) = genRequest (Proxy :: Proxy b)
70120 new = arbitrary :: Gen c
71121
72122instance (KnownSymbol x, Arbitrary c, ToHttpApiData c, HasGenRequest b)
73− => HasGenRequest (QueryParam x c :> b) where
74− genRequest _ = do
75− new' <- new
123+ => HasGenRequest (QueryParam' mods x c :> b) where
124+ genRequest _ = (oldf, do
125+ new' <- new -- TODO: generate lenient or/and optional
76126 old' <- old
77− return $ \burl -> let r = old' burl in r {
78− queryString = queryString r
79− <> param <> "=" <> cs (toQueryParam new') }
127+ return $ \burl -> let r = old' burl
128+ newExpr = param <> "=" <> cs (toQueryParam new')
129+ qs = queryString r in r {
130+ queryString = if BS.null qs then newExpr else newExpr <> "&" <> qs })
80131 where
81− old = genRequest (Proxy :: Proxy b)
132+ (oldf, old) = genRequest (Proxy :: Proxy b)
82133 param = cs $ symbolVal (Proxy :: Proxy x)
83134 new = arbitrary :: Gen c
84135
85136instance (KnownSymbol x, Arbitrary c, ToHttpApiData c, HasGenRequest b)
86137 => HasGenRequest (QueryParams x c :> b) where
87− genRequest _ = do
138+ genRequest _ = (oldf, do
88139 new' <- new
89140 old' <- old
90141 return $ \burl -> let r = old' burl in r {
91142 queryString = queryString r
92− <> if length new' > 0 then fold (toParam <$> new') else ""}
143+ <> if length new' > 0 then fold (toParam <$> new') else ""})
93144 where
94− old = genRequest (Proxy :: Proxy b)
145+ (oldf, old) = genRequest (Proxy :: Proxy b)
95146 param = cs $ symbolVal (Proxy :: Proxy x)
96147 new = arbitrary :: Gen [c]
97148 toParam c = param <> "[]=" <> cs (toQueryParam c)
@@ -99,22 +150,32 @@ instance (KnownSymbol x, Arbitrary c, ToHttpApiData c, HasGenRequest b)
99150
100151instance (KnownSymbol x, HasGenRequest b)
101152 => HasGenRequest (QueryFlag x :> b) where
102− genRequest _ = do
153+ genRequest _ = (oldf, do
103154 old' <- old
104− return $ \burl -> let r = old' burl in r {
105− queryString = queryString r <> param <> "=" }
155+ return $ \burl -> let r = old' burl
156+ qs = queryString r in r {
157+ queryString = if BS.null qs then param else param <> "&" <> qs })
106158 where
107− old = genRequest (Proxy :: Proxy b)
159+ (oldf, old) = genRequest (Proxy :: Proxy b)
108160 param = cs $ symbolVal (Proxy :: Proxy x)
109161
110162instance (ReflectMethod method)
111163 => HasGenRequest (Verb (method :: k) (status :: Nat) (cts :: [*]) a) where
112− genRequest _ = return $ \burl -> def
164+ genRequest _ = (1, return $ \burl -> defaultRequest
165+ { host = cs $ baseUrlHost burl
166+ , port = baseUrlPort burl
167+ , secure = baseUrlScheme burl == Https
168+ , method = reflectMethod (Proxy :: Proxy method)
169+ })
170+
171+instance (ReflectMethod method)
172+ => HasGenRequest (NoContentVerb (method :: k)) where
173+ genRequest _ = (1, return $ \burl -> defaultRequest
113174 { host = cs $ baseUrlHost burl
114175 , port = baseUrlPort burl
115176 , secure = baseUrlScheme burl == Https
116177 , method = reflectMethod (Proxy :: Proxy method)
117− }
178+ })
118179
119180instance (HasGenRequest a) => HasGenRequest (RemoteHost :> a) where
120181 genRequest _ = genRequest (Proxy :: Proxy a)
src/Servant/QuickCheck/Internal/Predicates.hs+246−134
@@ -1,27 +1,36 @@
11module Servant.QuickCheck.Internal.Predicates where
22
3−import Control.Monad
3+import Control.Exception (catch, throw)
4+import Control.Monad (liftM2, unless, when)
45import Data.Aeson (Object, decode)
5−import Data.Bifunctor (Bifunctor (..))
6+import Data.Bifunctor (first)
67import qualified Data.ByteString as SBS
78import qualified Data.ByteString.Char8 as SBSC
89import qualified Data.ByteString.Lazy as LBS
9−import Data.CaseInsensitive (mk)
10+import Data.CaseInsensitive (foldCase, foldedCase, mk)
1011import Data.Either (isRight)
1112import Data.List.Split (wordsBy)
12−import Data.Maybe (fromMaybe, isJust, maybeToList)
13−import Data.Monoid ((<>))
14−import Data.Text (Text)
13+import Data.Maybe (fromMaybe, isJust)
14+import Data.Semigroup (Semigroup (..))
15+import qualified Data.Text as T
16+import Data.Time (UTCTime, defaultTimeLocale, parseTimeM,
17+ rfc822DateFormat)
1518import GHC.Generics (Generic)
1619import Network.HTTP.Client (Manager, Request, Response, httpLbs,
17− method, parseUrl, requestHeaders,
20+ method, parseRequest, requestHeaders,
1821 responseBody, responseHeaders,
1922 responseStatus)
2023import Network.HTTP.Media (matchAccept)
2124import Network.HTTP.Types (methodGet, methodHead, parseMethod,
22− renderStdMethod, status200, status201,
23− status300, status401, status405,
24− status500)
25+ renderStdMethod, status100, status200,
26+ status201, status300, status401,
27+ status405, status500)
28+import Prelude.Compat
29+import System.Clock (Clock (Monotonic), diffTimeSpec,
30+ getTime, toNanoSecs)
31+
32+import Servant.QuickCheck.Internal.ErrorTypes
33+
2534
2635-- | [__Best Practice__]
2736--
@@ -30,8 +39,27 @@ import Network.HTTP.Types (methodGet, methodHead, parseMethod,
3039-- indication of how to proceed or what went wrong.
3140--
3241-- This function checks that the response code is not 500.
33−not500 :: ResponsePredicate Text Bool
34−not500 = ResponsePredicate "not500" (\resp -> not $ responseStatus resp == status500)
42+--
43+-- /Since 0.0.0.0/
44+not500 :: ResponsePredicate
45+not500 = ResponsePredicate $ \resp ->
46+ when (responseStatus resp == status500) $ throw $ PredicateFailure "not500" Nothing resp
47+
48+-- | [__Optional__]
49+--
50+-- This function checks that the response from the server does not take longer
51+-- than the specified number of nanoseconds.
52+--
53+-- /Since 0.0.2.1/
54+notLongerThan :: Integer -> RequestPredicate
55+notLongerThan maxAllowed
56+ = RequestPredicate $ \req mgr -> do
57+ start <- getTime Monotonic
58+ resp <- httpLbs req mgr
59+ end <- getTime Monotonic
60+ when (toNanoSecs (end `diffTimeSpec` start) > maxAllowed) $
61+ throw $ PredicateFailure "notLongerThan" (Just req) resp
62+ return []
3563
3664-- | [__Best Practice__]
3765--
@@ -52,11 +80,17 @@ not500 = ResponsePredicate "not500" (\resp -> not $ responseStatus resp == statu
5280--
5381-- * JSON Grammar: <https://tools.ietf.org/html/rfc7159#section-2 RFC 7159 Section 2>
5482-- * JSON Grammar: <https://tools.ietf.org/html/rfc4627#section-2 RFC 4627 Section 2>
55−onlyJsonObjects :: ResponsePredicate Text Bool
83+--
84+-- /Since 0.0.0.0/
85+onlyJsonObjects :: ResponsePredicate
5686onlyJsonObjects
57− = ResponsePredicate "onlyJsonObjects" (\resp -> case decode (responseBody resp) of
58− Nothing -> False
59− Just (_ :: Object) -> True)
87+ = ResponsePredicate (\resp -> do
88+ case lookup "content-type" (first foldedCase <$> responseHeaders resp) of
89+ Nothing -> return ()
90+ Just ctype -> when ("application/json" `SBS.isPrefixOf` ctype) $ do
91+ case (decode (responseBody resp) :: Maybe Object) of
92+ Nothing -> throw $ PredicateFailure "onlyJsonObjects" Nothing resp
93+ Just _ -> return ())
6094
6195-- | __Optional__
6296--
@@ -75,29 +109,61 @@ onlyJsonObjects
75109--
76110-- * 201 Created: <https://tools.ietf.org/html/rfc7231#section-6.3.2 RFC 7231 Section 6.3.2>
77111-- * Location header: <https://tools.ietf.org/html/rfc7231#section-7.1.2 RFC 7231 Section 7.1.2>
78−createContainsValidLocation :: RequestPredicate Text Bool
112+--
113+-- /Since 0.0.0.0/
114+createContainsValidLocation :: RequestPredicate
79115createContainsValidLocation
80− = RequestPredicate
81− { reqPredName = "createContainsValidLocation"
82− , reqResps = \req mgr -> do
116+ = RequestPredicate $ \req mgr -> do
117+ let n = "createContainsValidLocation"
118+ resp <- httpLbs req mgr
119+ if responseStatus resp == status201
120+ then case lookup "Location" $ responseHeaders resp of
121+ Nothing -> throw $ PredicateFailure n (Just req) resp
122+ Just l -> case parseRequest $ SBSC.unpack l of
123+ Nothing -> throw $ PredicateFailure n (Just req) resp
124+ Just x -> do
125+ resp2 <- httpLbs x mgr
126+ status2XX (Just req) resp2 n
127+ return [resp, resp2]
128+ else return [resp]
129+
130+-- | [__Optional__]
131+--
132+-- The @Last-Modified@ header represents the time a resource was last
133+-- modified. It is used to drive caching and conditional requests.
134+--
135+-- When using this mechanism, the server adds the @Last-Modified@ header to
136+-- responses. Clients may then make requests with the @If-Modified-Since@
137+-- header to conditionally request resources. If the resource has not
138+-- changed since that date, the server responds with a status code of 304
139+-- (@Not Modified@) without a response body.
140+--
141+-- The @Last-Modified@ header can also be used in conjunction with the
142+-- @If-Unmodified-Since@ header to drive optimistic concurrency.
143+--
144+-- The @Last-Modified@ date must be in RFC 822 format.
145+--
146+-- __References__:
147+--
148+-- * 304 Not Modified: <https://tools.ietf.org/html/rfc7232#section-4.1 RFC 7232 Section 4.1>
149+-- * Last-Modified header: <https://tools.ietf.org/html/rfc7232#section-2.2 RFC 7232 Section 2.2>
150+-- * If-Modified-Since header: <https://tools.ietf.org/html/rfc7232#section-3.3 RFC 7232 Section 3.3>
151+-- * If-Unmodified-Since header: <https://tools.ietf.org/html/rfc7232#section-3.4 RFC 7232 Section 3.4>
152+-- * Date format: <https://tools.ietf.org/html/rfc2616#section-3.3 RFC 2616 Section 3.3>
153+--
154+-- /Since 0.0.2.1/
155+getsHaveLastModifiedHeader :: RequestPredicate
156+getsHaveLastModifiedHeader
157+ = RequestPredicate $ \req mgr ->
158+ if (method req == methodGet)
159+ then do
83160 resp <- httpLbs req mgr
84− if responseStatus resp == status201
85− then case lookup "Location" $ responseHeaders resp of
86− Nothing -> return (False, [resp])
87− Just l -> case parseUrl $ SBSC.unpack l of
88− Nothing -> return (False, [resp])
89− Just x -> do
90− resp2 <- httpLbs x mgr
91− return (status2XX resp2, [resp, resp2])
92− else return (True, [resp])
93− }
161+ unless (hasValidHeader "Last-Modified" isRFC822Date resp) $ do
162+ throw $ PredicateFailure "getsHaveLastModifiedHeader" (Just req) resp
163+ return [resp]
164+ else return []
94165
95−{-
96−getsHaveLastModifiedHeader :: ResponsePredicate Text Bool
97−getsHaveLastModifiedHeader
98− = ResponsePredicate "getsHaveLastModifiedHeader" (\resp ->
99166
100−-}
101167
102168-- | [__RFC Compliance__]
103169--
@@ -109,26 +175,32 @@ getsHaveLastModifiedHeader
109175-- This function checks that every @405 Method Not Allowed@ response contains
110176-- an @Allow@ header with a list of standard HTTP methods.
111177--
178+-- Note that 'servant' itself does not currently set the @Allow@ headers.
179+--
112180-- __References__:
113181--
114182-- * @Allow@ header: <https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html RFC 2616 Section 14.7>
115183-- * Status 405: <https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html RFC 2616 Section 10.4.6>
116−notAllowedContainsAllowHeader :: RequestPredicate Text Bool
184+-- * Servant Allow header issue: <https://github.com/haskell-servant/servant/issues/489 Issue #489>
185+--
186+-- /Since 0.0.0.0/
187+notAllowedContainsAllowHeader :: RequestPredicate
117188notAllowedContainsAllowHeader
118− = RequestPredicate
119− { reqPredName = "notAllowedContainsAllowHeader"
120− , reqResps = \req mgr -> do
121− resp <- mapM (flip httpLbs mgr) $ [ req { method = renderStdMethod m }
122− | m <- [minBound .. maxBound ]
123− , renderStdMethod m /= method req ]
124− return (all pred' resp, resp)
125− }
189+ = RequestPredicate $ \req mgr -> do
190+ let reqs = [ req { method = renderStdMethod m } | m <- [minBound .. maxBound]
191+ , renderStdMethod m /= method req ]
192+ resp <- mapM (flip httpLbs mgr) reqs
193+
194+ case filter pred' (zip reqs resp) of
195+ (x:_) -> throw $ PredicateFailure "notAllowedContainsAllowHeader" (Just $ fst x) (snd x)
196+ [] -> return resp
126197 where
127− pred' resp = responseStatus resp /= status405 || hasValidHeader "Allow" go resp
198+ pred' (_, resp) = responseStatus resp == status405 && not (hasValidHeader "Allow" go resp)
128199 where
129200 go x = all (\y -> isRight $ parseMethod $ SBSC.pack y)
130201 $ wordsBy (`elem` (", " :: [Char])) (SBSC.unpack x)
131202
203+
132204-- | [__RFC Compliance__]
133205--
134206-- When a request contains an @Accept@ header, the server must either return
@@ -136,24 +208,27 @@ notAllowedContainsAllowHeader
136208-- Acceptable@.
137209--
138210-- This function checks that every *successful* response has a @Content-Type@
139−-- header that matches the @Accept@ header.
211+-- header that matches the @Accept@ header. It does *not* check that the server
212+-- matches the quality descriptions of the @Accept@ header correctly.
140213--
141214-- __References__:
142215--
143216-- * @Accept@ header: <https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html RFC 2616 Section 14.1>
144−honoursAcceptHeader :: RequestPredicate b Bool
217+--
218+-- /Since 0.0.0.0/
219+honoursAcceptHeader :: RequestPredicate
145220honoursAcceptHeader
146− = RequestPredicate
147− { reqPredName = "honoursAcceptHeader"
148− , reqResps = \req mgr -> do
149− resp <- httpLbs req mgr
150− let scode = responseStatus resp
151− sctype = lookup "Content-Type" $ responseHeaders resp
152− sacc = fromMaybe "*/*" $ lookup "Accept" (requestHeaders req)
153− if 100 < scode && scode < 300
154− then return (isJust $ sctype >>= \x -> matchAccept x sacc, [resp])
155− else return (True, [resp])
156− }
221+ = RequestPredicate $ \req mgr -> do
222+ resp <- httpLbs req mgr
223+ let scode = responseStatus resp
224+ sctype = lookup "Content-Type" $ responseHeaders resp
225+ sacc = fromMaybe "*/*" $ lookup "Accept" (requestHeaders req)
226+ if status100 < scode && scode < status300
227+ then if isJust $ sctype >>= \x -> matchAccept [x] sacc
228+ then throw $ PredicateFailure "honoursAcceptHeader" (Just req) resp
229+ else return [resp]
230+ else return [resp]
231+
157232
158233-- | [__Best Practice__]
159234--
@@ -167,32 +242,34 @@ honoursAcceptHeader
167242-- __References__:
168243--
169244-- * @Cache-Control@ header: <https://tools.ietf.org/html/rfc7234#section-5.2 RFC 7234 Section 5.2>
170−getsHaveCacheControlHeader :: RequestPredicate Text Bool
245+--
246+-- /Since 0.0.0.0/
247+getsHaveCacheControlHeader :: RequestPredicate
171248getsHaveCacheControlHeader
172− = RequestPredicate
173− { reqPredName = "getsHaveCacheControlHeader"
174− , reqResps = \req mgr -> if method req == methodGet
175− then do
176− resp <- httpLbs req mgr
177− let good = isJust $ lookup "Cache-Control" $ responseHeaders resp
178− return (good, [resp])
179− else return (True, [])
180− }
249+ = RequestPredicate $ \req mgr ->
250+ if (method req == methodGet)
251+ then do
252+ resp <- httpLbs req mgr
253+ unless (hasValidHeader "Cache-Control" (const True) resp) $ do
254+ throw $ PredicateFailure "getsHaveCacheControlHeader" (Just req) resp
255+ return [resp]
256+ else return []
181257
182258-- | [__Best Practice__]
183259--
184260-- Like 'getsHaveCacheControlHeader', but for @HEAD@ requests.
185−headsHaveCacheControlHeader :: RequestPredicate Text Bool
261+--
262+-- /Since 0.0.0.0/
263+headsHaveCacheControlHeader :: RequestPredicate
186264headsHaveCacheControlHeader
187− = RequestPredicate
188− { reqPredName = "headsHaveCacheControlHeader"
189− , reqResps = \req mgr -> if method req == methodHead
190− then do
191− resp <- httpLbs req mgr
192− let good = hasValidHeader "Cache-Control" (const True) resp
193− return (good, [resp])
194− else return (True, [])
195− }
265+ = RequestPredicate $ \req mgr ->
266+ if (method req == methodHead)
267+ then do
268+ resp <- httpLbs req mgr
269+ unless (hasValidHeader "Cache-Control" (const True) resp) $
270+ throw $ PredicateFailure "headsHaveCacheControlHeader" (Just req) resp
271+ return [resp]
272+ else return []
196273{-
197274-- |
198275--
@@ -252,12 +329,37 @@ linkHeadersAreValid
252329-- __References__:
253330--
254331-- * @WWW-Authenticate@ header: <https://tools.ietf.org/html/rfc7235#section-4.1 RFC 7235 Section 4.1>
255−unauthorizedContainsWWWAuthenticate :: ResponsePredicate Text Bool
332+--
333+-- /Since 0.0.0.0/
334+unauthorizedContainsWWWAuthenticate :: ResponsePredicate
256335unauthorizedContainsWWWAuthenticate
257− = ResponsePredicate "unauthorizedContainsWWWAuthenticate" (\resp ->
336+ = ResponsePredicate $ \resp ->
258337 if responseStatus resp == status401
259− then hasValidHeader "WWW-Authenticate" (const True) resp
260− else True)
338+ then unless (hasValidHeader "WWW-Authenticate" (const True) resp) $
339+ throw $ PredicateFailure "unauthorizedContainsWWWAuthenticate" Nothing resp
340+ else return ()
341+
342+
343+-- | [__RFC Compliance__]
344+--
345+-- [An HTML] document will start with exactly this string: <!DOCTYPE html>
346+--
347+-- This function checks that HTML documents (those with `Content-Type: text/html...`)
348+-- include a DOCTYPE declaration at the top. We do not enforce capital case for the string `DOCTYPE`.
349+--
350+-- __References__:
351+--
352+-- * HTML5 Doctype: <https://tools.ietf.org/html/rfc7992#section-6.1 RFC 7992 Section 6.1>
353+-- /Since 0.3.0.0/
354+htmlIncludesDoctype :: ResponsePredicate
355+htmlIncludesDoctype
356+ = ResponsePredicate $ \resp ->
357+ if hasValidHeader "Content-Type" (SBS.isPrefixOf . foldCase $ "text/html") resp
358+ then do
359+ let htmlContent = foldCase . LBS.take 20 $ responseBody resp
360+ unless (LBS.isPrefixOf (foldCase "<!doctype html>") htmlContent) $
361+ throw $ PredicateFailure "htmlIncludesDoctype" Nothing resp
362+ else return ()
261363
262364-- * Predicate logic
263365
@@ -267,76 +369,77 @@ unauthorizedContainsWWWAuthenticate
267369--
268370-- Still, this is all kind of ugly.
269371
270−data ResponsePredicate n r = ResponsePredicate
271− { respPredName :: n
272− , respPred :: Response LBS.ByteString -> r
273− } deriving (Functor, Generic)
372+-- | A predicate that depends only on the response.
373+--
374+-- /Since 0.0.0.0/
375+newtype ResponsePredicate = ResponsePredicate
376+ { getResponsePredicate :: Response LBS.ByteString -> IO ()
377+ } deriving (Generic)
274378
275−instance Bifunctor ResponsePredicate where
276− first f (ResponsePredicate a b) = ResponsePredicate (f a) b
277− second = fmap
379+instance Semigroup ResponsePredicate where
380+ ResponsePredicate a <> ResponsePredicate b = ResponsePredicate $ \x -> a x >> b x
278381
279−instance (Monoid n, Monoid r) => Monoid (ResponsePredicate n r) where
280− mempty = ResponsePredicate mempty mempty
281− a `mappend` b = ResponsePredicate
282− { respPredName = respPredName a <> respPredName b
283− , respPred = respPred a <> respPred b
284− }
382+instance Monoid ResponsePredicate where
383+ mempty = ResponsePredicate $ const $ return ()
384+ mappend = (<>)
285385
286−data RequestPredicate n r = RequestPredicate
287− { reqPredName :: n
288− , reqResps :: Request -> Manager -> IO (r, [Response LBS.ByteString])
289− } deriving (Generic, Functor)
386+-- | A predicate that depends on both the request and the response.
387+--
388+-- /Since 0.0.0.0/
389+newtype RequestPredicate = RequestPredicate
390+ { getRequestPredicate :: Request -> Manager -> IO [Response LBS.ByteString]
391+ } deriving (Generic)
290392
291−instance Bifunctor RequestPredicate where
292− first f (RequestPredicate a b) = RequestPredicate (f a) b
293− second = fmap
393+-- TODO: This isn't actually a monoid
394+instance Monoid RequestPredicate where
395+ mempty = RequestPredicate (\r m -> httpLbs r m >>= \x -> return ([x]))
396+ mappend = (<>)
294397
295398-- TODO: This isn't actually a monoid
296−instance (Monoid n, Monoid r) => Monoid (RequestPredicate n r) where
297− mempty = RequestPredicate mempty (\r m -> httpLbs r m >>= \x -> return (mempty, [x]))
298− a `mappend` b = RequestPredicate
299− { reqPredName = reqPredName a <> reqPredName b
300− , reqResps = \x m -> liftM2 (<>) (reqResps a x m) (reqResps b x m)
301− }
302−
303−data Predicates n r = Predicates
304− { reqPreds :: RequestPredicate n r
305− , respPreds :: ResponsePredicate n r
306− } deriving (Generic, Functor)
307−
308−instance (Monoid n, Monoid r) => Monoid (Predicates n r) where
309− mempty = Predicates mempty mempty
310− a `mappend` b = Predicates (reqPreds a <> reqPreds b) (respPreds a <> respPreds b)
399+instance Semigroup RequestPredicate where
400+ RequestPredicate a <> RequestPredicate b = RequestPredicate $ \r mgr ->
401+ liftM2 (<>) (a r mgr) (b r mgr)
311402
403+-- | A set of predicates. Construct one with 'mempty' and '<%>'.
404+data Predicates = Predicates
405+ { requestPredicates :: RequestPredicate
406+ , responsePredicates :: ResponsePredicate
407+ } deriving (Generic)
312408
409+instance Semigroup Predicates where
410+ a <> b = Predicates (requestPredicates a <> requestPredicates b)
411+ (responsePredicates a <> responsePredicates b)
313412
314−class JoinPreds a where
315− joinPreds :: a -> Predicates [Text] [Text] -> Predicates [Text] [Text]
413+instance Monoid Predicates where
414+ mempty = Predicates mempty mempty
415+ mappend = (<>)
316416
317−instance JoinPreds (RequestPredicate Text Bool) where
318− joinPreds p (Predicates x y) = Predicates (go <> x) y
319− where go = let p' = first return p
320− in fmap (\z -> if z then [] else reqPredName p') p'
417+class JoinPreds a where
418+ joinPreds :: a -> Predicates -> Predicates
321419
322−instance JoinPreds (ResponsePredicate Text Bool) where
323− joinPreds p (Predicates x y) = Predicates x (go <> y)
324− where go = let p' = first return p
325− in fmap (\z -> if z then [] else respPredName p') p'
420+instance JoinPreds (RequestPredicate ) where
421+ joinPreds p (Predicates x y) = Predicates (p <> x) y
326422
423+instance JoinPreds (ResponsePredicate ) where
424+ joinPreds p (Predicates x y) = Predicates x (p <> y)
327425
328426-- | Adds a new predicate (either `ResponsePredicate` or `RequestPredicate`) to
329427-- the existing predicates.
330428--
331429-- > not500 <%> onlyJsonObjects <%> empty
332−(<%>) :: JoinPreds a => a -> Predicates [Text] [Text] -> Predicates [Text] [Text]
430+--
431+-- /Since 0.0.0.0/
432+(<%>) :: JoinPreds a => a -> Predicates -> Predicates
333433(<%>) = joinPreds
334434infixr 6 <%>
335435
336−finishPredicates :: Predicates [Text] [Text] -> Request -> Manager -> IO [Text]
337−finishPredicates p req mgr = do
338− (soFar, resps) <- reqResps (reqPreds p) req mgr
339− return $ soFar <> mconcat [respPred (respPreds p) r | r <- resps]
436+finishPredicates :: Predicates -> Request -> Manager -> IO (Maybe PredicateFailure)
437+finishPredicates p req mgr = go `catch` \(e :: PredicateFailure) -> return $ Just e
438+ where
439+ go = do
440+ resps <- getRequestPredicate (requestPredicates p) req mgr
441+ mapM_ (getResponsePredicate $ responsePredicates p) resps
442+ return Nothing
340443
341444-- * helpers
342445
@@ -345,5 +448,14 @@ hasValidHeader hdr p r = case lookup (mk hdr) (responseHeaders r) of
345448 Nothing -> False
346449 Just v -> p v
347450
348−status2XX :: Response b -> Bool
349−status2XX r = status200 <= responseStatus r && responseStatus r < status300
451+isRFC822Date :: SBS.ByteString -> Bool
452+isRFC822Date s
453+ = case parseTimeM True defaultTimeLocale rfc822DateFormat (SBSC.unpack s) of
454+ Nothing -> False
455+ Just (_ :: UTCTime) -> True
456+
457+status2XX :: Monad m => Maybe Request -> Response LBS.ByteString -> T.Text -> m ()
458+status2XX mreq resp t
459+ | status200 <= responseStatus resp && responseStatus resp < status300
460+ = return ()
461+ | otherwise = throw $ PredicateFailure t mreq resp
src/Servant/QuickCheck/Internal/QuickCheck.hs+112−34
@@ -1,35 +1,50 @@
1+{-# LANGUAGE RecordWildCards #-}
2+{-# LANGUAGE CPP #-}
13module Servant.QuickCheck.Internal.QuickCheck where
24
5+import Control.Concurrent (tryReadMVar, newEmptyMVar, tryPutMVar)
6+import Control.Monad (unless)
37import qualified Data.ByteString.Lazy as LBS
48import Data.Proxy (Proxy)
5−import Data.Text (Text)
6−import Network.HTTP.Client (Manager, Request, checkStatus,
7− defaultManagerSettings, httpLbs,
8− newManager)
9+import qualified Network.HTTP.Client as C
910import Network.Wai.Handler.Warp (withApplication)
11+import Prelude.Compat
1012import Servant (Context (EmptyContext), HasServer,
1113 Server, serveWithContext)
14+#if MIN_VERSION_servant_server(0,18,0)
15+import Servant (DefaultErrorFormatters, ErrorFormatters, HasContextEntry, type (.++))
16+#endif
1217import Servant.Client (BaseUrl (..), Scheme (..))
1318import System.IO.Unsafe (unsafePerformIO)
1419import Test.Hspec (Expectation, expectationFailure)
15−import Test.QuickCheck (Args (..), Result (..),
16− quickCheckWithResult)
17−import Test.QuickCheck.Monadic (assert, forAllM, monadicIO, run)
20+import Test.QuickCheck (Args (..), Result (..), quickCheckWithResult)
21+import Test.QuickCheck.Monadic (assert, forAllM, monadicIO, monitor,
22+ run)
23+import Test.QuickCheck.Property (counterexample)
1824
25+import Servant.QuickCheck.Internal.Equality
26+import Servant.QuickCheck.Internal.ErrorTypes
1927import Servant.QuickCheck.Internal.HasGenRequest
2028import Servant.QuickCheck.Internal.Predicates
21−import Servant.QuickCheck.Internal.Equality
2229
2330
2431-- | Start a servant application on an open port, run the provided function,
2532-- then stop the application.
33+--
34+-- /Since 0.0.0.0/
2635withServantServer :: HasServer a '[] => Proxy a -> IO (Server a)
2736 -> (BaseUrl -> IO r) -> IO r
2837withServantServer api = withServantServerAndContext api EmptyContext
2938
3039-- | Like 'withServantServer', but allows passing in a 'Context' to the
3140-- application.
41+--
42+-- /Since 0.0.0.0/
43+#if MIN_VERSION_servant_server(0,18,0)
44+withServantServerAndContext :: (HasServer a ctx, HasContextEntry (ctx .++ DefaultErrorFormatters) ErrorFormatters)
45+#else
3246withServantServerAndContext :: HasServer a ctx
47+#endif
3348 => Proxy a -> Context ctx -> IO (Server a) -> (BaseUrl -> IO r) -> IO r
3449withServantServerAndContext api ctx server t
3550 = withApplication (return . serveWithContext api ctx =<< server) $ \port ->
@@ -46,20 +61,48 @@ withServantServerAndContext api ctx server t
4661--
4762-- Evidently, if the behaviour of the server is expected to be
4863-- non-deterministic, this function may produce spurious failures
64+--
65+-- Note that only valid requests are generated and tested. As an example of why
66+-- this matters, let's say your API specifies that a particular endpoint can
67+-- only generate @JSON@. @serversEqual@ will then not generate any requests
68+-- with an @Accept@ header _other_ than @application/json@. It may therefore
69+-- fail to notice that one application, when the request has @Accept:
70+-- text/html@, returns a @406 Not Acceptable@ HTTP response, and another
71+-- returns a @200 Success@, but with @application/json@ as the content-type.
72+--
73+-- The fact that only valid requests are tested also means that no endpoints
74+-- not listed in the API type are tested.
75+--
76+-- /Since 0.0.0.0/
4977serversEqual :: HasGenRequest a =>
5078 Proxy a -> BaseUrl -> BaseUrl -> Args -> ResponseEquality LBS.ByteString -> Expectation
5179serversEqual api burl1 burl2 args req = do
52− let reqs = (\f -> (f burl1, f burl2)) <$> genRequest api
53− r <- quickCheckWithResult args $ monadicIO $ forAllM reqs $ \(req1, req2) -> do
54− resp1 <- run $ httpLbs (noCheckStatus req1) defManager
55− resp2 <- run $ httpLbs (noCheckStatus req2) defManager
56− assert $ getResponseEquality req resp1 resp2
80+ let reqs = (\f -> (f burl1, f burl2)) <$> runGenRequest api
81+ -- This MVar stuff is clunky! But there doesn't seem to be an easy way to
82+ -- return results when a test fails, since an exception is throw.
83+ deetsMVar <- newEmptyMVar
84+ r <- quickCheckWithResult args { chatty = False } $ monadicIO $ forAllM reqs $ \(req1, req2) -> do
85+ resp1 <- run $ C.httpLbs (noCheckStatus req1) defManager
86+ resp2 <- run $ C.httpLbs (noCheckStatus req2) defManager
87+ unless (getResponseEquality req resp1 resp2) $ do
88+ monitor (counterexample "hi" )
89+ _ <- run $ tryPutMVar deetsMVar $ ServerEqualityFailure req1 resp1 resp2
90+ assert False
5791 case r of
5892 Success {} -> return ()
93+ Failure{..} -> do
94+ mx <- tryReadMVar deetsMVar
95+ case mx of
96+ Just x ->
97+ expectationFailure $ "Failed:\n" ++ show x
98+ Nothing ->
99+ expectationFailure $ "We failed to record a reason for failure: " <> show r
59100 GaveUp { numTests = n } -> expectationFailure $ "Gave up after " ++ show n ++ " tests"
60− Failure { output = m } -> expectationFailure $ "Failed:\n" ++ show m
61− NoExpectedFailure {} -> expectationFailure $ "No expected failure"
62− InsufficientCoverage {} -> expectationFailure $ "Insufficient coverage"
101+ NoExpectedFailure {} -> expectationFailure "No expected failure"
102+#if MIN_VERSION_QuickCheck(2,12,0)
103+#else
104+ InsufficientCoverage {} -> expectationFailure "Insufficient coverage"
105+#endif
63106
64107-- | Check that a server satisfies the set of properties specified.
65108--
@@ -78,38 +121,73 @@ serversEqual api burl1 burl2 args req = do
78121-- > <%> onlyJsonObjects
79122-- > <%> notAllowedContainsAllowHeader
80123-- > <%> mempty)
124+--
125+-- /Since 0.0.0.0/
81126serverSatisfies :: (HasGenRequest a) =>
82− Proxy a -> BaseUrl -> Args -> Predicates [Text] [Text] -> Expectation
83−serverSatisfies api burl args preds = do
84− let reqs = ($ burl) <$> genRequest api
85− r <- quickCheckWithResult args $ monadicIO $ forAllM reqs $ \req -> do
86− v <- run $ finishPredicates preds (noCheckStatus req) defManager
87− assert $ null v
127+ Proxy a -> BaseUrl -> Args -> Predicates -> Expectation
128+serverSatisfies api = serverSatisfiesMgr api defManager
129+
130+-- | Check that a server satisfies the set of properties specified, and
131+-- accept a 'Manager' for running the HTTP requests through.
132+--
133+-- See 'serverSatisfies' for more details.
134+--
135+-- @since 0.0.7.2
136+serverSatisfiesMgr :: (HasGenRequest a) =>
137+ Proxy a -> C.Manager -> BaseUrl -> Args -> Predicates -> Expectation
138+serverSatisfiesMgr api manager burl args preds = do
139+ let reqs = ($ burl) <$> runGenRequest api
140+ deetsMVar <- newEmptyMVar
141+ r <- quickCheckWithResult args { chatty = False } $ monadicIO $ forAllM reqs $ \req -> do
142+ v <- run $ finishPredicates preds (noCheckStatus req) manager
143+ _ <- run $ tryPutMVar deetsMVar v
144+ case v of
145+ Just _ -> assert False
146+ _ -> return ()
88147 case r of
89148 Success {} -> return ()
149+ Failure {..} -> do
150+ mx <- tryReadMVar deetsMVar
151+ case mx of
152+ Just x ->
153+ expectationFailure $ "Failed:\n" ++ show x
154+ Nothing ->
155+ expectationFailure $ "We failed to record a reason for failure: " <> show r
90156 GaveUp { numTests = n } -> expectationFailure $ "Gave up after " ++ show n ++ " tests"
91− Failure { output = m } -> expectationFailure $ "Failed:\n" ++ show m
92157 NoExpectedFailure {} -> expectationFailure $ "No expected failure"
93− InsufficientCoverage {} -> expectationFailure $ "Insufficient coverage"
94−
158+#if MIN_VERSION_QuickCheck(2,12,0)
159+#else
160+ InsufficientCoverage {} -> expectationFailure "Insufficient coverage"
161+#endif
95162
96163serverDoesntSatisfy :: (HasGenRequest a) =>
97− Proxy a -> BaseUrl -> Args -> Predicates [Text] [Text] -> Expectation
98−serverDoesntSatisfy api burl args preds = do
99− let reqs = ($ burl) <$> genRequest api
164+ Proxy a -> BaseUrl -> Args -> Predicates -> Expectation
165+serverDoesntSatisfy api = serverDoesntSatisfyMgr api defManager
166+
167+serverDoesntSatisfyMgr :: (HasGenRequest a) =>
168+ Proxy a -> C.Manager -> BaseUrl -> Args -> Predicates -> Expectation
169+serverDoesntSatisfyMgr api manager burl args preds = do
170+ let reqs = ($ burl) <$> runGenRequest api
100171 r <- quickCheckWithResult args $ monadicIO $ forAllM reqs $ \req -> do
101− v <- run $ finishPredicates preds (noCheckStatus req) defManager
172+ v <- run $ finishPredicates preds (noCheckStatus req) manager
102173 assert $ not $ null v
103174 case r of
104175 Success {} -> return ()
105176 GaveUp { numTests = n } -> expectationFailure $ "Gave up after " ++ show n ++ " tests"
106177 Failure { output = m } -> expectationFailure $ "Failed:\n" ++ show m
107178 NoExpectedFailure {} -> expectationFailure $ "No expected failure"
108− InsufficientCoverage {} -> expectationFailure $ "Insufficient coverage"
179+#if MIN_VERSION_QuickCheck(2,12,0)
180+#else
181+ InsufficientCoverage {} -> expectationFailure "Insufficient coverage"
182+#endif
109183
110−noCheckStatus :: Request -> Request
111−noCheckStatus r = r { checkStatus = \_ _ _ -> Nothing}
184+noCheckStatus :: C.Request -> C.Request
185+#if MIN_VERSION_http_client(0,5,0)
186+noCheckStatus = id
187+#else
188+noCheckStatus r = r { C.checkStatus = \_ _ _ -> Nothing}
189+#endif
112190
113−defManager :: Manager
114−defManager = unsafePerformIO $ newManager defaultManagerSettings
191+defManager :: C.Manager
192+defManager = unsafePerformIO $ C.newManager C.defaultManagerSettings
115193{-# NOINLINE defManager #-}
stack.yaml+5−31
@@ -1,36 +1,10 @@
1−# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
2−resolver: nightly-2016-04-20
3−
4−# Local packages, usually specified by relative directory name
1+resolver: nightly-2018-09-03
52packages:
63- '.'
7−
8−# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
94extra-deps:
10−- servant-0.7
11−- servant-client-0.7
12−- servant-server-0.7
13−
14−# Override default flag values for local packages and extra-deps
5+- hspec-discover-2.5.6
6+- hspec-core-2.5.6
7+- hspec-2.5.6
8+- QuickCheck-2.12
159flags: {}
16−
17−# Extra package databases containing global packages
1810extra-package-dbs: []
19−
20−# Control whether we use the GHC we find on the path
21−# system-ghc: true
22−
23−# Require a specific version of stack, using version ranges
24−# require-stack-version: -any # Default
25−# require-stack-version: >= 1.0.0
26−
27−# Override the architecture used by stack, especially useful on Windows
28−# arch: i386
29−# arch: x86_64
30−
31−# Extra directories used by stack for building
32−# extra-include-dirs: [/path/to/dir]
33−# extra-lib-dirs: [/path/to/dir]
34−
35−# Allow a newer minor version of GHC than the snapshot specifies
36−# compiler-check: newer-minor
test/Doctest.hsdeleted−44
@@ -1,44 +0,0 @@
1−module Main where
2−
3−import Data.List (isPrefixOf)
4−import System.Directory
5−import System.FilePath
6−import System.FilePath.Find
7−import Test.DocTest
8−
9−main :: IO ()
10−main = do
11− files <- find always (extension ==? ".hs") "src"
12− mCabalMacrosFile <- getCabalMacrosFile
13− doctest $ "-isrc" : "-Iinclude" :
14− (maybe [] (\ f -> ["-optP-include", "-optP" ++ f]) mCabalMacrosFile) ++
15− "-XOverloadedStrings" :
16− "-XDeriveFunctor" :
17− "-XFlexibleInstances" :
18− "-XFlexibleContexts" :
19− "-XMultiParamTypeClasses" :
20− "-XDataKinds" :
21− "-XTypeOperators" :
22− "-XGADTs" :
23− files
24−
25−getCabalMacrosFile :: IO (Maybe FilePath)
26−getCabalMacrosFile = do
27− exists <- doesDirectoryExist "dist"
28− if exists
29− then do
30− contents <- getDirectoryContents "dist"
31− let rest = "build" </> "autogen" </> "cabal_macros.h"
32− whenExists $ case filter ("dist-sandbox-" `isPrefixOf`) contents of
33− [x] -> "dist" </> x </> rest
34− [] -> "dist" </> rest
35− xs -> error $ "ran doctests with multiple dist/dist-sandbox-xxxxx's: \n"
36− ++ show xs ++ "\nTry cabal clean"
37− else return Nothing
38− where
39− whenExists :: FilePath -> IO (Maybe FilePath)
40− whenExists file = do
41− exists <- doesFileExist file
42− return $ if exists
43− then Just file
44− else Nothing
test/Servant/QuickCheck/InternalSpec.hs+295−13
@@ -1,24 +1,46 @@
11{-# LANGUAGE CPP #-}
2−{-# LANGUAGE ScopedTypeVariables #-}
32module Servant.QuickCheck.InternalSpec (spec) where
43
5−import Control.Concurrent.MVar (newMVar, readMVar, swapMVar)
6−import Control.Monad.IO.Class (liftIO)
7−import Data.Proxy
8−import Servant
9−import Test.Hspec
10−import Test.QuickCheck
11−import Servant.API.Internal.Test.ComprehensiveAPI
124
13−import Servant.QuickCheck
5+import Control.Concurrent.MVar (newMVar, readMVar, swapMVar)
6+import Control.Exception (SomeException)
7+import Control.Monad (replicateM)
8+import Control.Monad.IO.Class (liftIO)
9+import qualified Data.ByteString as BS
10+import qualified Data.ByteString.Char8 as C
11+import Data.Maybe (fromJust)
12+import Network.HTTP.Client (path, queryString)
13+import Prelude.Compat
14+import Servant
15+import Servant.HTML.Blaze (HTML)
16+import qualified Text.Blaze.Html as Blaze
17+import qualified Text.Blaze.Html5 as Blaze5
18+import Test.Hspec (Spec, context, describe, it, shouldBe,
19+ shouldContain)
20+import Test.Hspec.Core.Spec (Arg, Example, Result (..), ResultStatus (..),
21+ defaultParams, safeEvaluateExample)
22+import Test.QuickCheck.Gen (generate, unGen)
23+import Test.QuickCheck.Random (mkQCGen)
24+
1425
15−import Servant.QuickCheck.Internal (genRequest, serverDoesntSatisfy)
26+import Servant.Test.ComprehensiveAPI (comprehensiveAPIWithoutStreamingOrRaw)
27+
28+import Servant.QuickCheck
29+import Servant.QuickCheck.Internal (genRequest, runGenRequest,
30+ serverDoesntSatisfy)
1631
1732spec :: Spec
1833spec = do
1934 serversEqualSpec
2035 serverSatisfiesSpec
2136 isComprehensiveSpec
37+ onlyJsonObjectSpec
38+ notLongerThanSpec
39+ queryParamsSpec
40+ queryFlagsSpec
41+ deepPathSpec
42+ htmlDocTypesSpec
43+ unbiasedGenerationSpec
2244
2345serversEqualSpec :: Spec
2446serversEqualSpec = describe "serversEqual" $ do
@@ -28,6 +50,43 @@ serversEqualSpec = describe "serversEqual" $ do
2850 withServantServerAndContext api ctx server $ \burl2 -> do
2951 serversEqual api burl1 burl2 args bodyEquality
3052
53+ context "when servers are not equal" $ do
54+ it "provides the failing responses in the error message" $ do
55+ FailedWith err <- withServantServer api2 server2 $ \burl1 ->
56+ withServantServer api2 server3 $ \burl2 -> do
57+ evalExample $ serversEqual api2 burl1 burl2 args bodyEquality
58+ show err `shouldContain` "Server equality failed"
59+ show err `shouldContain` "Body: 1"
60+ show err `shouldContain` "Body: 2"
61+ show err `shouldContain` "Path: /failplz"
62+
63+ context "when JSON is equal but looks a bit different as a ByteString" $ do
64+
65+ it "sanity check: different whitespace same JSON objects bodyEquality fails" $ do
66+ FailedWith err <- withServantServer jsonApi jsonServer1 $ \burl1 ->
67+ withServantServer jsonApi jsonServer2 $ \burl2 -> do
68+ evalExample $ serversEqual jsonApi burl1 burl2 args bodyEquality
69+ show err `shouldContain` "Server equality failed"
70+
71+ it "jsonEquality considers equal JSON apis equal regardless of key ordering or whitespace" $ do
72+ withServantServerAndContext jsonApi ctx jsonServer1 $ \burl1 ->
73+ withServantServerAndContext jsonApi ctx jsonServer2 $ \burl2 ->
74+ serversEqual jsonApi burl1 burl2 args jsonEquality
75+
76+ it "sees when JSON apis are not equal because any value is different" $ do
77+ FailedWith err <- withServantServer jsonApi jsonServer2 $ \burl1 ->
78+ withServantServer jsonApi jsonServer3 $ \burl2 -> do
79+ evalExample $ serversEqual jsonApi burl1 burl2 args jsonEquality
80+ show err `shouldContain` "Server equality failed"
81+ show err `shouldContain` "Path: /jsonComparison"
82+
83+ it "sees when JSON apis are not equal due to different keys but same values" $ do
84+ FailedWith err <- withServantServer jsonApi jsonServer2 $ \burl1 ->
85+ withServantServer jsonApi jsonServer4 $ \burl2 -> do
86+ evalExample $ serversEqual jsonApi burl1 burl2 args jsonEquality
87+ show err `shouldContain` "Server equality failed"
88+ show err `shouldContain` "Path: /jsonComparison"
89+
3190
3291serverSatisfiesSpec :: Spec
3392serverSatisfiesSpec = describe "serverSatisfies" $ do
@@ -46,13 +105,126 @@ serverSatisfiesSpec = describe "serverSatisfies" $ do
46105 <%> notAllowedContainsAllowHeader
47106 <%> mempty)
48107
108+ context "when predicates are false" $ do
109+
110+ it "fails with informative error messages" $ do
111+ FailedWith err <- withServantServerAndContext api ctx server $ \burl -> do
112+ evalExample $ serverSatisfies api burl args (notAllowedContainsAllowHeader <%> mempty)
113+ show err `shouldContain` "notAllowedContainsAllowHeader"
114+ show err `shouldContain` "Headers"
115+ show err `shouldContain` "Body"
116+
117+
118+onlyJsonObjectSpec :: Spec
119+onlyJsonObjectSpec = describe "onlyJsonObjects" $ do
120+
121+ it "fails correctly" $ do
122+ FailedWith err <- withServantServerAndContext api ctx server $ \burl -> do
123+ evalExample $ serverSatisfies (Proxy :: Proxy (Get '[JSON] Int)) burl args
124+ (onlyJsonObjects <%> mempty)
125+ show err `shouldContain` "onlyJsonObjects"
126+
127+ it "accepts non-JSON endpoints" $ do
128+ withServantServerAndContext octetAPI ctx serverOctetAPI $ \burl ->
129+ serverSatisfies octetAPI burl args (onlyJsonObjects <%> mempty)
130+
131+ it "does not fail when there is no content-type" $ do
132+ withServantServerAndContext api2 ctx serverFailing $ \burl ->
133+ serverSatisfies api2 burl args (onlyJsonObjects <%> mempty)
134+
135+notLongerThanSpec :: Spec
136+notLongerThanSpec = describe "notLongerThan" $ do
137+
138+ it "fails correctly" $ do
139+ FailedWith err <- withServantServerAndContext api ctx server $ \burl -> do
140+ evalExample $ serverSatisfies (Proxy :: Proxy (Get '[JSON] Int)) burl args
141+ (notLongerThan 1 <%> mempty)
142+ show err `shouldContain` "notLongerThan"
143+
144+ it "succeeds correctly" $ do
145+ withServantServerAndContext api ctx server $ \burl ->
146+ serverSatisfies api burl args (notLongerThan 1000000000000 <%> mempty)
147+
49148isComprehensiveSpec :: Spec
50149isComprehensiveSpec = describe "HasGenRequest" $ do
51150
52151 it "has instances for all 'servant' combinators" $ do
53− let _g = genRequest comprehensiveAPI
152+ let _g = genRequest comprehensiveAPIWithoutStreamingOrRaw
54153 True `shouldBe` True -- This is a type-level check
55154
155+deepPathSpec :: Spec
156+deepPathSpec = describe "Path components" $ do
157+
158+ it "are separated by slashes, without a trailing slash" $ do
159+ let rng = mkQCGen 0
160+ burl = BaseUrl Http "localhost" 80 ""
161+ gen = runGenRequest deepAPI
162+ req = (unGen gen rng 0) burl
163+ path req `shouldBe` ("/one/two/three")
164+
165+
166+queryParamsSpec :: Spec
167+queryParamsSpec = describe "QueryParams" $ do
168+
169+ it "reduce to an HTTP query string correctly" $ do
170+ let rng = mkQCGen 0
171+ burl = BaseUrl Http "localhost" 80 ""
172+ gen = runGenRequest paramsAPI
173+ req = (unGen gen rng 0) burl
174+ qs = C.unpack $ queryString req
175+ qs `shouldBe` "one=_&two=_"
176+
177+queryFlagsSpec :: Spec
178+queryFlagsSpec = describe "QueryFlags" $ do
179+
180+ it "reduce to an HTTP query string correctly" $ do
181+ let rng = mkQCGen 0
182+ burl = BaseUrl Http "localhost" 80 ""
183+ gen = runGenRequest flagsAPI
184+ req = (unGen gen rng 0) burl
185+ qs = C.unpack $ queryString req
186+ qs `shouldBe` "one&two"
187+
188+htmlDocTypesSpec :: Spec
189+htmlDocTypesSpec = describe "HtmlDocTypes" $ do
190+
191+ it "fails HTML without doctype correctly" $ do
192+ err <- withServantServerAndContext docTypeApi ctx noDocTypeServer $ \burl -> do
193+ evalExample $ serverSatisfies docTypeApi burl args
194+ (htmlIncludesDoctype <%> mempty)
195+ show err `shouldContain` "htmlIncludesDoctype"
196+
197+ it "passes HTML with a doctype at start" $ do
198+ withServantServerAndContext docTypeApi ctx docTypeServer $ \burl ->
199+ serverSatisfies docTypeApi burl args (htmlIncludesDoctype <%> mempty)
200+
201+ it "accepts json endpoints and passes over them in silence" $ do
202+ withServantServerAndContext api ctx server $ \burl -> do
203+ serverSatisfies (Proxy :: Proxy (Get '[JSON] Int)) burl args
204+ (htmlIncludesDoctype <%> mempty)
205+
206+
207+makeRandomRequest :: Proxy LargeAPI -> BaseUrl -> IO Integer
208+makeRandomRequest large burl = do
209+ req <- generate $ runGenRequest large
210+ pure $ fst . fromJust . C.readInteger . C.drop 1 . path $ req burl
211+
212+
213+unbiasedGenerationSpec :: Spec
214+unbiasedGenerationSpec = describe "Unbiased Generation of requests" $
215+
216+ it "frequency paired with generated endpoint should be more randomly distributed" $ do
217+ let burl = BaseUrl Http "localhost" 80 ""
218+ let runs = 10000 :: Double
219+ someRequests <- replicateM 10000 (makeRandomRequest largeApi burl)
220+ let mean = (sum $ map fromIntegral someRequests) / runs
221+ let variancer x = let ix = fromIntegral x in (ix - mean) * (ix - mean)
222+ let variance = (sum $ map variancer someRequests) / runs - 1
223+ -- mean should be around 8.5. If this fails, we likely need more runs (or there's a bug!)
224+ mean > 8 `shouldBe` True
225+ mean < 9 `shouldBe` True
226+ -- Std dev is likely around 4. Variance is probably greater than 20.
227+ variance > 19.5 `shouldBe` True
56228
57229------------------------------------------------------------------------------
58230-- APIs
@@ -65,6 +237,17 @@ type API = ReqBody '[JSON] String :> Post '[JSON] String
65237api :: Proxy API
66238api = Proxy
67239
240+type ParamsAPI = QueryParam "one" () :> QueryParam "two" () :> Get '[JSON] ()
241+
242+paramsAPI :: Proxy ParamsAPI
243+paramsAPI = Proxy
244+
245+type FlagsAPI = QueryFlag "one" :> QueryFlag "two" :> Get '[JSON] ()
246+
247+flagsAPI :: Proxy FlagsAPI
248+flagsAPI = Proxy
249+
250+
68251server :: IO (Server API)
69252server = do
70253 mvar <- newMVar ""
@@ -72,18 +255,117 @@ server = do
72255 :<|> (liftIO $ readMVar mvar >>= return . length)
73256 :<|> (const $ return ())
74257
258+
259+type API2 = "failplz" :> Get '[JSON] Int
260+
261+api2 :: Proxy API2
262+api2 = Proxy
263+
264+type DeepAPI = "one" :> "two" :> "three":> Get '[JSON] ()
265+
266+deepAPI :: Proxy DeepAPI
267+deepAPI = Proxy
268+
269+
270+server2 :: IO (Server API2)
271+server2 = return $ return 1
272+
273+server3 :: IO (Server API2)
274+server3 = return $ return 2
275+
276+serverFailing :: IO (Server API2)
277+serverFailing = return . throwError $ err405
278+
279+-- With Doctypes
280+type HtmlDoctype = Get '[HTML] Blaze.Html
281+
282+docTypeApi :: Proxy HtmlDoctype
283+docTypeApi = Proxy
284+
285+docTypeServer :: IO (Server HtmlDoctype)
286+docTypeServer = pure $ pure $ Blaze5.docTypeHtml $ Blaze5.span "Hello Test!"
287+
288+noDocTypeServer :: IO (Server HtmlDoctype)
289+noDocTypeServer = pure $ pure $ Blaze.text "Hello Test!"
290+
291+
292+-- Api for unbiased generation of requests tests
293+largeApi :: Proxy LargeAPI
294+largeApi = Proxy
295+
296+type LargeAPI
297+ = "1" :> Get '[JSON] Int
298+ :<|> "2" :> Get '[JSON] Int
299+ :<|> "3" :> Get '[JSON] Int
300+ :<|> "4" :> Get '[JSON] Int
301+ :<|> "5" :> Get '[JSON] Int
302+ :<|> "6" :> Get '[JSON] Int
303+ :<|> "7" :> Get '[JSON] Int
304+ :<|> "8" :> Get '[JSON] Int
305+ :<|> "9" :> Get '[JSON] Int
306+ :<|> "10" :> Get '[JSON] Int
307+ :<|> "11" :> Get '[JSON] Int
308+ :<|> "12" :> Get '[JSON] Int
309+ :<|> "13" :> Get '[JSON] Int
310+ :<|> "14" :> Get '[JSON] Int
311+ :<|> "15" :> Get '[JSON] Int
312+ :<|> "16" :> Get '[JSON] Int
313+
314+
315+type OctetAPI = Get '[OctetStream] BS.ByteString
316+
317+octetAPI :: Proxy OctetAPI
318+octetAPI = Proxy
319+
320+serverOctetAPI :: IO (Server OctetAPI)
321+serverOctetAPI = return $ return "blah"
322+
323+type JsonApi = "jsonComparison" :> Get '[OctetStream] BS.ByteString
324+
325+jsonApi :: Proxy JsonApi
326+jsonApi = Proxy
327+
328+jsonServer1 :: IO (Server JsonApi)
329+jsonServer1 = return $ return "{ \"b\": [\"b\"], \"a\": 1 }" -- whitespace, ordering different
330+
331+jsonServer2 :: IO (Server JsonApi)
332+jsonServer2 = return $ return "{\"a\": 1,\"b\":[\"b\"]}"
333+
334+jsonServer3 :: IO (Server JsonApi)
335+jsonServer3 = return $ return "{\"a\": 2, \"b\": [\"b\"]}"
336+
337+jsonServer4 :: IO (Server JsonApi)
338+jsonServer4 = return $ return "{\"c\": 1, \"d\": [\"b\"]}"
339+
340+
75341ctx :: Context '[BasicAuthCheck ()]
76342ctx = BasicAuthCheck (const . return $ NoSuchUser) :. EmptyContext
77343------------------------------------------------------------------------------
78344-- Utils
79345------------------------------------------------------------------------------
346+evalExample :: (Example e, Arg e ~ ()) => e -> IO EvalResult
347+evalExample e = do
348+ r <- safeEvaluateExample e defaultParams ($ ()) progCallback
349+ case resultStatus r of
350+ Success -> return $ AllGood
351+ Failure _ reason -> return $ FailedWith $ show reason
352+ Pending {} -> error "should not happen"
353+ where
354+ progCallback _ = return ()
355+
356+data EvalResult
357+ = AnException SomeException
358+ | AllGood
359+ | FailedWith String
360+ deriving (Show)
361+
80362
81363args :: Args
82−args = stdArgs { maxSuccess = noOfTestCases }
364+args = defaultArgs { maxSuccess = noOfTestCases }
83365
84366noOfTestCases :: Int
85367#if LONG_TESTS
86368noOfTestCases = 20000
87369#else
88−noOfTestCases = 500
370+noOfTestCases = 1000
89371#endif