@@ -1,6 +1,7 @@
11{-# LANGUAGE OverloadedStrings #-}
2−import Test.Framework (defaultMain, testGroup, Test)
3−import Test.Framework.Providers.HUnit
2+import Test.Hspec
3+import Test.Hspec.QuickCheck
4+import Test.Hspec.HUnit ()
45import Test.HUnit hiding (Test)
56
67import Network.Wai
@@ -29,30 +30,28 @@ import Data.Maybe (fromMaybe)
2930import Network.HTTP.Types (parseSimpleQuery, status200)
3031
3132main :: IO ()
32−main = defaultMain [testSuite]
33−
34−testSuite :: Test
35−testSuite = testGroup "Network.Wai.Parse"
36− [ testCase "parseQueryString" caseParseQueryString
37− , testCase "parseQueryString with question mark" caseParseQueryStringQM
38− , testCase "parseHttpAccept" caseParseHttpAccept
39− , testCase "parseRequestBody" caseParseRequestBody
33+main = hspecX $ do
34+ describe "Network.Wai.Parse"
35+ [ it "parseQueryString" caseParseQueryString
36+ , it "parseQueryString with question mark" caseParseQueryStringQM
37+ , it "parseHttpAccept" caseParseHttpAccept
38+ , it "parseRequestBody" caseParseRequestBody
4039 {-
41− , testCase "findBound" caseFindBound
42− , testCase "sinkTillBound" caseSinkTillBound
43− , testCase "killCR" caseKillCR
44− , testCase "killCRLF" caseKillCRLF
45− , testCase "takeLine" caseTakeLine
40+ , it "findBound" caseFindBound
41+ , it "sinkTillBound" caseSinkTillBound
42+ , it "killCR" caseKillCR
43+ , it "killCRLF" caseKillCRLF
44+ , it "takeLine" caseTakeLine
4645 -}
47− , testCase "jsonp" caseJsonp
48− , testCase "gzip" caseGzip
49− , testCase "gzip not for MSIE" caseGzipMSIE
50− , testCase "vhost" caseVhost
51− , testCase "autohead" caseAutohead
52− , testCase "method override" caseMethodOverride
53− , testCase "accept override" caseAcceptOverride
54− , testCase "dalvik multipart" caseDalvikMultipart
55− , testCase "debug request body" caseDebugRequestBody
46+ , it "jsonp" caseJsonp
47+ , it "gzip" caseGzip
48+ , it "gzip not for MSIE" caseGzipMSIE
49+ , it "vhost" caseVhost
50+ , it "autohead" caseAutohead
51+ , it "method override" caseMethodOverride
52+ , it "accept override" caseAcceptOverride
53+ , it "dalvik multipart" caseDalvikMultipart
54+ , it "debug request body" caseDebugRequestBody
5655 ]
5756
5857caseParseQueryString :: Assertion