Skip to content

Commit 51e6e98

Browse files
garybgaryb
committed
Update tests for NonEmptyString reflection
1 parent f550204 commit 51e6e98

File tree

8 files changed

+96
-88
lines changed

8 files changed

+96
-88
lines changed

‎test/URI/AbsoluteURI.purs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ import Prelude
44

55
import Data.Either (Either(..))
66
import Data.Maybe (Maybe(..))
7+
import Data.String.NonEmpty (nes)
8+
import Data.Symbol (SProxy(..))
79
import Data.These (These(..))
810
import Data.Tuple (Tuple(..))
911
import Test.Spec (Spec, describe)
10-
import Test.Util (nes, testIso)
12+
import Test.Util (testIso)
1113
import URI.AbsoluteURI (Authority(..), HierPath, HierarchicalPart(..), Host(..), Path(..), PathAbsolute(..), PathRootless(..), Port, Query, AbsoluteURI(..), AbsoluteURIOptions, UserInfo)
1214
import URI.AbsoluteURI as AbsoluteURI
1315
import URI.Host.RegName as RegName
@@ -30,7 +32,7 @@ spec =
3032
(HierarchicalPartAuth
3133
(Authority
3234
Nothing
33-
(Just (This (NameAddress (RegName.unsafeFromString $ nes "localhost")))))
35+
(Just (This (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "localhost"))))))
3436
(path ["testBucket"]))
3537
(Just (Query.unsafeFromString "password=&docTypeKey=")))
3638
testIso
@@ -42,7 +44,7 @@ spec =
4244
(HierarchicalPartAuth
4345
(Authority
4446
Nothing
45-
(Just (Both (NameAddress (RegName.unsafeFromString $ nes "localhost")) (Port.unsafeFromInt 9999))))
47+
(Just (Both (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "localhost"))) (Port.unsafeFromInt 9999))))
4648
(path ["testBucket"]))
4749
(Just (Query.unsafeFromString "password=pass&docTypeKey=type&queryTimeoutSeconds=20")))
4850
testIso
@@ -52,7 +54,7 @@ spec =
5254
(AbsoluteURI
5355
(Scheme.unsafeFromString "foo")
5456
(HierarchicalPartNoAuth
55-
(Just (Left (PathAbsolute (Just (Tuple (PathSegment.unsafeSegmentNZFromString $ nes "abc") [PathSegment.unsafeSegmentFromString "def"]))))))
57+
(Just (Left (PathAbsolute (Just (Tuple (PathSegment.unsafeSegmentNZFromString $ nes (SProxy :: SProxy "abc")) [PathSegment.unsafeSegmentFromString "def"]))))))
5658
Nothing)
5759
testIso
5860
(AbsoluteURI.parser options)
@@ -61,7 +63,7 @@ spec =
6163
(AbsoluteURI
6264
(Scheme.unsafeFromString "foo")
6365
(HierarchicalPartNoAuth
64-
(Just (Right (PathRootless (Tuple (PathSegment.unsafeSegmentNZFromString $ nes "abc") [PathSegment.unsafeSegmentFromString "def"])))))
66+
(Just (Right (PathRootless (Tuple (PathSegment.unsafeSegmentNZFromString $ nes (SProxy :: SProxy "abc")) [PathSegment.unsafeSegmentFromString "def"])))))
6567
Nothing)
6668

6769
path ∷ Array String → Path

‎test/URI/Authority.purs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ module Test.URI.Authority where
33
import Prelude
44

