@@ -96,7 +96,7 @@ caseParseHttpAccept = do
96 expected = ["text/html", "text/x-c", "text/x-dvi", "text/plain"]
96 expected = ["text/html", "text/x-c", "text/x-dvi", "text/plain"]
97 expected @=? parseHttpAccept input
97 expected @=? parseHttpAccept input
99−parseRequestBody' :: Sink ([S8.ByteString] -> [S8.ByteString]) L.ByteString
99+parseRequestBody' :: BackEnd L.ByteString
100 -> SRequest
100 -> SRequest
101 -> C.ResourceT IO ([(S.ByteString, S.ByteString)], [(S.ByteString, FileInfo L.ByteString)])
101 -> C.ResourceT IO ([(S.ByteString, S.ByteString)], [(S.ByteString, FileInfo L.ByteString)])
102parseRequestBody' sink (SRequest req bod) =
102parseRequestBody' sink (SRequest req bod) =
@@ -126,13 +126,13 @@ caseParseRequestBody =
127 let content1 = "foo=bar&baz=bin"
127 let content1 = "foo=bar&baz=bin"
128 let ctype1 = "application/x-www-form-urlencoded"
128 let ctype1 = "application/x-www-form-urlencoded"
129− result1 <- parseRequestBody' lbsSink $ toRequest ctype1 content1
129+ result1 <- parseRequestBody' lbsBackEnd $ toRequest ctype1 content1
130 liftIO $ assertEqual "parsing post x-www-form-urlencoded"
130 liftIO $ assertEqual "parsing post x-www-form-urlencoded"
131 (map (S8.pack *** S8.pack) [("foo", "bar"), ("baz", "bin")], [])
131 (map (S8.pack *** S8.pack) [("foo", "bar"), ("baz", "bin")], [])
134 let ctype2 = "multipart/form-data; boundary=AaB03x"
134 let ctype2 = "multipart/form-data; boundary=AaB03x"
135− result2 <- parseRequestBody' lbsSink $ toRequest ctype2 content2
135+ result2 <- parseRequestBody' lbsBackEnd $ toRequest ctype2 content2
136 let expectedsmap2 =
136 let expectedsmap2 =
137 [ ("title", "A File")
137 [ ("title", "A File")
138 , ("summary", "This is my file\nfile test")
138 , ("summary", "This is my file\nfile test")
@@ -147,7 +147,7 @@ caseParseRequestBody =
149 let ctype3 = "multipart/form-data; boundary=----WebKitFormBoundaryB1pWXPZ6lNr8RiLh"
149 let ctype3 = "multipart/form-data; boundary=----WebKitFormBoundaryB1pWXPZ6lNr8RiLh"
150− result3 <- parseRequestBody' lbsSink $ toRequest ctype3 content3
150+ result3 <- parseRequestBody' lbsBackEnd $ toRequest ctype3 content3
151 let expectedsmap3 = []
151 let expectedsmap3 = []
152 let expectedfile3 = [(S8.pack "yaml", FileInfo (S8.pack "README") (S8.pack "application/octet-stream") $
152 let expectedfile3 = [(S8.pack "yaml", FileInfo (S8.pack "README") (S8.pack "application/octet-stream") $
153 L8.pack "Photo blog using Hack.\n")]
153 L8.pack "Photo blog using Hack.\n")]
@@ -156,12 +156,12 @@ caseParseRequestBody =
156 expected3
156 expected3
159− result2' <- parseRequestBody' lbsSink $ toRequest' ctype2 content2
159+ result2' <- parseRequestBody' lbsBackEnd $ toRequest' ctype2 content2
160 liftIO $ assertEqual "parsing post multipart/form-data 2"
160 liftIO $ assertEqual "parsing post multipart/form-data 2"
161 expected2
161 expected2
164− result3' <- parseRequestBody' lbsSink $ toRequest' ctype3 content3
164+ result3' <- parseRequestBody' lbsBackEnd $ toRequest' ctype3 content3
165 liftIO $ assertEqual "parsing actual post multipart/form-data 2"
165 liftIO $ assertEqual "parsing actual post multipart/form-data 2"
166 expected3
166 expected3
@@ -400,7 +400,7 @@ caseDalvikMultipart = do
400 { requestHeaders = headers
400 { requestHeaders = headers
402 (params, files) <- C.runResourceT $ sourceFile "test/requests/dalvik-request"
402 (params, files) <- C.runResourceT $ sourceFile "test/requests/dalvik-request"
403− C.$$ parseRequestBody lbsSink request'
403+ C.$$ parseRequestBody lbsBackEnd request'
404 lookup "scannedTime" params @?= Just "1.298590056748E9"
404 lookup "scannedTime" params @?= Just "1.298590056748E9"
405 lookup "geoLong" params @?= Just "0"
405 lookup "geoLong" params @?= Just "0"
406 lookup "geoLat" params @?= Just "0"
406 lookup "geoLat" params @?= Just "0"