@@ -30,6 +30,7 @@ import Test.Framework (Test, testGroup)
30import Test.Framework.Providers.QuickCheck2 (testProperty)
30import Test.Framework.Providers.QuickCheck2 (testProperty)
31import Test.QuickCheck hiding ((.&.))
31import Test.QuickCheck hiding ((.&.))
32import Test.QuickCheck.Monadic
32import Test.QuickCheck.Monadic
33+import Test.QuickCheck.Property (Property(..))
33import Tests.QuickCheckUtils
34import Tests.QuickCheckUtils
34import Tests.Utils
35import Tests.Utils
35import Text.Show.Functions ()
36import Text.Show.Functions ()
@@ -125,9 +126,9 @@ t_utf8_err bad de = do
125 Leading -> B.append <$> genInvalidUTF8 <*> genUTF8
126 Leading -> B.append <$> genInvalidUTF8 <*> genUTF8
126 Trailing -> B.append <$> genUTF8 <*> genInvalidUTF8
127 Trailing -> B.append <$> genUTF8 <*> genInvalidUTF8
127 genUTF8 = E.encodeUtf8 <$> genUnicode
128 genUTF8 = E.encodeUtf8 <$> genUnicode
128− forAll gen $ \bs -> do
129+ forAll gen $ \bs -> MkProperty $ do
129 onErr <- genDecodeErr de
130 onErr <- genDecodeErr de
130− monadicIO $ do
131+ unProperty . monadicIO $ do
131 l <- run $ let len = T.length (E.decodeUtf8With onErr bs)
132 l <- run $ let len = T.length (E.decodeUtf8With onErr bs)
132 in (len `seq` return (Right len)) `Exception.catch`
133 in (len `seq` return (Right len)) `Exception.catch`
133 (\(e::UnicodeException) -> return (Left e))
134 (\(e::UnicodeException) -> return (Left e))