Skip to content

Commit c6cc715

Browse files
chris-martinchris-martin
committed
switch to hspec
1 parent aa2d597 commit c6cc715

File tree

8 files changed

+200
-173
lines changed

8 files changed

+200
-173
lines changed

‎ascii-group/ascii-group.cabal

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22

33
name: ascii-group
4-
version: 1.0.0.16
4+
version: 1.0.0.17
55
synopsis: ASCII character groups
66
category: Data, Text
77

@@ -17,14 +17,10 @@ author: Chris Martin
1717
maintainer: Chris Martin, Julie Moronuki
1818

1919
homepage: https://github.com/typeclasses/ascii-group
20-
bug-Reports: https://github.com/typeclasses/ascii-group/issues
20+
bug-reports: https://github.com/typeclasses/ascii-group/issues
2121

2222
extra-source-files: *.md
2323

24-
source-repository head
25-
type: git
26-
location: git://github.com/typeclasses/ascii-group.git
27-
2824
common base
2925
default-language: GHC2021
3026
ghc-options: -Wall
@@ -34,7 +30,7 @@ common base
3430

3531
build-depends:
3632
, ascii-char ^>= 1.0
37-
, base ^>= 4.16 || ^>= 4.17 || ^>= 4.18
33+
, base ^>= 4.16 || ^>= 4.17 || ^>= 4.18 || ^>= 4.19
3834

3935
library
4036
import: base
@@ -48,7 +44,7 @@ library
4844
StandaloneDeriving
4945

5046
build-depends:
51-
, hashable ^>= 1.4.2
47+
, hashable ^>= 1.4.0
5248

5349
exposed-modules:
5450
ASCII.Group
@@ -61,7 +57,7 @@ test-suite test-ascii-group
6157

6258
build-depends:
6359
, ascii-group
64-
, hedgehog ^>= 1.1.2 || ^>= 1.2
60+
, hspec ^>= 2.10 || ^>= 2.11
6561

6662
default-extensions:
6763
OverloadedStrings

‎ascii-group/changelog.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### 1.0.0.17 (2023-12-31)
2+
3+
Change test-suite to `hspec`
4+
15
### 1.0.0.16 (2023-06-26)
26

37
Raise language to GHC2021

‎ascii-group/license.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2021 Mission Valley Software LLC
1+
Copyright 2021 Chris Martin
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

‎ascii-group/test/Main.hs

+24-77
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,39 @@
11
module Main (main) where
22

3-
import ASCII.Char (Char (..), allCharacters)
43
import ASCII.Group
5-
import Control.Monad (Monad (..), when)
6-
import Data.Bool (not)
4+
5+
import Test.Hspec
6+
7+
import ASCII.Char (Char (..), allCharacters)
8+
import Data.Bool (Bool(..))
79
import Data.Foldable (all)
810
import Data.Function (($))
911
import Data.List (filter, length)
10-
import Hedgehog
11-
( Property,
12-
assert,
13-
checkParallel,
14-
discover,
15-
property,
16-
withTests,
17-
(===),
18-
)
19-
import System.Exit (exitFailure)
2012
import System.IO (IO)
2113

2214
main :: IO ()
23-
main = checkParallel $$(discover) >>= \ok -> when (not ok) exitFailure
24-
25-
prop_letter :: Property
26-
prop_letter =
27-
withTests 1 $
28-
property $
29-
charGroup CapitalLetterA === Printable
30-
31-
prop_control :: Property
32-
prop_control =
33-
withTests 1 $
34-
property $
35-
charGroup EndOfTransmission === Control
36-
37-
prop_not_printable :: Property
38-
prop_not_printable =
39-
withTests 1 $
40-
property $
41-
assert $
42-
not $
43-
inGroup Printable EndOfTransmission
44-
45-
prop_is_control :: Property
46-
prop_is_control =
47-
withTests 1 $
48-
property $
49-
assert $
50-
inGroup Control EndOfTransmission
15+
main = hspec $ do
16+
it "" $ charGroup CapitalLetterA `shouldBe` Printable
17+
it "" $ charGroup EndOfTransmission `shouldBe` Control
18+
it "" $ inGroup Printable EndOfTransmission `shouldBe` False
19+
it "" $ inGroup Control EndOfTransmission `shouldBe` True
5120

52-
-- It is perhaps surprising that space is considered a
53-
-- "printable" character, since it does not visibly appear.
54-
prop_space_is_printable :: Property
55-
prop_space_is_printable =
56-
withTests 1 $
57-
property $
58-
charGroup Space === Printable
21+
it "It is perhaps surprising that space is considered a\
22+
\ \"printable\" character, since it does not visibly appear." $
23+
charGroup Space `shouldBe` Printable
5924

60-
-- It is perhaps surprising that horizontal tab is not
61-
-- in the same category as space.
62-
prop_horizontal_tab_is_control :: Property
63-
prop_horizontal_tab_is_control =
64-
withTests 1 $
65-
property $
66-
charGroup HorizontalTab === Control
25+
it "It is perhaps surprising that horizontal tab is not\
26+
\ in the same category as space." $
27+
charGroup HorizontalTab `shouldBe` Control
6728

68-
prop_various_printables :: Property
69-
prop_various_printables =
70-
withTests 1 $
71-
property $
72-
assert $
73-
all (inGroup Printable) [CapitalLetterA, SmallLetterZ, Digit4, Tilde]
29+
it "" $
30+
all (inGroup Printable) [CapitalLetterA, SmallLetterZ, Digit4, Tilde]
31+
`shouldBe` True
7432

75-
prop_various_controls :: Property
76-
prop_various_controls =
77-
withTests 1 $
78-
property $
79-
assert $
80-
all (inGroup Control) [Null, Substitute, UnitSeparator, Delete]
33+
it "" $
34+
all (inGroup Control) [Null, Substitute, UnitSeparator, Delete]
35+
`shouldBe` True
8136

82-
prop_count_printables :: Property
83-
prop_count_printables =
84-
withTests 1 $
85-
property $
86-
length (filter (inGroup Printable) allCharacters) === 95
37+
it "" $ length (filter (inGroup Printable) allCharacters) `shouldBe` 95
8738

88-
prop_count_controls :: Property
89-
prop_count_controls =
90-
withTests 1 $
91-
property $
92-
length (filter (inGroup Control) allCharacters) === 33
39+
it "" $ length (filter (inGroup Control) allCharacters) `shouldBe` 33

‎flake.lock

+59-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)