If the position of an erroneous character is detected, verify that it…

… is detected at the correct location.
cardano-foundation · May 21, 2019 · 501f515 · 501f515
1 parent e1326f8
commit 501f515
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/lib/bech32/src/Codec/Binary/Bech32/Internal.hs b/lib/bech32/src/Codec/Binary/Bech32/Internal.hs
@@ -48,10 +48,11 @@ module Codec.Binary.Bech32.Internal
     , noPadding
     , yesPadding
 
-      -- * Character Set Manipulation
+      -- * Character Manipulation
+    , CharPosition (..)
     , charset
-    , word5ToChar
     , charToWord5
+    , word5ToChar
 
     ) where
 

diff --git a/lib/bech32/test/Codec/Binary/Bech32Spec.hs b/lib/bech32/test/Codec/Binary/Bech32Spec.hs
@@ -12,7 +12,12 @@ module Codec.Binary.Bech32Spec
 import Prelude
 
 import Codec.Binary.Bech32.Internal
-    ( HumanReadablePart, humanReadablePartToBytes, mkHumanReadablePart )
+    ( CharPosition (..)
+    , DecodingError (..)
+    , HumanReadablePart
+    , humanReadablePartToBytes
+    , mkHumanReadablePart
+    )
 import Control.Monad
     ( forM_ )
 import Data.Bits
@@ -42,6 +47,7 @@ import Test.QuickCheck
     , property
     , vectorOf
     , (.&&.)
+    , (.||.)
     , (===)
     , (==>)
     )
@@ -154,9 +160,15 @@ spec = do
                 return $
                     index /= separatorIndex ==>
                     recombinedString /= validString ==>
-                        (BS.length recombinedString === BS.length validString)
-                        .&&.
-                        (Bech32.decode recombinedString `shouldSatisfy` isLeft)
+                    BS.length recombinedString == BS.length validString ==> (
+                        -- error location detection is best effort:
+                        (Bech32.decode recombinedString `shouldBe`
+                            Left (StringToDecodeContainsInvalidChars
+                                [CharPosition index]))
+                         .||.
+                        (Bech32.decode recombinedString `shouldBe`
+                            Left (StringToDecodeContainsInvalidChars []))
+                    )
 
         it "Decoding fails for an upper-case string with a lower-case \
            \character." $