Add tests for long arrays of strings. Bump bytebuild for buffer overflow fix.

Author: andrewthad

json-syntax.cabal

@@ -31,7 +31,7 @@ library
     , array-builder >=0.1 && <0.2
     , array-chunks >=0.1.3 && <0.2
     , base >=4.12 && <5
-    , bytebuild >=0.3.4 && <0.4
+    , bytebuild >=0.3.8 && <0.4
     , byteslice >=0.1.3 && <0.3
     , bytesmith >=0.3.2 && <0.4
     , bytestring >=0.10.8 && <0.11
@@ -52,19 +52,21 @@ test-suite test
     Twitter100
   ghc-options: -Wall -O2
   build-depends:
+    , QuickCheck >=2.14.2
     , aeson
     , array-chunks
     , base >=4.12.0.0 && <5
+    , bytebuild
     , byteslice >=0.1.3
     , bytestring
     , json-syntax
     , neat-interpolation >=0.3.2
     , primitive
     , scientific
     , scientific-notation >=0.1.1
-    , bytebuild
     , tasty >=1.2.3 && <1.3
     , tasty-hunit >=0.10.0.2 && <0.11
+    , tasty-quickcheck >=0.10.1.2 && <0.11
     , text >=1.2
     , text-short
     , unordered-containers

test/Main.hs

@@ -1,11 +1,13 @@
 {-# language LambdaCase #-}
 {-# language OverloadedStrings #-}
+{-# language ScopedTypeVariables #-}
 
 import Control.Monad (when)
 import Data.ByteString.Short.Internal (ShortByteString(SBS))
 import Data.Bytes (Bytes)
 import Data.Primitive (ByteArray(ByteArray))
 import Data.Scientific (Scientific,scientific)
+import Test.QuickCheck ((===))
 import Data.Text.Short (ShortText)
 import Test.Tasty (defaultMain,testGroup,TestTree)
 import Test.Tasty.HUnit ((@=?))
@@ -20,7 +22,9 @@ import qualified Data.Number.Scientific as SCI
 import qualified Data.Text.Short as TS
 import qualified GHC.Exts as Exts
 import qualified Json as J
+import qualified Test.QuickCheck as QC
 import qualified Test.Tasty.HUnit as THU
+import qualified Test.Tasty.QuickCheck as TQC
 
 main :: IO ()
 main = defaultMain tests
@@ -77,6 +81,26 @@ tests = testGroup "Tests"
       BChunks.concat (Builder.run 1 (J.encode (J.String "Hello\nWorld")))
       @=?
       Bytes.fromLatinString "\"Hello\\nWorld\""
+  , TQC.testProperty "M" $ QC.forAll (jsonFromPrintableStrings <$> QC.vectorOf 10 QC.arbitrary) $ \val0 -> do
+      let enc = BChunks.concat (Builder.run 128 (J.encode val0))
+      case J.decode enc of
+        Left _ -> QC.property False
+        Right val1 -> val0 === val1
+  , TQC.testProperty "N" $ QC.forAll (jsonFromPrintableStrings <$> QC.vectorOf 400 QC.arbitrary) $ \val0 -> do
+      let enc = BChunks.concat (Builder.run 128 (J.encode val0))
+      case J.decode enc of
+        Left e -> QC.counterexample (show e) False
+        Right val1 -> val0 === val1
+  , TQC.testProperty "O" $ QC.forAll (jsonFromAsciiStrings <$> QC.vectorOf 10 QC.arbitrary) $ \val0 -> do
+      let enc = BChunks.concat (Builder.run 128 (J.encode val0))
+      case J.decode enc of
+        Left _ -> QC.property False
+        Right val1 -> val0 === val1
+  , TQC.testProperty "P" $ QC.forAll (jsonFromAsciiStrings <$> QC.vectorOf 400 QC.arbitrary) $ \val0 -> do
+      let enc = BChunks.concat (Builder.run 128 (J.encode val0))
+      case J.decode enc of
+        Left e -> QC.counterexample (show e) False
+        Right val1 -> val0 === val1
   , THU.testCase "Twitter100" $
       case J.decode (Bytes.fromByteArray encodedTwitter100) of
         Left _ -> fail "nope"
@@ -91,6 +115,12 @@ tests = testGroup "Tests"
           Right j' -> when (j /= j') (fail "document was not the same after roundtrip")
   ]
 
+jsonFromPrintableStrings :: [QC.PrintableString] -> J.Value
+jsonFromPrintableStrings xs = J.Array (Exts.fromList (map (J.String . TS.pack . QC.getPrintableString) xs))
+
+jsonFromAsciiStrings :: [QC.ASCIIString] -> J.Value
+jsonFromAsciiStrings xs = J.Array (Exts.fromList (map (J.String . TS.pack . QC.getASCIIString) xs))
+
 toBadSci :: SCI.Scientific -> Scientific
 toBadSci = SCI.withExposed
   (\a b -> scientific (fromIntegral a) b)