Fix & update tests

Author: garyb

bower.json

@@ -33,6 +33,6 @@
     "purescript-maps": "^3.0.0"
   },
   "devDependencies": {
-    "purescript-strongcheck": "^3.0.0"
+    "purescript-strongcheck": "^3.1.0"
   }
 }

src/Data/Argonaut/Gen.purs

@@ -1,4 +1,4 @@
-module Test.StrongCheck.Data.Argonaut where
+module Data.Argonaut.Gen where
 
 import Prelude
 
@@ -15,16 +15,15 @@ import Data.String as S
 import Data.StrMap as SM
 
 genJson :: forall m. MonadGen m => MonadRec m => Lazy (m J.Json) => m J.Json
-genJson = Gen.sized genJson'
+genJson = Gen.resize (min 10) $ Gen.sized genJson'
   where
   genJson' :: Int -> m J.Json
   genJson' size
-    | size > 3 =
-        genJson' 3
-    | size > 0 =
-        Gen.resize (_ - 1) (Gen.choose genJArray genJObject)
-    | otherwise =
-        Gen.oneOf $ pure J.jsonNull :| [ genJBoolean, genJNumber, genJString]
+    | size > 1 = Gen.resize (_ - 1) (Gen.choose genJArray genJObject)
+    | otherwise = genLeaf
+
+  genLeaf :: m J.Json
+  genLeaf = Gen.oneOf $ pure J.jsonNull :| [ genJBoolean, genJNumber, genJString]
 
   genJArray :: m J.Json
   genJArray = J.fromArray <$> Gen.unfoldable (defer \_ -> genJson)

test/Test/Main.purs

@@ -4,19 +4,21 @@ import Prelude
 
 import Control.Monad.Eff.Console (log)
 
-import Data.Argonaut.Core (Json, JNull, toObject, toArray, toString, toNumber, toBoolean, toNull, fromObject, foldJsonObject, fromNumber, fromArray, foldJsonArray, fromString, foldJsonString, foldJsonNumber, fromBoolean, foldJsonBoolean, fromNull, foldJsonNull, foldJson, isObject, isArray, isString, isNumber, isBoolean, isNull)
+import Data.Argonaut.Core (Json, JNull, toObject, toArray, toString, toNumber, toBoolean, toNull, fromObject, foldJsonObject, fromNumber, fromArray, foldJsonArray, fromString, foldJsonString, foldJsonNumber, fromBoolean, foldJsonBoolean, fromNull, foldJsonNull, foldJson, isObject, isArray, isString, isNumber, isBoolean, isNull, stringify)
 import Data.Argonaut.Parser (jsonParser)
-import Data.Argonaut.Printer (printJson)
+import Data.Argonaut.Gen (genJson)
 import Data.Array as A
-import Data.Either (isLeft, isRight, Either(..))
-import Data.Foldable (for_)
+import Data.Either (isLeft, Either(..))
 import Data.Maybe (Maybe(..), fromJust)
 import Data.StrMap as M
 import Data.Tuple (Tuple(..))
 
+import Control.Monad.Gen as Gen
+
 import Partial.Unsafe (unsafePartial)
 
-import Test.StrongCheck (SC, assert, (<?>), quickCheck, Result())
+import Test.StrongCheck (SC, (===), (<?>), assert, quickCheck, quickCheck', Result)
+import Test.StrongCheck.Gen (Gen)
 
 foreign import thisIsNull :: Json
 foreign import thisIsBoolean :: Json
@@ -122,15 +124,13 @@ toTest = do
 
 parserTest :: SC () Unit
 parserTest = do
-  assert ((isRight (jsonParser "{\"foo\": 1}")) <?> "Error in jsonParser")
   assert ((isLeft (jsonParser "\\\ffff")) <?> "Error in jsonParser")
-
-printJsonTest :: SC () Unit
-printJsonTest = do
-  for_ cases (assert <<< assertion)
+  quickCheck' 10 roundtripTest
   where
-  assertion :: Json -> Result
-  assertion j = ((jsonParser (printJson j)) == Right j) <?> "Error in printJson"
+  roundtripTest :: Gen Result
+  roundtripTest = do
+    json <- Gen.resize (const 5) genJson
+    pure $ jsonParser (stringify json) === Right json
 
 main :: SC () Unit
 main = do
@@ -146,5 +146,3 @@ main = do
   toTest
   log "jsonParser tests"
   parserTest
-  log "printJson tests"
-  printJsonTest