@@ -4,6 +4,7 @@
44{-# LANGUAGE FlexibleContexts #-}
55{-# LANGUAGE MultiParamTypeClasses #-}
66{-# LANGUAGE OverloadedStrings #-}
7+{-# LANGUAGE TupleSections #-}
78{-# LANGUAGE TypeOperators #-}
89{-# LANGUAGE TypeSynonymInstances #-}
910{-# OPTIONS_GHC -fno-warn-orphans #-}
@@ -49,14 +50,18 @@ spec = describe "Servant.Docs" $ do
4950 (toSample (Proxy :: Proxy (TT, UT))) `shouldBe` Just (TT1,UT1)
5051 (toSample (Proxy :: Proxy (TT, UT, UT))) `shouldBe` Just (TT1,UT1,UT1)
5152 (toSamples (Proxy :: Proxy (TT, UT))) `shouldBe`
52− [ ("(eins, yks)",(TT1,UT1)), ("(eins, kaks)",(TT1,UT2))
53− , ("(zwei, yks)",(TT2,UT1)), ("(zwei, kaks)",(TT2,UT2))
53+ [ ("eins, yks",(TT1,UT1)), ("eins, kaks",(TT1,UT2))
54+ , ("zwei, yks",(TT2,UT1)), ("zwei, kaks",(TT2,UT2))
5455 ]
5556 (toSamples (Proxy :: Proxy (TT, UT, UT))) `shouldBe`
56− [ ("(eins, yks, yks)",(TT1,UT1,UT1)), ("(eins, yks, kaks)",(TT1,UT1,UT2))
57− , ("(eins, kaks, yks)",(TT1,UT2,UT1)), ("(eins, kaks, kaks)",(TT1,UT2,UT2))
58− , ("(zwei, yks, yks)",(TT2,UT1,UT1)), ("(zwei, yks, kaks)",(TT2,UT1,UT2))
59− , ("(zwei, kaks, yks)",(TT2,UT2,UT1)), ("(zwei, kaks, kaks)",(TT2,UT2,UT2))
57+ [ ("eins, yks, yks",(TT1,UT1,UT1))
58+ , ("eins, yks, kaks",(TT1,UT1,UT2))
59+ , ("zwei, yks, yks",(TT2,UT1,UT1))
60+ , ("eins, kaks, yks",(TT1,UT2,UT1))
61+ , ("zwei, yks, kaks",(TT2,UT1,UT2))
62+ , ("eins, kaks, kaks",(TT1,UT2,UT2))
63+ , ("zwei, kaks, yks",(TT2,UT2,UT1))
64+ , ("zwei, kaks, kaks",(TT2,UT2,UT2))
6065 ]
6166
6267 where
@@ -87,13 +92,13 @@ data Datatype1 = Datatype1 { dt1field1 :: String
8792instance ToJSON Datatype1
8893
8994instance ToSample Datatype1 Datatype1 where
90− toSample _ = Just $ Datatype1 "field 1" 13
95+ toSamples _ = singleSample $ Datatype1 "field 1" 13
9196
92−instance ToSample String String where
93− toSample _ = Just "a string"
97+instance ToSample Char Char where
98+ toSamples _ = map ("",) ['a'..'z']
9499
95100instance ToSample Int Int where
96− toSample _ = Just 17
101+ toSamples _ = singleSample 17
97102
98103instance MimeRender PlainText Int where
99104 mimeRender _ = cs . show
@@ -105,9 +110,7 @@ data TT = TT1 | TT2 deriving (Show, Eq)
105110data UT = UT1 | UT2 deriving (Show, Eq)
106111
107112instance ToSample TT TT where
108− toSample _ = Just TT1
109113 toSamples _ = [("eins", TT1), ("zwei", TT2)]
110114
111115instance ToSample UT UT where
112− toSample _ = Just UT1
113116 toSamples _ = [("yks", UT1), ("kaks", UT2)]