From 59a3c549a8180523e35e1dd53af8627eb5731c67 Mon Sep 17 00:00:00 2001 From: Sam Truzjan Date: Fri, 29 Nov 2013 12:26:17 +0400 Subject: Follow error handling changes in tests --- tests/Data/ByteString/Base32/HexSpec.hs | 5 ++--- tests/Data/ByteString/Base32Spec.hs | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/Data/ByteString/Base32/HexSpec.hs b/tests/Data/ByteString/Base32/HexSpec.hs index 7cddb69..9b2e730 100644 --- a/tests/Data/ByteString/Base32/HexSpec.hs +++ b/tests/Data/ByteString/Base32/HexSpec.hs @@ -3,7 +3,6 @@ module Data.ByteString.Base32.HexSpec ( spec ) where import Control.Applicative -import Control.Exception import Data.ByteString as BS import Data.ByteString.Char8 as BC import Data.ByteString.Base32.Hex @@ -44,8 +43,8 @@ spec = do decode (BC.map toLower (encode bs)) == Right bs it "fail gracefully if encoded data contains non alphabet chars" $ do - evaluate (decode "#=======") `shouldThrow` anyErrorCall - evaluate (decode "AAAAAAAA#=======") `shouldThrow` anyErrorCall + decode "#=======" `shouldBe` Left "'#' is not base32 character" + decode "AAAAAAAA#=======" `shouldBe` Left "'#' is not base32 character" describe "decodeLenient" $ do it "conform RFC examples" $ do diff --git a/tests/Data/ByteString/Base32Spec.hs b/tests/Data/ByteString/Base32Spec.hs index 4cec8f9..6bd7545 100644 --- a/tests/Data/ByteString/Base32Spec.hs +++ b/tests/Data/ByteString/Base32Spec.hs @@ -3,7 +3,6 @@ module Data.ByteString.Base32Spec (spec) where import Control.Applicative -import Control.Exception import Data.ByteString as BS import Data.ByteString.Char8 as BC import Data.ByteString.Base32 as Base32 @@ -50,8 +49,8 @@ spec = do decode (BC.map toLower (encode bs)) == Right bs it "fail gracefully if encoded data contains non alphabet chars" $ do - evaluate (decode "0=======") `shouldThrow` anyErrorCall - evaluate (decode "AAAAAAAA0=======") `shouldThrow` anyErrorCall + decode "0=======" `shouldBe` Left "'0' is not base32 character" + decode "AAAAAAAA0=======" `shouldBe` Left "'0' is not base32 character" describe "decodeLenient" $ do it "conform RFC examples" $ do -- cgit v1.2.3