55
import Data.Maybe (Maybe(..))
6+
import Data.String.NonEmpty (nes)
7+
import Data.Symbol (SProxy(..))
68
import Data.These (These(..))
79
import Test.Spec (Spec, describe)
8-
import Test.Util (nes, testIso)
10+
import Test.Util (testIso)
911
import URI.Authority (Authority(..), AuthorityOptions, Host(..), Port, UserInfo)
1012
import URI.Authority as Authority
1113
import URI.Host.RegName as RegName
@@ -23,21 +25,21 @@ spec =
2325
"//localhost"
2426
(Authority
2527
Nothing
26-
(Just (This (NameAddress (RegName.unsafeFromString (nes "localhost"))))))
28+
(Just (This (NameAddress (RegName.unsafeFromString (nes (SProxy :: SProxy "localhost")))))))
2729
testIso
2830
(Authority.parser options)
2931
(Authority.print options)
3032
"//localhost:3000"
3133
(Authority
3234
Nothing
33-
(Just (Both (NameAddress (RegName.unsafeFromString (nes "localhost"))) (Port.unsafeFromInt 3000))))
35+
(Just (Both (NameAddress (RegName.unsafeFromString (nes (SProxy :: SProxy "localhost")))) (Port.unsafeFromInt 3000))))
3436
testIso
3537
(Authority.parser options)
3638
(Authority.print options)
3739
"//user@localhost:3000"
3840
(Authority
39-
(Just (UserInfo.unsafeFromString (nes "user")))
40-
(Just (Both (NameAddress (RegName.unsafeFromString (nes "localhost"))) (Port.unsafeFromInt 3000))))
41+
(Just (UserInfo.unsafeFromString (nes (SProxy :: SProxy "user"))))
42+
(Just (Both (NameAddress (RegName.unsafeFromString (nes (SProxy :: SProxy "localhost")))) (Port.unsafeFromInt 3000))))
4143
testIso
4244
(Authority.parser options)
4345
(Authority.print options)

‎test/URI/Extra/MultiHostPortPair.purs‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ import Prelude
44

55
import Data.Either (Either(..))
66
import Data.Maybe (Maybe(..))
7+
import Data.String.NonEmpty (nes)
8+
import Data.Symbol (SProxy(..))
79
import Data.These (These(..))
810
import Test.Spec (Spec, describe)
9-
import Test.Util (nes, testIso)
11+
import Test.Util (testIso)
1012
import URI.Authority (Authority(..), Host(..), Port, UserInfo)
1113
import URI.Authority as Authority
1214
import URI.Extra.MultiHostPortPair (MultiHostPortPair)
@@ -30,35 +32,35 @@ spec = do
3032
"//mongo-1,mongo-2"
3133
(Authority
3234
Nothing
33-
[ This (NameAddress (RegName.unsafeFromString $ nes "mongo-1"))
34-
, This (NameAddress (RegName.unsafeFromString $ nes "mongo-2"))
35+
[ This (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "mongo-1")))
36+
, This (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "mongo-2")))
3537
])
3638
testIso
3739
(Authority.parser options)
3840
(Authority.print options)
3941
"//mongo-1:2000,mongo-2:3000"
4042
(Authority
4143
Nothing
42-
[ Both (NameAddress (RegName.unsafeFromString $ nes "mongo-1")) (Port.unsafeFromInt 2000)
43-
, Both (NameAddress (RegName.unsafeFromString $ nes "mongo-2")) (Port.unsafeFromInt 3000)
44+
[ Both (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "mongo-1"))) (Port.unsafeFromInt 2000)
45+
, Both (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "mongo-2"))) (Port.unsafeFromInt 3000)
4446
])
4547
testIso
4648
(Authority.parser options)
4749
(Authority.print options)
4850
"//mongo-1:2000,mongo-2"
4951
(Authority
5052
Nothing
51-
[ Both (NameAddress (RegName.unsafeFromString $ nes "mongo-1")) (Port.unsafeFromInt 2000)
52-
, This (NameAddress (RegName.unsafeFromString $ nes "mongo-2"))
53+
[ Both (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "mongo-1"))) (Port.unsafeFromInt 2000)
54+
, This (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "mongo-2")))
5355
])
5456
testIso
5557
(Authority.parser options)
5658
(Authority.print options)
5759
"//mongo-1,mongo-2:3000"
5860
(Authority
5961
Nothing
60-
[ This (NameAddress (RegName.unsafeFromString $ nes "mongo-1"))
61-
, Both (NameAddress (RegName.unsafeFromString $ nes "mongo-2")) (Port.unsafeFromInt 3000)
62+
[ This (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "mongo-1")))
63+
, Both (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "mongo-2"))) (Port.unsafeFromInt 3000)
6264
])
6365
testIso
6466
(Authority.parser options)
@@ -74,9 +76,9 @@ spec = do
7476
(Authority.print options)
7577
"//user@mongo-1,mongo-2"
7678
(Authority
77-
(Just (UserInfo.unsafeFromString (nes "user")))
78-
[ This (NameAddress (RegName.unsafeFromString $ nes "mongo-1"))
79-
, This (NameAddress (RegName.unsafeFromString $ nes "mongo-2"))
79+
(Just (UserInfo.unsafeFromString (nes (SProxy :: SProxy "user"))))
80+
[ This (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "mongo-1")))
81+
, This (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "mongo-2")))
8082
])
8183
describe "URIRef+MultiHostPortPair parser/printer" do
8284
testIso
@@ -88,9 +90,9 @@ spec = do
8890
(Scheme.unsafeFromString "mongodb")
8991
(HierarchicalPartAuth
9092
(Authority
91-
(Just (UserInfo.unsafeFromString (nes "foo:bar")))
92-
[ This (NameAddress (RegName.unsafeFromString $ nes "db1.example.net"))
93-
, Both (NameAddress (RegName.unsafeFromString $ nes "db2.example.net")) (Port.unsafeFromInt 2500)
93+
(Just (UserInfo.unsafeFromString (nes (SProxy :: SProxy "foo:bar"))))
94+
[ This (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "db1.example.net")))
95+
, Both (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "db2.example.net"))) (Port.unsafeFromInt 2500)
9496
])
9597
(path ["authdb"]))
9698
(Just (Query.unsafeFromString "replicaSet=test&connectTimeoutMS=300000"))
@@ -104,9 +106,9 @@ spec = do
104106
(Scheme.unsafeFromString "mongodb")
105107
(HierarchicalPartAuth
106108
(Authority
107-
(Just (UserInfo.unsafeFromString (nes "foo:bar")))
108-
[ Both (NameAddress (RegName.unsafeFromString $ nes "db1.example.net")) (Port.unsafeFromInt 6)
109-
, Both (NameAddress (RegName.unsafeFromString $ nes "db2.example.net")) (Port.unsafeFromInt 2500)
109+
(Just (UserInfo.unsafeFromString (nes (SProxy :: SProxy "foo:bar"))))
110+
[ Both (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "db1.example.net"))) (Port.unsafeFromInt 6)
111+
, Both (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "db2.example.net"))) (Port.unsafeFromInt 2500)
110112
])
111113
(path ["authdb"]))
112114
(Just (Query.unsafeFromString "replicaSet=test&connectTimeoutMS=300000"))

