@@ -56,6 +56,12 @@ toFromJSON x = case fromJSON . toJSON $ x of
5656 Error _ -> False
5757 Success x' -> x == x'
5858
59+genericToFromJSON :: (Arbitrary a, Eq a, Data a) => a -> Bool
60+genericToFromJSON x = case G.fromJSON . G.toJSON $ x of
61+ Error _ -> False
62+ Success x' -> x == x'
63+
64+
5965data Foo = Foo {
6066 fooInt :: Int
6167 , fooDouble :: Double
@@ -94,6 +100,20 @@ instance (Ord k, Arbitrary k, Arbitrary v) => Arbitrary (Map.Map k v) where
94100instance Arbitrary Foo where
95101 arbitrary = liftM4 Foo arbitrary arbitrary arbitrary arbitrary
96102
103+
104+{-
105+ Test for Data.Aeson.Generic handling '_' names
106+-}
107+data UFoo = UFoo {
108+ _UFooInt :: Int
109+ , uFooInt :: Int
110+ } deriving (Show, Eq, Data, Typeable)
111+
112+instance Arbitrary UFoo where
113+ arbitrary = UFoo <$> arbitrary <*> arbitrary
114+
115+
116+
97117main :: IO ()
98118main = defaultMain tests
99119
@@ -130,5 +150,8 @@ tests = [
130150 , testProperty "Maybe Integer" (toFromJSON :: Maybe Integer -> Bool)
131151 , testProperty "Either Integer Double" (toFromJSON :: Either Integer Double -> Bool)
132152 , testProperty "Either Integer Integer" (toFromJSON :: Either Integer Integer -> Bool)
153+ ],
154+ testGroup "genericToFromJSON" [
155+ testProperty "_UFoo" (genericToFromJSON :: UFoo -> Bool)
133156 ]
134157 ]