git.iko.soy/servant-quickcheck
on 5840ae7 help sign in
29 files changed+532−2444
since splitsnapshots
unifiedsplit
.gitignore−5 .travis.yml+30−154 CHANGELOG.yaml−214 cabal.haskell-ci−7 cabal.project−4 doc/doc.cabal+18−36 doc/posts/Announcement.anansi−330 doc/posts/LICENSE−30 doc/posts/Makefile−25 doc/posts/Setup.hs−2 doc/posts/announcement.md−318 doc/posts/posts.cabal−47 doc/posts/src/Main.hs−71 doc/posts/src/Spec.hs−40 doc/posts/src/schema.sql−9 doc/posts/stack.yaml−46 example/Main.hs−31 servant-quickcheck.cabal+89−126 src/Servant/QuickCheck.hs+1−22 src/Servant/QuickCheck/Internal.hs+4−4 src/Servant/QuickCheck/Internal/Benchmarking.hs+87 src/Servant/QuickCheck/Internal/Equality.hs+4−42 src/Servant/QuickCheck/Internal/ErrorTypes.hs−82 src/Servant/QuickCheck/Internal/HasGenRequest.hs+52−113 src/Servant/QuickCheck/Internal/Predicates.hs+129−262 src/Servant/QuickCheck/Internal/QuickCheck.hs+27−119 stack.yaml+30−5 test/Doctest.hs+44 test/Servant/QuickCheck/InternalSpec.hs+17−300
.gitignore−5
@@ -1,6 +1 @@
11doc/_build/
2−scripts/
3−samples/
4−test-servers/
5−/doc/
6−.stack-work/
.travis.yml+30−154
@@ -1,158 +1,34 @@
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
1+sudo: false
2+
143language: c
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
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+
8820install:
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
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+
11428script:
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
29+ - tinc && cabal configure --enable-tests && cabal build && cabal test
30+ #- (cd doc && tinc cabal configure --enable-tests && cabal build && cabal test)
15631
157−# REGENDATA ("0.10.1",["--config=cabal.haskell-ci","servant-quickcheck.cabal"])
158−# EOF
32+cache:
33+ directories:
34+ - $HOME/.tinc/cache
CHANGELOG.yamldeleted−214
@@ -1,214 +0,0 @@
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-cideleted−7
@@ -1,7 +0,0 @@
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.projectdeleted−4
@@ -1,4 +0,0 @@
1−packages: .
2−tests: true
3−
4−allow-newer: servant-blaze:servant
doc/doc.cabal+18−36
@@ -7,39 +7,24 @@ maintainer: jkarni@gmail.com
77build-type: Simple
88cabal-version: >=1.10
99
10−-- library
11−-- exposed-modules: ServersEqual
12−-- other-extensions: DataKinds, TypeOperators
13−-- build-depends: base >=4.8 && <4.9
14−-- , servant-server == 0.7.*
15−-- , servant-quickcheck
16−-- , servant-client
17−-- , QuickCheck
18−-- , stm
19−-- , containers
20−-- , transformers
21−-- , warp
22−-- , aeson
23−-- ghc-options: -Wall -Werror -pgmL markdown-unlit
24−-- default-language: Haskell2010
25−--
26−-- executable doc
27−-- main-is: Main.hs
28−-- build-depends: base >=4.8 && <4.9
29−-- , servant-server == 0.7.*
30−-- , servant-quickcheck
31−-- , servant-client
32−-- , QuickCheck
33−-- , stm
34−-- , containers
35−-- , transformers
36−-- , warp
37−-- , aeson
38−-- default-language: Haskell2010
39−-- ghc-options: -Wall -Werror -pgmL markdown-unlit
10+library
11+ exposed-modules: ServersEqual
12+ other-extensions: DataKinds, TypeOperators
13+ build-depends: base >=4.8 && <4.9
14+ , servant-server == 0.7.*
15+ , servant-quickcheck
16+ , servant-client
17+ , QuickCheck
18+ , stm
19+ , containers
20+ , transformers
21+ , warp
22+ , aeson
23+ ghc-options: -Wall -Werror -pgmL markdown-unlit
24+ default-language: Haskell2010
4025
41−executable announcement
42− main-is: Announcement.lhs
26+executable doc
27+ main-is: Main.hs
4328 build-depends: base >=4.8 && <4.9
4429 , servant-server == 0.7.*
4530 , servant-quickcheck
@@ -50,8 +35,5 @@ executable announcement
5035 , transformers
5136 , warp
5237 , aeson
53− , hspec
54− , postgresql-simple
55− , text
5638 default-language: Haskell2010
57− ghc-options: -Wall
39+ ghc-options: -Wall -Werror -pgmL markdown-unlit
doc/posts/Announcement.anansideleted−330
@@ -1,330 +0,0 @@
1−:loom anansi.markdown
2−
3−# Announcing servant-quickcheck
4−
5−Some time ago, we released `servant-mock`. The idea behind it is to use
6−`QuickCheck` to create a mock server that accords with a servant API. Not long
7−after, we started thinking about an analog that would, instead of mocking a
8−server, mock a client instead - i.e., generate random requests that conform to
9−an API description.
10−
11−This is much closer to the traditional use of `QuickCheck`. The most obvious
12−use-case is checking that properties hold of an *entire* server rather than of
13−individual endpoints. (But there are other uses that you can skip to if they
14−sound more interesting.)
15−
16−## `serverSatisfies`
17−
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:
69−
70−:d schema.sql
71−
72−CREATE TABLE genus (
73− genus_name text PRIMARY KEY,
74− genus_family text NOT NULL
75−);
76−
77−CREATE TABLE species (
78− species_name text PRIMARY KEY,
79− species_genus text NOT NULL REFERENCES genus (genus_name)
80−)
81−:
82−
83−And our actual application:
84−
85−:d Main.hs
86−{-# LANGUAGE DataKinds #-}
87−{-# LANGUAGE DeriveAnyClass #-}
88−{-# LANGUAGE DeriveGeneric #-}
89−{-# LANGUAGE TypeOperators #-}
90−{-# LANGUAGE OverloadedStrings #-}
91−{-# LANGUAGE RecordWildCards #-}
92−module Main where
93−
94−import Servant
95−import Data.Aeson
96−import Database.PostgreSQL.Simple
97−import GHC.Generics (Generic)
98−import Data.Text (Text)
99−import Network.Wai.Handler.Warp
100−import Control.Monad.IO.Class (liftIO)
101−
102−type API
103− = "species" :> (Capture "species-name" Text :> ( Get '[JSON] Species
104− :<|> Delete '[JSON] ())
105− :<|> ReqBody '[JSON] Species :> Post '[JSON] ()
106− :<|> Get '[JSON] [Species])
107−
108−api :: Proxy API
109−api = Proxy
110−
111−data Species = Species
112− { speciesName :: Text
113− , speciesGenus :: Text
114− } deriving (Eq, Show, Read, Generic, ToJSON, FromJSON)
115−
116−data Genus = Genus
117− { genusName :: Text
118− , genusFamily :: Text
119− } deriving (Eq, Show, Read, Generic, ToJSON, FromJSON)
120−
121−instance FromRow Genus
122−instance FromRow Species
123−
124−server :: Connection -> Server API
125−server conn = ((\sname -> liftIO (lookupSpecies conn sname)
126− :<|> liftIO (deleteSpecies conn sname))
127− :<|> (\species -> liftIO $ insertSpecies conn species))
128− :<|> (liftIO $ allSpecies conn)
129−
130−lookupSpecies :: Connection -> Text -> IO Species
131−lookupSpecies conn name = do
132− [s] <- query conn "SELECT * FROM species WHERE species_name = ?" (Only name)
133− return s
134−
135−deleteSpecies :: Connection -> Text -> IO ()
136−deleteSpecies conn name = do
137− _ <- execute conn "DELETE FROM species WHERE species_name = ?" (Only name)
138− return ()
139−
140−insertSpecies :: Connection -> Species -> IO ()
141−insertSpecies conn Species{..} = do
142− _ <- execute conn "INSERT INTO species (species_name, species_genus) VALUES (?)" (speciesName, speciesGenus)
143− return ()
144−
145−allSpecies :: Connection -> IO [Species]
146−allSpecies conn = do
147− query_ conn "SELECT * FROM species"
148−
149−main :: IO ()
150−main = do
151− conn <- connectPostgreSQL "dbname=servant-quickcheck"
152− run 8090 (serve api $ server conn)
153−:
154−
155−(You'll also also need to run:
156−
157−```
158−createdb servant-quickcheck
159−psql --file schema.sql -d servant-quickcheck
160−```
161−
162−If you want to run this example.)
163−
164−This is a plausible effort. You might want to spend a moment thinking about what
165−could be improved.
166−
167−Here are some `servant-quickcheck`-based tests for this API:
168−
169−:d Spec.hs
170−
171−{-# LANGUAGE OverloadedStrings #-}
172−module Spec (main) where
173−
174−import Main (server, api, Species(..))
175−import Test.Hspec
176−import Test.QuickCheck.Instances
177−import Servant.QuickCheck
178−import Test.QuickCheck (Arbitrary(..))
179−import Database.PostgreSQL.Simple (connectPostgreSQL)
180−
181−spec :: Spec
182−spec = describe "the species application" $ beforeAll check $ do
183− let pserver = do
184− conn <- connectPostgreSQL "dbname=servant-quickcheck"
185− return $ server conn
186−
187−
188− it "should not return 500s" $ do
189− withServantServer api pserver $ \url ->
190− serverSatisfies api url defaultArgs (not500 <%> mempty)
191−
192− it "should not return top-level json" $ do
193− withServantServer api pserver $ \url ->
194− serverSatisfies api url defaultArgs (onlyJsonObjects <%> mempty)
195−
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−
220−main :: IO ()
221−main = do
222− hspec spec
223−
224−instance Arbitrary Species where
225− arbitrary = Species <$> arbitrary <*> arbitrary
226−:
227−
228−
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−
317−**Note**: This post is an anansi literate file that generates multiple source
318−files. They are:
319−
320−:f Main.hs
321−|Main.hs|
322−:
323−
324−:f schema.sql
325−|schema.sql|
326−:
327−
328−:f Spec.hs
329−|Spec.hs|
330−:
doc/posts/LICENSEdeleted−30
@@ -1,30 +0,0 @@
1−Copyright (c) 2016, Julian K. Arni
2−
3−All rights reserved.
4−
5−Redistribution and use in source and binary forms, with or without
6−modification, are permitted provided that the following conditions are met:
7−
8− * Redistributions of source code must retain the above copyright
9− notice, this list of conditions and the following disclaimer.
10−
11− * Redistributions in binary form must reproduce the above
12− copyright notice, this list of conditions and the following
13− disclaimer in the documentation and/or other materials provided
14− with the distribution.
15−
16− * Neither the name of Julian K. Arni nor the names of other
17− contributors may be used to endorse or promote products derived
18− from this software without specific prior written permission.
19−
20−THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21−"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22−LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23−A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
24−OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25−SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
26−LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27−DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28−THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29−(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30−OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
doc/posts/Makefiledeleted−25
@@ -1,25 +0,0 @@
1−FILES = src/Main.hs src/Spec.hs src/schema.sql
2−
3−src/$(FILES): Announcement.anansi
4− anansi tangle -o "src" Announcement.anansi
5−
6−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
10−
11−.stack-work/bin/posts: $(FILES) stack.yaml posts.cabal
12− stack build
13−
14−announcement.html: announcement.md
15− pandoc announcement.md -t html > announcement.html
16−
17−run: .stack-work/bin/posts
18− stack exec posts
19−
20−test: .stack-work/bin/posts
21− stack test
22−
23−post: announcement.html
24−
25−.PHONY: post run test
doc/posts/Setup.hsdeleted−2
@@ -1,2 +0,0 @@
1−import Distribution.Simple
2−main = defaultMain
doc/posts/announcement.mddeleted−318
@@ -1,318 +0,0 @@
1−
2−# Announcing servant-quickcheck
3−
4−Some time ago, we released `servant-mock`. The idea behind it is to use
5−`QuickCheck` to create a mock server that accords with a servant API. Not long
6−after, we started thinking about an analog that would, instead of mocking a
7−server, mock a client instead - i.e., generate random requests that conform to
8−an API description.
9−
10−This is much closer to the traditional use of `QuickCheck`. The most obvious
11−use-case is checking that properties hold of an *entire* server rather than of
12−individual endpoints. (But there are other uses that you can skip to if they
13−sound more interesting.)
14−
15−## `serverSatisfies`
16−
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".
21−
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>>.
28−
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**
71−
72−>
73−> CREATE TABLE genus (
74−> genus_name text PRIMARY KEY,
75−> genus_family text NOT NULL
76−> );
77−>
78−> CREATE TABLE species (
79−> species_name text PRIMARY KEY,
80−> species_genus text NOT NULL REFERENCES genus (genus_name)
81−> )
82−
83−
84−And our actual application:
85−
86−
87−> **Main.hs**
88−
89−> {-# LANGUAGE DataKinds #-}
90−> {-# LANGUAGE DeriveAnyClass #-}
91−> {-# LANGUAGE DeriveGeneric #-}
92−> {-# LANGUAGE TypeOperators #-}
93−> {-# LANGUAGE OverloadedStrings #-}
94−> {-# LANGUAGE RecordWildCards #-}
95−> module Main where
96−>
97−> import Servant
98−> import Data.Aeson
99−> import Database.PostgreSQL.Simple
100−> import GHC.Generics (Generic)
101−> import Data.Text (Text)
102−> import Network.Wai.Handler.Warp
103−> import Control.Monad.IO.Class (liftIO)
104−>
105−> type API
106−> = "species" :> (Capture "species-name" Text :> ( Get '[JSON] Species
107−> :<|> Delete '[JSON] ())
108−> :<|> ReqBody '[JSON] Species :> Post '[JSON] ())
109−> -- The plural of 'species' is unfortunately also 'species'
110−> :<|> "speciess" :> Get '[JSON] [Species]
111−>
112−> api :: Proxy API
113−> api = Proxy
114−>
115−> data Species = Species
116−> { speciesName :: Text
117−> , speciesGenus :: Text
118−> } deriving (Eq, Show, Read, Generic, ToJSON, FromJSON)
119−>
120−> data Genus = Genus
121−> { genusName :: Text
122−> , genusFamily :: Text
123−> } deriving (Eq, Show, Read, Generic, ToJSON, FromJSON)
124−>
125−> instance FromRow Genus
126−> instance FromRow Species
127−>
128−> server :: Connection -> Server API
129−> server conn = ((\sname -> liftIO (lookupSpecies conn sname)
130−> :<|> liftIO (deleteSpecies conn sname))
131−> :<|> (\species -> liftIO $ insertSpecies conn species))
132−> :<|> (liftIO $ allSpecies conn)
133−>
134−> lookupSpecies :: Connection -> Text -> IO Species
135−> lookupSpecies conn name = do
136−> [s] <- query conn "SELECT * FROM species WHERE species_name = ?" (Only name)
137−> return s
138−>
139−> deleteSpecies :: Connection -> Text -> IO ()
140−> deleteSpecies conn name = do
141−> _ <- execute conn "DELETE FROM species WHERE species_name = ?" (Only name)
142−> return ()
143−>
144−> insertSpecies :: Connection -> Species -> IO ()
145−> insertSpecies conn Species{..} = do
146−> _ <- execute conn "INSERT INTO species (species_name, species_genus) VALUES (?)" (speciesName, speciesGenus)
147−> return ()
148−>
149−> allSpecies :: Connection -> IO [Species]
150−> allSpecies conn = do
151−> query_ conn "SELECT * FROM species"
152−>
153−> main :: IO ()
154−> main = do
155−> conn <- connectPostgreSQL "dbname=servant-quickcheck"
156−> run 8090 (serve api $ server conn)
157−
158−
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−
308−
309−> ** schema.sql**
310−
311−> schema.sql
312−
313−
314−
315−> ** Spec.hs**
316−
317−> Spec.hs
318−
doc/posts/posts.cabaldeleted−47
@@ -1,47 +0,0 @@
1−-- Initial posts.cabal generated by cabal init. For further documentation,
2−-- see http://haskell.org/cabal/users-guide/
3−
4−name: posts
5−version: 0.1.0.0
6−-- synopsis:
7−-- description:
8−license: BSD3
9−license-file: LICENSE
10−author: Julian K. Arni
11−maintainer: jkarni@gmail.com
12−-- copyright:
13−-- category:
14−build-type: Simple
15−-- extra-source-files:
16−cabal-version: >=1.10
17−
18−executable posts
19− main-is: Main.hs
20− build-depends: base >=4.8 && <4.9
21− , servant-server >=0.5 && <0.8
22− , aeson >=0.9 && <0.12
23− , text == 1.*
24− , warp >=3.0 && <3.3
25− , transformers >=0.4 && <0.5
26− , postgresql-simple
27− hs-source-dirs: src
28− ghc-options: -Wall -O2 -threaded
29− default-language: Haskell2010
30−
31−test-suite spec
32− type: exitcode-stdio-1.0
33− ghc-options: -Wall -O2 -threaded
34− default-language: Haskell2010
35− hs-source-dirs: src
36− main-is: Spec.hs
37− build-depends: base == 4.*
38− , servant-quickcheck
39− , hspec == 2.*
40− , servant-server >=0.5 && <0.8
41− , aeson >=0.9 && <0.12
42− , text == 1.*
43− , warp >=3.0 && <3.3
44− , transformers >=0.4 && <0.5
45− , postgresql-simple
46− , quickcheck-instances
47− , QuickCheck
doc/posts/src/Main.hsdeleted−71
@@ -1,71 +0,0 @@
1−#line 296 "Announcement.anansi"
2−
3−#line 86 "Announcement.anansi"
4−{-# LANGUAGE DataKinds #-}
5−{-# LANGUAGE DeriveAnyClass #-}
6−{-# LANGUAGE DeriveGeneric #-}
7−{-# LANGUAGE TypeOperators #-}
8−{-# LANGUAGE OverloadedStrings #-}
9−{-# LANGUAGE RecordWildCards #-}
10−module Main where
11−
12−import Servant
13−import Data.Aeson
14−import Database.PostgreSQL.Simple
15−import GHC.Generics (Generic)
16−import Data.Text (Text)
17−import Network.Wai.Handler.Warp
18−import Control.Monad.IO.Class (liftIO)
19−
20−type API
21− = "species" :> (Capture "species-name" Text :> ( Get '[JSON] Species
22− :<|> Delete '[JSON] ())
23− :<|> ReqBody '[JSON] Species :> Post '[JSON] ())
24− -- The plural of 'species' is unfortunately also 'species'
25− :<|> "speciess" :> Get '[JSON] [Species]
26−
27−api :: Proxy API
28−api = Proxy
29−
30−data Species = Species
31− { speciesName :: Text
32− , speciesGenus :: Text
33− } deriving (Eq, Show, Read, Generic, ToJSON, FromJSON)
34−
35−data Genus = Genus
36− { genusName :: Text
37− , genusFamily :: Text
38− } deriving (Eq, Show, Read, Generic, ToJSON, FromJSON)
39−
40−instance FromRow Genus
41−instance FromRow Species
42−
43−server :: Connection -> Server API
44−server conn = ((\sname -> liftIO (lookupSpecies conn sname)
45− :<|> liftIO (deleteSpecies conn sname))
46− :<|> (\species -> liftIO $ insertSpecies conn species))
47− :<|> (liftIO $ allSpecies conn)
48−
49−lookupSpecies :: Connection -> Text -> IO Species
50−lookupSpecies conn name = do
51− [s] <- query conn "SELECT * FROM species WHERE species_name = ?" (Only name)
52− return s
53−
54−deleteSpecies :: Connection -> Text -> IO ()
55−deleteSpecies conn name = do
56− _ <- execute conn "DELETE FROM species WHERE species_name = ?" (Only name)
57− return ()
58−
59−insertSpecies :: Connection -> Species -> IO ()
60−insertSpecies conn Species{..} = do
61− _ <- execute conn "INSERT INTO species (species_name, species_genus) VALUES (?)" (speciesName, speciesGenus)
62− return ()
63−
64−allSpecies :: Connection -> IO [Species]
65−allSpecies conn = do
66− query_ conn "SELECT * FROM species"
67−
68−main :: IO ()
69−main = do
70− conn <- connectPostgreSQL "dbname=servant-quickcheck"
71− run 8090 (serve api $ server conn)
doc/posts/src/Spec.hsdeleted−40
@@ -1,40 +0,0 @@
1−#line 304 "Announcement.anansi"
2−
3−#line 171 "Announcement.anansi"
4−
5−{-# LANGUAGE OverloadedStrings #-}
6−module Spec (main) where
7−
8−import Main (server, api, Species(..))
9−import Test.Hspec
10−import Test.QuickCheck.Instances
11−import Servant.QuickCheck
12−import Test.QuickCheck (Arbitrary(..))
13−import Database.PostgreSQL.Simple (connectPostgreSQL)
14−
15−spec :: Spec
16−spec = describe "the species application" $ beforeAll check $ do
17− let pserver = do
18− conn <- connectPostgreSQL "dbname=servant-quickcheck"
19− return $ server conn
20−
21−
22− it "should not return 500s" $ do
23− withServantServer api pserver $ \url ->
24− serverSatisfies api url defaultArgs (not500 <%> mempty)
25−
26− it "should not return top-level json" $ do
27− withServantServer api pserver $ \url ->
28− serverSatisfies api url defaultArgs (onlyJsonObjects <%> mempty)
29−
30− it "should return valid locations for 201" $ do
31− withServantServer api pserver $ \url ->
32− serverSatisfies api url defaultArgs (createContainsValidLocation <%> mempty)
33−
34−
35−main :: IO ()
36−main = do
37− hspec spec
38−
39−instance Arbitrary Species where
40− arbitrary = Species <$> arbitrary <*> arbitrary
doc/posts/src/schema.sqldeleted−9
@@ -1,9 +0,0 @@
1−CREATE TABLE genus (
2− genus_name text PRIMARY KEY,
3− genus_family text NOT NULL
4−);
5−
6−CREATE TABLE species (
7− species_name text PRIMARY KEY,
8− species_genus text NOT NULL REFERENCES genus (genus_name)
9−)
doc/posts/stack.yamldeleted−46
@@ -1,46 +0,0 @@
1−# This file was automatically generated by stack init
2−# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/
3−
4−
5−# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
6−resolver: lts-5.14
7−
8−# Local packages, usually specified by relative directory name
9−packages:
10−- '../..'
11−- '.'
12−# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
13−extra-deps:
14−- aeson-0.11.1.4
15−- fast-logger-2.4.6
16−- http2-1.6.0
17−- servant-0.7
18−- servant-server-0.7
19−- servant-client-0.7
20−- servant-quickcheck-0.1.0.0
21−- text-1.2.2.1
22−- warp-3.2.6
23−
24−# Override default flag values for local packages and extra-deps
25−flags: {}
26−
27−# Extra package databases containing global packages
28−extra-package-dbs: []
29−
30−# Control whether we use the GHC we find on the path
31−# system-ghc: true
32−
33−# Require a specific version of stack, using version ranges
34−# require-stack-version: -any # Default
35−# require-stack-version: >= 1.0.0
36−
37−# Override the architecture used by stack, especially useful on Windows
38−# arch: i386
39−# arch: x86_64
40−
41−# Extra directories used by stack for building
42−# extra-include-dirs: [/path/to/dir]
43−# extra-lib-dirs: [/path/to/dir]
44−
45−# Allow a newer minor version of GHC than the snapshot specifies
46−# compiler-check: newer-minor
example/Main.hsdeleted−31
@@ -1,31 +0,0 @@
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+89−126
@@ -1,138 +1,101 @@
1−name: servant-quickcheck
2−version: 0.0.9.1
3−synopsis: QuickCheck entire APIs
1+name: servant-quickcheck
2+version: 0.1.0.0
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
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
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
2115
2216flag long-tests
2317 description: Run more QuickCheck tests
2418 default: False
2519
2620library
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
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
8564
8665test-suite spec
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−
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
12387 if flag(long-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
88+ cpp-options: -DLONG_TESTS
13789
138− default-language: Haskell2010
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
src/Servant/QuickCheck.hs+1−22
@@ -27,18 +27,11 @@ 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
3130 , onlyJsonObjects
32− , honoursAcceptHeader
3331 , notAllowedContainsAllowHeader
3432 , unauthorizedContainsWWWAuthenticate
35− , getsHaveLastModifiedHeader
3633 , getsHaveCacheControlHeader
3734 , headsHaveCacheControlHeader
38− , createContainsValidLocation
39− -- * Html Predicates
40− , htmlIncludesDoctype
41−
4235 -- *** Predicate utilities and types
4336 , (<%>)
4437 , Predicates
@@ -54,7 +47,6 @@ module Servant.QuickCheck
5447 -- represents other means of checking equality
5548 -- *** Useful @ResponseEquality@s
5649 , bodyEquality
57− , jsonEquality
5850 , allEquality
5951 -- ** Response equality type
6052 , ResponseEquality(..)
@@ -63,26 +55,13 @@ module Servant.QuickCheck
6355 -- | Helpers to setup and teardown @servant@ servers during tests.
6456 , withServantServer
6557 , withServantServerAndContext
66− , defaultArgs
6758
6859 -- ** Re-exports
69− -- | Types and constructors from other packages that are generally needed for
70− -- using @servant-quickcheck@.
7160 , BaseUrl(..)
7261 , Scheme(..)
73− , Args(..)
74− , Proxy(..)
7562
7663
7764 ) where
7865
79−import Data.Proxy (Proxy (..))
80−import Servant.Client (BaseUrl (..), Scheme (..))
8166import Servant.QuickCheck.Internal
82−import Test.QuickCheck (Args (..), stdArgs)
83−
84−-- | QuickCheck @Args@ with 1000 rather than 100 test cases.
85−--
86−-- /Since 0.0.0.0/
87−defaultArgs :: Args
88−defaultArgs = stdArgs { maxSuccess = 1000 }
67+import Servant.Client (BaseUrl(..), Scheme(..))
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
53import Servant.QuickCheck.Internal.HasGenRequest as X
6−import Servant.QuickCheck.Internal.Predicates as X
7−import Servant.QuickCheck.Internal.QuickCheck 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
src/Servant/QuickCheck/Internal/Benchmarking.hsnew file+87
@@ -0,0 +1,87 @@
1+-- | This module contains benchmark-related logic.
2+--
3+-- Currently it generates 'wrk' scripts rather than benchmarking directly with
4+-- the @servant-client@ functions since the performance of 'wrk' is
5+-- significantly better.
6+module Servant.QuickCheck.Internal.Benchmarking where
7+
8+import Data.ByteString (ByteString)
9+import Data.ByteString.Lazy (toStrict)
10+import Network.HTTP.Client
11+import Network.HTTP.Types
12+import Servant.Client
13+
14+data BenchOptions = BenchOptions
15+ { duration :: Int
16+ , threads :: Int
17+ , connections :: Int
18+ , noOfTests :: Int
19+ } deriving (Eq, Show, Read)
20+
21+defaultBenchOptions :: BenchOptions
22+defaultBenchOptions = BenchOptions
23+ { duration = 10
24+ , threads = 1
25+ , connections = 10
26+ , noOfTests = 10
27+ }
28+
29+data WrkScript = WrkScript
30+ { wrkScheme :: Scheme
31+ , wrkHost :: ByteString
32+ , wrkPort :: Int
33+ , wrkMethod :: Method
34+ , wrkPath :: ByteString
35+ , wrkHeaders :: [Header]
36+ , wrkBody :: ByteString
37+ } deriving (Eq, Show)
38+
39+mkScript :: WrkScript -> String
40+mkScript w
41+ = "wrk.scheme = \"" ++ sscheme (wrkScheme w) ++ "\""
42+ ++ "\nwrk.host = " ++ show (wrkHost w)
43+ ++ "\nwrk.port = " ++ show (wrkPort w)
44+ ++ "\nwrk.method = " ++ show (wrkMethod w)
45+ ++ "\nwrk.path = " ++ show (wrkPath w)
46+ ++ foldr (\(h,v) old -> old ++ "\nwrk.headers[" ++ show h ++ "] = " ++ show v)
47+ ""
48+ (wrkHeaders w)
49+ ++ "\nwrk.body = " ++ show (wrkBody w)
50+ ++ "\n" ++ reportFmt
51+ where
52+ sscheme Http = "http"
53+ sscheme Https = "https"
54+
55+reqToWrk :: Request -> WrkScript
56+reqToWrk r = WrkScript
57+ { wrkScheme = Http
58+ , wrkHost = host r
59+ , wrkPort = port r
60+ , wrkMethod = method r
61+ , wrkPath = path r
62+ , wrkHeaders = requestHeaders r
63+ , wrkBody = case requestBody r of
64+ RequestBodyLBS r' -> toStrict r'
65+ _ -> error "expecting RequestBodyLBS"
66+ }
67+
68+reportFmt :: String
69+reportFmt
70+ = "done = function(summary, latency, requests)\n"
71+ ++ " for _, p in pairs({ 50, 75, 99, 99.999 }) do\n"
72+ ++ " n = latency:percentile(p)\n"
73+ ++ " io.write(string.format(\"%g%%, %d\\n\", p, n))\n"
74+ ++ " end\n"
75+ ++ "end\n"
76+
77+{-data BenchResult = BenchResult-}
78+ {-{ benchReq :: Request-}
79+ {-, benchLatencyDist :: [(Percentile, Microsecs)]-}
80+ {-, benchLatencyAvg :: Microsecs-}
81+ {-} deriving (Eq, Show, Read, Generic)-}
82+
83+{-newtype Microsecs = Microsecs { unMicroSecs :: Int }-}
84+ {-deriving (Eq, Show, Read, Generic)-}
85+
86+{-newtype Percentile = Percentile { unPercentile :: Int }-}
87+ {-deriving (Eq, Show, Read, Generic)-}
src/Servant/QuickCheck/Internal/Equality.hs+4−42
@@ -1,58 +1,20 @@
11module Servant.QuickCheck.Internal.Equality where
22
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
3+import Network.HTTP.Client
4+import Data.Function (on)
105
116newtype ResponseEquality b
127 = ResponseEquality { getResponseEquality :: Response b -> Response b -> Bool }
138
14−instance Semigroup (ResponseEquality b) where
15− ResponseEquality a <> ResponseEquality b = ResponseEquality $ \x y ->
16− a x y && b x y
17−
189instance Monoid (ResponseEquality b) where
1910 mempty = ResponseEquality $ \_ _ -> True
20− mappend = (<>)
11+ ResponseEquality a `mappend` ResponseEquality b = ResponseEquality $ \x y ->
12+ a x y && b x y
2113
2214-- | Use `Eq` instance for `Response`
23−--
24−-- /Since 0.0.0.0/
2515allEquality :: Eq b => ResponseEquality b
2616allEquality = ResponseEquality (==)
2717
2818-- | ByteString `Eq` instance over the response body.
29−--
30−-- /Since 0.0.0.0/
3119bodyEquality :: Eq b => ResponseEquality b
3220bodyEquality = 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.hsdeleted−82
@@ -1,82 +0,0 @@
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+52−113
@@ -1,148 +1,97 @@
1−{-# LANGUAGE CPP #-}
21{-# LANGUAGE PolyKinds #-}
32module Servant.QuickCheck.Internal.HasGenRequest where
43
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.
42−class HasGenRequest a where
43− genRequest :: Proxy a -> (Int, Gen (BaseUrl -> Request))
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+
4418
19+class HasGenRequest a where
20+ genRequest :: Proxy a -> Gen (BaseUrl -> Request)
4521
4622instance (HasGenRequest a, HasGenRequest b) => HasGenRequest (a :<|> b) where
4723 genRequest _
48− = (lf + rf, frequency [l, r])
49− where
50− l@(lf, _) = genRequest (Proxy :: Proxy a)
51− r@(rf, _) = genRequest (Proxy :: Proxy b)
52−
24+ = oneof [ genRequest (Proxy :: Proxy a)
25+ , genRequest (Proxy :: Proxy b)
26+ ]
5327
5428instance (KnownSymbol path, HasGenRequest b) => HasGenRequest (path :> b) where
55− genRequest _ = (oldf, do
29+ genRequest _ = do
5630 old' <- old
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 })
31+ return $ \burl -> let r = old' burl in r { path = new <> "/" <> path r }
6232 where
63− (oldf, old) = genRequest (Proxy :: Proxy b)
33+ old = genRequest (Proxy :: Proxy b)
6434 new = cs $ symbolVal (Proxy :: Proxy path)
6535
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−
7536instance (Arbitrary c, HasGenRequest b, ToHttpApiData c )
76− => HasGenRequest (Capture' mods x c :> b) where
77− genRequest _ = (oldf, do
37+ => HasGenRequest (Capture x c :> b) where
38+ genRequest _ = do
7839 old' <- old
7940 new' <- toUrlPiece <$> new
80− return $ \burl -> let r = old' burl in r { path = cs new' <> path r })
41+ return $ \burl -> let r = old' burl in r { path = cs new' <> "/" <> path r }
8142 where
82− (oldf, old) = genRequest (Proxy :: Proxy b)
43+ old = genRequest (Proxy :: Proxy b)
8344 new = arbitrary :: Gen c
8445
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−
9646instance (Arbitrary c, KnownSymbol h, HasGenRequest b, ToHttpApiData c)
97− => HasGenRequest (Header' mods h c :> b) where
98− genRequest _ = (oldf, do
47+ => HasGenRequest (Header h c :> b) where
48+ genRequest _ = do
9949 old' <- old
100− new' <- toUrlPiece <$> new -- TODO: generate lenient or/and optional
50+ new' <- toUrlPiece <$> new
10151 return $ \burl -> let r = old' burl in r {
102− requestHeaders = (hdr, cs new') : requestHeaders r })
52+ requestHeaders = (hdr, cs new') : requestHeaders r }
10353 where
104− (oldf, old) = genRequest (Proxy :: Proxy b)
54+ old = genRequest (Proxy :: Proxy b)
10555 hdr = fromString $ symbolVal (Proxy :: Proxy h)
10656 new = arbitrary :: Gen c
10757
10858instance (AllMimeRender x c, Arbitrary c, HasGenRequest b)
109− => HasGenRequest (ReqBody' mods x c :> b) where
110− genRequest _ = (oldf, do
111− old' <- old -- TODO: generate lenient
59+ => HasGenRequest (ReqBody x c :> b) where
60+ genRequest _ = do
61+ old' <- old
11262 new' <- new
11363 (ct, bd) <- elements $ allMimeRender (Proxy :: Proxy x) new'
11464 return $ \burl -> let r = old' burl in r {
11565 requestBody = RequestBodyLBS bd
11666 , requestHeaders = ("Content-Type", renderHeader ct) : requestHeaders r
117− })
67+ }
11868 where
119− (oldf, old) = genRequest (Proxy :: Proxy b)
69+ old = genRequest (Proxy :: Proxy b)
12070 new = arbitrary :: Gen c
12171
12272instance (KnownSymbol x, Arbitrary c, ToHttpApiData c, HasGenRequest b)
123− => HasGenRequest (QueryParam' mods x c :> b) where
124− genRequest _ = (oldf, do
125− new' <- new -- TODO: generate lenient or/and optional
73+ => HasGenRequest (QueryParam x c :> b) where
74+ genRequest _ = do
75+ new' <- new
12676 old' <- old
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 })
77+ return $ \burl -> let r = old' burl in r {
78+ queryString = queryString r
79+ <> param <> "=" <> cs (toQueryParam new') }
13180 where
132− (oldf, old) = genRequest (Proxy :: Proxy b)
81+ old = genRequest (Proxy :: Proxy b)
13382 param = cs $ symbolVal (Proxy :: Proxy x)
13483 new = arbitrary :: Gen c
13584
13685instance (KnownSymbol x, Arbitrary c, ToHttpApiData c, HasGenRequest b)
13786 => HasGenRequest (QueryParams x c :> b) where
138− genRequest _ = (oldf, do
87+ genRequest _ = do
13988 new' <- new
14089 old' <- old
14190 return $ \burl -> let r = old' burl in r {
14291 queryString = queryString r
143− <> if length new' > 0 then fold (toParam <$> new') else ""})
92+ <> if length new' > 0 then fold (toParam <$> new') else ""}
14493 where
145− (oldf, old) = genRequest (Proxy :: Proxy b)
94+ old = genRequest (Proxy :: Proxy b)
14695 param = cs $ symbolVal (Proxy :: Proxy x)
14796 new = arbitrary :: Gen [c]
14897 toParam c = param <> "[]=" <> cs (toQueryParam c)
@@ -150,32 +99,22 @@ instance (KnownSymbol x, Arbitrary c, ToHttpApiData c, HasGenRequest b)
15099
151100instance (KnownSymbol x, HasGenRequest b)
152101 => HasGenRequest (QueryFlag x :> b) where
153− genRequest _ = (oldf, do
102+ genRequest _ = do
154103 old' <- old
155− return $ \burl -> let r = old' burl
156− qs = queryString r in r {
157− queryString = if BS.null qs then param else param <> "&" <> qs })
104+ return $ \burl -> let r = old' burl in r {
105+ queryString = queryString r <> param <> "=" }
158106 where
159− (oldf, old) = genRequest (Proxy :: Proxy b)
107+ old = genRequest (Proxy :: Proxy b)
160108 param = cs $ symbolVal (Proxy :: Proxy x)
161109
162110instance (ReflectMethod method)
163111 => HasGenRequest (Verb (method :: k) (status :: Nat) (cts :: [*]) a) where
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
112+ genRequest _ = return $ \burl -> def
174113 { host = cs $ baseUrlHost burl
175114 , port = baseUrlPort burl
176115 , secure = baseUrlScheme burl == Https
177116 , method = reflectMethod (Proxy :: Proxy method)
178− })
117+ }
179118
180119instance (HasGenRequest a) => HasGenRequest (RemoteHost :> a) where
181120 genRequest _ = genRequest (Proxy :: Proxy a)
src/Servant/QuickCheck/Internal/Predicates.hs+129−262
@@ -1,36 +1,24 @@
1+{-# LANGUAGE MultiWayIf #-}
12module Servant.QuickCheck.Internal.Predicates where
23
3−import Control.Exception (catch, throw)
4−import Control.Monad (liftM2, unless, when)
4+import Control.Monad
55import Data.Aeson (Object, decode)
6−import Data.Bifunctor (first)
6+import Data.Bifunctor (Bifunctor (..))
77import qualified Data.ByteString as SBS
88import qualified Data.ByteString.Char8 as SBSC
99import qualified Data.ByteString.Lazy as LBS
10−import Data.CaseInsensitive (foldCase, foldedCase, mk)
10+import Data.CaseInsensitive (mk)
1111import Data.Either (isRight)
1212import Data.List.Split (wordsBy)
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)
13+import Data.Maybe (isJust)
14+import Data.Monoid ((<>))
15+import Data.Text (Text)
1816import GHC.Generics (Generic)
1917import Network.HTTP.Client (Manager, Request, Response, httpLbs,
20− method, parseRequest, requestHeaders,
21− responseBody, responseHeaders,
18+ method, responseBody, responseHeaders,
2219 responseStatus)
23−import Network.HTTP.Media (matchAccept)
2420import Network.HTTP.Types (methodGet, methodHead, parseMethod,
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−
21+ status401, renderStdMethod, status405, status500)
3422
3523-- | [__Best Practice__]
3624--
@@ -39,27 +27,8 @@ import Servant.QuickCheck.Internal.ErrorTypes
3927-- indication of how to proceed or what went wrong.
4028--
4129-- This function checks that the response code is not 500.
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 []
30+not500 :: ResponsePredicate Text Bool
31+not500 = ResponsePredicate "not500" (\resp -> not $ responseStatus resp == status500)
6332
6433-- | [__Best Practice__]
6534--
@@ -80,90 +49,30 @@ notLongerThan maxAllowed
8049--
8150-- * JSON Grammar: <https://tools.ietf.org/html/rfc7159#section-2 RFC 7159 Section 2>
8251-- * JSON Grammar: <https://tools.ietf.org/html/rfc4627#section-2 RFC 4627 Section 2>
83−--
84−-- /Since 0.0.0.0/
85−onlyJsonObjects :: ResponsePredicate
52+onlyJsonObjects :: ResponsePredicate Text Bool
8653onlyJsonObjects
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 ())
54+ = ResponsePredicate "onlyJsonObjects" (\resp -> case decode (responseBody resp) of
55+ Nothing -> False
56+ Just (_ :: Object) -> True)
9457
95−-- | __Optional__
96−--
97−-- When creating a new resource, it is good practice to provide a @Location@
58+{-
59+-- | When creating a new resource, it is good practice to provide a @Location@
9860-- header with a link to the created resource.
9961--
10062-- This function checks that every @201 Created@ response contains a @Location@
10163-- header, and that the link in it responds with a 2XX response code to @GET@
10264-- requests.
10365--
104−-- This is considered optional because other means of linking to the resource
105−-- (e.g. via the response body) are also acceptable; linking to the resource in
106−-- some way is considered best practice.
107−--
108−-- __References__:
109−--
110−-- * 201 Created: <https://tools.ietf.org/html/rfc7231#section-6.3.2 RFC 7231 Section 6.3.2>
111−-- * Location header: <https://tools.ietf.org/html/rfc7231#section-7.1.2 RFC 7231 Section 7.1.2>
112−--
113−-- /Since 0.0.0.0/
114−createContainsValidLocation :: RequestPredicate
66+-- References: <RFC 7231, Section 6.3.2 https://tools.ietf.org/html/rfc7231#section-6.3.2>
67+createContainsValidLocation :: ResponsePredicate Text Bool
11568createContainsValidLocation
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
160− resp <- httpLbs req mgr
161− unless (hasValidHeader "Last-Modified" isRFC822Date resp) $ do
162− throw $ PredicateFailure "getsHaveLastModifiedHeader" (Just req) resp
163− return [resp]
164− else return []
69+ = ResponsePredicate "createContainsValidLocation" (\resp ->
16570
71+getsHaveLastModifiedHeader :: ResponsePredicate Text Bool
72+getsHaveLastModifiedHeader
73+ = ResponsePredicate "getsHaveLastModifiedHeader" (\resp ->
16674
75+-}
16776
16877-- | [__RFC Compliance__]
16978--
@@ -175,61 +84,55 @@ getsHaveLastModifiedHeader
17584-- This function checks that every @405 Method Not Allowed@ response contains
17685-- an @Allow@ header with a list of standard HTTP methods.
17786--
178−-- Note that 'servant' itself does not currently set the @Allow@ headers.
179−--
18087-- __References__:
18188--
18289-- * @Allow@ header: <https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html RFC 2616 Section 14.7>
18390-- * Status 405: <https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html RFC 2616 Section 10.4.6>
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
91+notAllowedContainsAllowHeader :: RequestPredicate Text Bool
18892notAllowedContainsAllowHeader
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
93+ = RequestPredicate
94+ { reqPredName = name
95+ , reqResps = \req mgr -> mapM (flip httpLbs mgr)
96+ [ req { method = renderStdMethod m }
97+ | m <- [minBound .. maxBound ]
98+ , renderStdMethod m /= method req ]
99+ , reqPred = pred'
100+ }
197101 where
198− pred' (_, resp) = responseStatus resp == status405 && not (hasValidHeader "Allow" go resp)
102+ name = "notAllowedContainsAllowHeader"
103+ pred' = ResponsePredicate name (\resp ->
104+ if responseStatus resp == status405
105+ then hasValidHeader "Allow" go resp
106+ else True)
199107 where
200108 go x = all (\y -> isRight $ parseMethod $ SBSC.pack y)
201109 $ wordsBy (`elem` (", " :: [Char])) (SBSC.unpack x)
202110
203−
204−-- | [__RFC Compliance__]
205−--
206−-- When a request contains an @Accept@ header, the server must either return
111+ {-
112+-- | When a request contains an @Accept@ header, the server must either return
207113-- content in one of the requested representations, or respond with @406 Not
208114-- Acceptable@.
209115--
210116-- This function checks that every *successful* response has a @Content-Type@
211−-- header that matches the @Accept@ header. It does *not* check that the server
212−-- matches the quality descriptions of the @Accept@ header correctly.
117+-- header that matches the @Accept@ header.
213118--
214119-- __References__:
215120--
216121-- * @Accept@ header: <https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html RFC 2616 Section 14.1>
217−--
218−-- /Since 0.0.0.0/
219−honoursAcceptHeader :: RequestPredicate
122+honoursAcceptHeader :: RequestPredicate b Bool
220123honoursAcceptHeader
221− = RequestPredicate $ \req mgr -> do
124+ = RequestPredicate name (ResponsePredicate name $ \req mgr -> do
125+
222126 resp <- httpLbs req mgr
223127 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−
128+ sctype = maybeToList $ lookup "Content-Type" $ responseHeaders resp
129+ sacc = fromMaybe "*/*" $ lookup "Accept" $ requestHeaders req
130+ if 100 < scode && scode < 300
131+ then isJust matchAccept sacc sctype
132+ else True)
133+ where name = "honoursAcceptHeader"
232134
135+-}
233136-- | [__Best Practice__]
234137--
235138-- Whether or not a representation should be cached, it is good practice to
@@ -242,34 +145,33 @@ honoursAcceptHeader
242145-- __References__:
243146--
244147-- * @Cache-Control@ header: <https://tools.ietf.org/html/rfc7234#section-5.2 RFC 7234 Section 5.2>
245−--
246−-- /Since 0.0.0.0/
247−getsHaveCacheControlHeader :: RequestPredicate
148+getsHaveCacheControlHeader :: RequestPredicate Text Bool
248149getsHaveCacheControlHeader
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 []
150+ = RequestPredicate
151+ { reqPredName = name
152+ , reqResps = \req mgr -> if method req == methodGet
153+ then return <$> httpLbs req mgr
154+ else return []
155+ , reqPred = ResponsePredicate name $ \resp ->
156+ isJust $ lookup "Cache-Control" $ responseHeaders resp
157+ }
158+ where name = "getsHaveCacheControlHeader"
257159
258160-- | [__Best Practice__]
259161--
260162-- Like 'getsHaveCacheControlHeader', but for @HEAD@ requests.
261−--
262−-- /Since 0.0.0.0/
263−headsHaveCacheControlHeader :: RequestPredicate
163+headsHaveCacheControlHeader :: RequestPredicate Text Bool
264164headsHaveCacheControlHeader
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 []
165+ = RequestPredicate
166+ { reqPredName = name
167+ , reqResps = \req mgr -> if method req == methodHead
168+ then return <$> httpLbs req mgr
169+ else return []
170+ , reqPred = ResponsePredicate name $ \resp ->
171+ isJust $ lookup "Cache-Control" $ responseHeaders resp
172+ }
173+ where name = "headsHaveCacheControlHeader"
174+
273175{-
274176-- |
275177--
@@ -329,37 +231,12 @@ linkHeadersAreValid
329231-- __References__:
330232--
331233-- * @WWW-Authenticate@ header: <https://tools.ietf.org/html/rfc7235#section-4.1 RFC 7235 Section 4.1>
332−--
333−-- /Since 0.0.0.0/
334−unauthorizedContainsWWWAuthenticate :: ResponsePredicate
234+unauthorizedContainsWWWAuthenticate :: ResponsePredicate Text Bool
335235unauthorizedContainsWWWAuthenticate
336− = ResponsePredicate $ \resp ->
236+ = ResponsePredicate "unauthorizedContainsWWWAuthenticate" (\resp ->
337237 if responseStatus resp == status401
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 ()
238+ then hasValidHeader "WWW-Authenticate" (const True) resp
239+ else True)
363240
364241-- * Predicate logic
365242
@@ -369,77 +246,79 @@ htmlIncludesDoctype
369246--
370247-- Still, this is all kind of ugly.
371248
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)
249+data ResponsePredicate n r = ResponsePredicate
250+ { respPredName :: n
251+ , respPred :: Response LBS.ByteString -> r
252+ } deriving (Functor, Generic)
378253
379−instance Semigroup ResponsePredicate where
380− ResponsePredicate a <> ResponsePredicate b = ResponsePredicate $ \x -> a x >> b x
254+instance Bifunctor ResponsePredicate where
255+ first f (ResponsePredicate a b) = ResponsePredicate (f a) b
256+ second = fmap
381257
382−instance Monoid ResponsePredicate where
383− mempty = ResponsePredicate $ const $ return ()
384− mappend = (<>)
258+instance (Monoid n, Monoid r) => Monoid (ResponsePredicate n r) where
259+ mempty = ResponsePredicate mempty mempty
260+ a `mappend` b = ResponsePredicate
261+ { respPredName = respPredName a <> respPredName b
262+ , respPred = respPred a <> respPred b
263+ }
385264
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)
265+data RequestPredicate n r = RequestPredicate
266+ { reqPredName :: n
267+ , reqResps :: Request -> Manager -> IO [Response LBS.ByteString]
268+ , reqPred :: ResponsePredicate n r
269+ } deriving (Generic, Functor)
392270
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 = (<>)
271+instance Bifunctor RequestPredicate where
272+ first f (RequestPredicate a b c) = RequestPredicate (f a) b (first f c)
273+ second = fmap
397274
398275-- TODO: This isn't actually a monoid
399−instance Semigroup RequestPredicate where
400− RequestPredicate a <> RequestPredicate b = RequestPredicate $ \r mgr ->
401− liftM2 (<>) (a r mgr) (b r mgr)
402−
403−-- | A set of predicates. Construct one with 'mempty' and '<%>'.
404−data Predicates = Predicates
405− { requestPredicates :: RequestPredicate
406− , responsePredicates :: ResponsePredicate
407− } deriving (Generic)
276+instance (Monoid n, Monoid r) => Monoid (RequestPredicate n r) where
277+ mempty = RequestPredicate mempty (\r m -> return <$> httpLbs r m) mempty
278+ a `mappend` b = RequestPredicate
279+ { reqPredName = reqPredName a <> reqPredName b
280+ , reqResps = \x m -> liftM2 (<>) (reqResps a x m) (reqResps b x m)
281+ , reqPred = reqPred a <> reqPred b
282+ }
283+
284+data Predicates n r = Predicates
285+ { reqPreds :: RequestPredicate n r
286+ , respPreds :: ResponsePredicate n r
287+ } deriving (Generic, Functor)
288+
289+instance (Monoid n, Monoid r) => Monoid (Predicates n r) where
290+ mempty = Predicates mempty mempty
291+ a `mappend` b = Predicates (reqPreds a <> reqPreds b) (respPreds a <> respPreds b)
408292
409−instance Semigroup Predicates where
410− a <> b = Predicates (requestPredicates a <> requestPredicates b)
411− (responsePredicates a <> responsePredicates b)
412293
413−instance Monoid Predicates where
414− mempty = Predicates mempty mempty
415− mappend = (<>)
416294
417295class JoinPreds a where
418− joinPreds :: a -> Predicates -> Predicates
296+ joinPreds :: a -> Predicates [Text] [Text] -> Predicates [Text] [Text]
419297
420−instance JoinPreds (RequestPredicate ) where
421− joinPreds p (Predicates x y) = Predicates (p <> x) y
298+instance JoinPreds (RequestPredicate Text Bool) where
299+ joinPreds p (Predicates x y) = Predicates (go <> x) y
300+ where go = let p' = first return p
301+ in fmap (\z -> if z then [] else reqPredName p') p'
302+
303+instance JoinPreds (ResponsePredicate Text Bool) where
304+ joinPreds p (Predicates x y) = Predicates x (go <> y)
305+ where go = let p' = first return p
306+ in fmap (\z -> if z then [] else respPredName p') p'
422307
423−instance JoinPreds (ResponsePredicate ) where
424− joinPreds p (Predicates x y) = Predicates x (p <> y)
425308
426309-- | Adds a new predicate (either `ResponsePredicate` or `RequestPredicate`) to
427310-- the existing predicates.
428311--
429312-- > not500 <%> onlyJsonObjects <%> empty
430−--
431−-- /Since 0.0.0.0/
432−(<%>) :: JoinPreds a => a -> Predicates -> Predicates
313+(<%>) :: JoinPreds a => a -> Predicates [Text] [Text] -> Predicates [Text] [Text]
433314(<%>) = joinPreds
434315infixr 6 <%>
435316
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
317+finishPredicates :: Predicates [Text] [Text] -> Request -> Manager -> IO [Text]
318+finishPredicates p req mgr = do
319+ resps <- reqResps (reqPreds p) req mgr
320+ let preds = reqPred (reqPreds p) <> respPreds p
321+ return $ mconcat [respPred preds r | r <- resps ]
443322
444323-- * helpers
445324
@@ -447,15 +326,3 @@ hasValidHeader :: SBS.ByteString -> (SBS.ByteString -> Bool) -> Response b -> Bo
447326hasValidHeader hdr p r = case lookup (mk hdr) (responseHeaders r) of
448327 Nothing -> False
449328 Just v -> p v
450−
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+27−119
@@ -1,50 +1,35 @@
1−{-# LANGUAGE RecordWildCards #-}
2−{-# LANGUAGE CPP #-}
31module Servant.QuickCheck.Internal.QuickCheck where
42
5−import Control.Concurrent (tryReadMVar, newEmptyMVar, tryPutMVar)
6−import Control.Monad (unless)
73import qualified Data.ByteString.Lazy as LBS
84import Data.Proxy (Proxy)
9−import qualified Network.HTTP.Client as C
5+import Data.Text (Text)
6+import Network.HTTP.Client (Manager, Request, checkStatus,
7+ defaultManagerSettings, httpLbs,
8+ newManager)
109import Network.Wai.Handler.Warp (withApplication)
11−import Prelude.Compat
1210import Servant (Context (EmptyContext), HasServer,
1311 Server, serveWithContext)
14−#if MIN_VERSION_servant_server(0,18,0)
15−import Servant (DefaultErrorFormatters, ErrorFormatters, HasContextEntry, type (.++))
16−#endif
1712import Servant.Client (BaseUrl (..), Scheme (..))
1813import System.IO.Unsafe (unsafePerformIO)
1914import Test.Hspec (Expectation, expectationFailure)
20−import Test.QuickCheck (Args (..), Result (..), quickCheckWithResult)
21−import Test.QuickCheck.Monadic (assert, forAllM, monadicIO, monitor,
22− run)
23−import Test.QuickCheck.Property (counterexample)
15+import Test.QuickCheck (Args (..), Result (..),
16+ quickCheckWithResult)
17+import Test.QuickCheck.Monadic (assert, forAllM, monadicIO, run)
2418
25−import Servant.QuickCheck.Internal.Equality
26−import Servant.QuickCheck.Internal.ErrorTypes
2719import Servant.QuickCheck.Internal.HasGenRequest
2820import Servant.QuickCheck.Internal.Predicates
21+import Servant.QuickCheck.Internal.Equality
2922
3023
3124-- | Start a servant application on an open port, run the provided function,
3225-- then stop the application.
33−--
34−-- /Since 0.0.0.0/
3526withServantServer :: HasServer a '[] => Proxy a -> IO (Server a)
3627 -> (BaseUrl -> IO r) -> IO r
3728withServantServer api = withServantServerAndContext api EmptyContext
3829
3930-- | Like 'withServantServer', but allows passing in a 'Context' to the
4031-- 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
4632withServantServerAndContext :: HasServer a ctx
47−#endif
4833 => Proxy a -> Context ctx -> IO (Server a) -> (BaseUrl -> IO r) -> IO r
4934withServantServerAndContext api ctx server t
5035 = withApplication (return . serveWithContext api ctx =<< server) $ \port ->
@@ -61,48 +46,20 @@ withServantServerAndContext api ctx server t
6146--
6247-- Evidently, if the behaviour of the server is expected to be
6348-- 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/
7749serversEqual :: HasGenRequest a =>
7850 Proxy a -> BaseUrl -> BaseUrl -> Args -> ResponseEquality LBS.ByteString -> Expectation
7951serversEqual api burl1 burl2 args req = do
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
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
9157 case r of
9258 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
10059 GaveUp { numTests = n } -> expectationFailure $ "Gave up after " ++ show n ++ " tests"
101− NoExpectedFailure {} -> expectationFailure "No expected failure"
102−#if MIN_VERSION_QuickCheck(2,12,0)
103−#else
104− InsufficientCoverage {} -> expectationFailure "Insufficient coverage"
105−#endif
60+ Failure { output = m } -> expectationFailure $ "Failed:\n" ++ show m
61+ NoExpectedFailure {} -> expectationFailure $ "No expected failure"
62+ InsufficientCoverage {} -> expectationFailure $ "Insufficient coverage"
10663
10764-- | Check that a server satisfies the set of properties specified.
10865--
@@ -121,73 +78,24 @@ serversEqual api burl1 burl2 args req = do
12178-- > <%> onlyJsonObjects
12279-- > <%> notAllowedContainsAllowHeader
12380-- > <%> mempty)
124−--
125−-- /Since 0.0.0.0/
12681serverSatisfies :: (HasGenRequest a) =>
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 ()
147− case r of
148− 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
156− GaveUp { numTests = n } -> expectationFailure $ "Gave up after " ++ show n ++ " tests"
157− NoExpectedFailure {} -> expectationFailure $ "No expected failure"
158−#if MIN_VERSION_QuickCheck(2,12,0)
159−#else
160− InsufficientCoverage {} -> expectationFailure "Insufficient coverage"
161−#endif
162−
163−serverDoesntSatisfy :: (HasGenRequest a) =>
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
82+ Proxy a -> BaseUrl -> Args -> Predicates [Text] [Text] -> Expectation
83+serverSatisfies api burl args preds = do
84+ let reqs = ($ burl) <$> genRequest api
17185 r <- quickCheckWithResult args $ monadicIO $ forAllM reqs $ \req -> do
172− v <- run $ finishPredicates preds (noCheckStatus req) manager
173− assert $ not $ null v
86+ v <- run $ finishPredicates preds (noCheckStatus req) defManager
87+ assert $ null v
17488 case r of
17589 Success {} -> return ()
17690 GaveUp { numTests = n } -> expectationFailure $ "Gave up after " ++ show n ++ " tests"
17791 Failure { output = m } -> expectationFailure $ "Failed:\n" ++ show m
17892 NoExpectedFailure {} -> expectationFailure $ "No expected failure"
179−#if MIN_VERSION_QuickCheck(2,12,0)
180−#else
181− InsufficientCoverage {} -> expectationFailure "Insufficient coverage"
182−#endif
93+ InsufficientCoverage {} -> expectationFailure $ "Insufficient coverage"
94+
18395
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
96+noCheckStatus :: Request -> Request
97+noCheckStatus r = r { checkStatus = \_ _ _ -> Nothing}
19098
191−defManager :: C.Manager
192−defManager = unsafePerformIO $ C.newManager C.defaultManagerSettings
99+defManager :: Manager
100+defManager = unsafePerformIO $ newManager defaultManagerSettings
193101{-# NOINLINE defManager #-}
stack.yaml+30−5
@@ -1,10 +1,35 @@
1−resolver: nightly-2018-09-03
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
25packages:
36- '.'
7+# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
48extra-deps:
5−- hspec-discover-2.5.6
6−- hspec-core-2.5.6
7−- hspec-2.5.6
8−- QuickCheck-2.12
9+- servant-0.7
10+- servant-client-0.7
11+- servant-server-0.7
12+
13+# Override default flag values for local packages and extra-deps
914flags: {}
15+
16+# Extra package databases containing global packages
1017extra-package-dbs: []
18+
19+# Control whether we use the GHC we find on the path
20+# system-ghc: true
21+
22+# Require a specific version of stack, using version ranges
23+# require-stack-version: -any # Default
24+# require-stack-version: >= 1.0.0
25+
26+# Override the architecture used by stack, especially useful on Windows
27+# arch: i386
28+# arch: x86_64
29+
30+# Extra directories used by stack for building
31+# extra-include-dirs: [/path/to/dir]
32+# extra-lib-dirs: [/path/to/dir]
33+
34+# Allow a newer minor version of GHC than the snapshot specifies
35+# compiler-check: newer-minor
test/Doctest.hsnew file+44
@@ -0,0 +1,44 @@
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+17−300
@@ -1,46 +1,24 @@
11{-# LANGUAGE CPP #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
23module Servant.QuickCheck.InternalSpec (spec) where
34
4−
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−
25−
26−import Servant.Test.ComprehensiveAPI (comprehensiveAPIWithoutStreamingOrRaw)
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
2712
2813import Servant.QuickCheck
29−import Servant.QuickCheck.Internal (genRequest, runGenRequest,
30− serverDoesntSatisfy)
14+
15+import Servant.QuickCheck.Internal (genRequest)
3116
3217spec :: Spec
3318spec = do
3419 serversEqualSpec
3520 serverSatisfiesSpec
3621 isComprehensiveSpec
37− onlyJsonObjectSpec
38− notLongerThanSpec
39− queryParamsSpec
40− queryFlagsSpec
41− deepPathSpec
42− htmlDocTypesSpec
43− unbiasedGenerationSpec
4422
4523serversEqualSpec :: Spec
4624serversEqualSpec = describe "serversEqual" $ do
@@ -50,43 +28,6 @@ serversEqualSpec = describe "serversEqual" $ do
5028 withServantServerAndContext api ctx server $ \burl2 -> do
5129 serversEqual api burl1 burl2 args bodyEquality
5230
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−
9031
9132serverSatisfiesSpec :: Spec
9233serverSatisfiesSpec = describe "serverSatisfies" $ do
@@ -99,132 +40,18 @@ serverSatisfiesSpec = describe "serverSatisfies" $ do
9940
10041 it "fails for false predicates" $ do
10142 withServantServerAndContext api ctx server $ \burl -> do
102− serverDoesntSatisfy api burl args (onlyJsonObjects
103− <%> getsHaveCacheControlHeader
104− <%> headsHaveCacheControlHeader
105− <%> notAllowedContainsAllowHeader
106− <%> mempty)
107−
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)
43+ -- Since this is the negation, and we want to check that all of the
44+ -- predicates fail rather than one or more, we need to separate them out
45+ serverSatisfies api burl args ((not <$> onlyJsonObjects) <%> mempty)
46+ serverSatisfies api burl args ((not <$> getsHaveCacheControlHeader) <%> mempty)
14747
14848isComprehensiveSpec :: Spec
14949isComprehensiveSpec = describe "HasGenRequest" $ do
15050
15151 it "has instances for all 'servant' combinators" $ do
152− let _g = genRequest comprehensiveAPIWithoutStreamingOrRaw
52+ let _g = genRequest comprehensiveAPI
15353 True `shouldBe` True -- This is a type-level check
15454
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
22855
22956------------------------------------------------------------------------------
23057-- APIs
@@ -237,17 +64,6 @@ type API = ReqBody '[JSON] String :> Post '[JSON] String
23764api :: Proxy API
23865api = Proxy
23966
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−
25167server :: IO (Server API)
25268server = do
25369 mvar <- newMVar ""
@@ -255,117 +71,18 @@ server = do
25571 :<|> (liftIO $ readMVar mvar >>= return . length)
25672 :<|> (const $ return ())
25773
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−
34174ctx :: Context '[BasicAuthCheck ()]
34275ctx = BasicAuthCheck (const . return $ NoSuchUser) :. EmptyContext
34376------------------------------------------------------------------------------
34477-- Utils
34578------------------------------------------------------------------------------
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−
36279
36380args :: Args
364−args = defaultArgs { maxSuccess = noOfTestCases }
81+args = stdArgs { maxSuccess = noOfTestCases }
36582
36683noOfTestCases :: Int
36784#if LONG_TESTS
36885noOfTestCases = 20000
36986#else
370−noOfTestCases = 1000
87+noOfTestCases = 500
37188#endif