‎test/URI/Extra/UserPassInfo.purs‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ module Test.URI.Extra.UserPassInfo where
33
import Prelude
44

55
import Data.Maybe (Maybe(..))
6+
import Data.String.NonEmpty (nes)
7+
import Data.Symbol (SProxy(..))
68
import Data.These (These(..))
79
import Test.Spec (Spec, describe)
8-
import Test.Util (nes, testIso)
10+
import Test.Util (testIso)
911
import URI.Authority (Authority(..), Host(..), Port)
1012
import URI.Authority as Authority
1113
import URI.Extra.UserPassInfo (UserPassInfo(..))
@@ -23,43 +25,43 @@ spec = do
2325
(Authority.print options)
2426
"//user@host"
2527
(Authority
26-
(Just (UserPassInfo { user: nes "user", password: Nothing }))
27-
(Just (This (NameAddress (RegName.unsafeFromString $ nes "host")))))
28+
(Just (UserPassInfo { user: nes (SProxy :: SProxy "user"), password: Nothing }))
29+
(Just (This (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "host"))))))
2830
testIso
2931
(Authority.parser options)
3032
(Authority.print options)
3133
"//user:pass@host"
3234
(Authority
33-
(Just (UserPassInfo { user: nes "user", password: Just (nes "pass") }))
34-
(Just (This (NameAddress (RegName.unsafeFromString $ nes "host")))))
35+
(Just (UserPassInfo { user: nes (SProxy :: SProxy "user"), password: Just (nes (SProxy :: SProxy "pass")) }))
36+
(Just (This (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "host"))))))
3537
testIso
3638
(Authority.parser options)
3739
(Authority.print options)
3840
"//user:pa%3Ass@host"
3941
(Authority
40-
(Just (UserPassInfo { user: nes "user", password: Just (nes "pa:ss") }))
41-
(Just (This (NameAddress (RegName.unsafeFromString $ nes "host")))))
42+
(Just (UserPassInfo { user: nes (SProxy :: SProxy "user"), password: Just (nes (SProxy :: SProxy "pa:ss")) }))
43+
(Just (This (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "host"))))))
4244
testIso
4345
(Authority.parser options)
4446
(Authority.print options)
4547
"//us%3Aer:pa%3Ass@host"
4648
(Authority
47-
(Just (UserPassInfo { user: nes "us:er", password: Just (nes "pa:ss") }))
48-
(Just (This (NameAddress (RegName.unsafeFromString $ nes "host")))))
49+
(Just (UserPassInfo { user: nes (SProxy :: SProxy "us:er"), password: Just (nes (SProxy :: SProxy "pa:ss")) }))
50+
(Just (This (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "host"))))))
4951
testIso
5052
(Authority.parser options)
5153
(Authority.print options)
5254
"//us%3Aer:pa%3Ass@host"
5355
(Authority
54-
(Just (UserPassInfo { user: nes "us:er", password: Just (nes "pa:ss") }))
55-
(Just (This (NameAddress (RegName.unsafeFromString $ nes "host")))))
56+
(Just (UserPassInfo { user: nes (SProxy :: SProxy "us:er"), password: Just (nes (SProxy :: SProxy "pa:ss")) }))
57+
(Just (This (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "host"))))))
5658
testIso
5759
(Authority.parser options)
5860
(Authority.print options)
5961
"//user:p%40ss@host"
6062
(Authority
61-
(Just (UserPassInfo { user: nes "user", password: Just (nes "p@ss") }))
62-
(Just (This (NameAddress (RegName.unsafeFromString $ nes "host")))))
63+
(Just (UserPassInfo { user: nes (SProxy :: SProxy "user"), password: Just (nes (SProxy :: SProxy "p@ss")) }))
64+
(Just (This (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "host"))))))
6365

6466
options ∷ Record (URIRefOptions UserPassInfo (HostPortPair Host Port) Path HierPath RelPath Query Fragment)
6567
options =

‎test/URI/Host.purs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ module Test.URI.Host where
33
import Prelude
44

55
import Data.Either (Either(..))
6+
import Data.String.NonEmpty (nes)
7+
import Data.Symbol (SProxy(..))
68
import Test.QuickCheck ((===))
79
import Test.Spec (Spec, describe, it)
810
import Test.Spec.Assertions (shouldEqual)
9-
import Test.Util (forAll, nes, testIso)
11+
import Test.Util (forAll, testIso)
1012
import Text.Parsing.Parser (runParser)
1113
import URI.Host (Host(..))
1214
import URI.Host as Host
@@ -18,9 +20,9 @@ import URI.Host.RegName as RegName
1820
spec ∷ Spec Unit
1921
spec = do
2022
describe "Host parser/printer" do
21-
testIso Host.parser Host.print "localhost" (NameAddress (RegName.unsafeFromString $ nes "localhost"))
22-
testIso Host.parser Host.print "github.com" (NameAddress (RegName.unsafeFromString $ nes "github.com"))
23-
testIso Host.parser Host.print "www.multipart.domain.example.com" (NameAddress (RegName.unsafeFromString $ nes "www.multipart.domain.example.com"))
23+
testIso Host.parser Host.print "localhost" (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "localhost")))
24+
testIso Host.parser Host.print "github.com" (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "github.com")))
25+
testIso Host.parser Host.print "www.multipart.domain.example.com" (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "www.multipart.domain.example.com")))
2426
testIso Host.parser Host.print "192.168.0.1" (IPv4Address (IPv4Address.unsafeFromInts 192 168 0 1))
2527
testIso Host.parser Host.print "[2001:cdba:0000:0000:0000:0000:3257:9652]" (IPv6Address (IPv6Address.unsafeFromString "2001:cdba:0000:0000:0000:0000:3257:9652"))
2628

@@ -35,7 +37,7 @@ spec = do
3537

3638
it "should not parse 0-lead octets as an IP address" do
3739
shouldEqual
38-
(Right (NameAddress (RegName.unsafeFromString $ nes "192.168.001.1")))
40+
(Right (NameAddress (RegName.unsafeFromString $ nes (SProxy :: SProxy "192.168.001.1"))))
3941
(runParser "192.168.001.1" Host.parser)
4042

4143
describe "NameAddress" do

0 commit comments

Comments
 (0)