@@ -90,10 +90,10 @@ local function test_parse(test)
90
90
expected_errmsg = " Incorrect URI: expected host:service or /unix.socket"
91
91
u , error = uri .parse (" " )
92
92
test :isnil (u , " invalid uri" , u )
93
- test :is (tostring ( error ) , expected_errmsg , " error message" )
93
+ test :is (error . message , expected_errmsg , " error message" )
94
94
u , error = uri .parse (" ://" )
95
95
test :isnil (u , " invalid uri" , u )
96
- test :is (tostring ( error ) , expected_errmsg , " error message" )
96
+ test :is (error . message , expected_errmsg , " error message" )
97
97
end
98
98
99
99
local function test_format (test )
@@ -245,13 +245,13 @@ local function test_parse_uri_query_params(test)
245
245
expected_errmsg = " Default URI parameters are not allowed for single URI"
246
246
u , error = uri .parse ({ " /tmp/unix.sock" , default_params = {q = " v" } })
247
247
test :isnil (u , " invalid uri" , u )
248
- test :is (tostring ( error ) , expected_errmsg , " error message" )
248
+ test :is (error . message , expected_errmsg , " error message" )
249
249
-- Multiple URIs is not allowed in `parse` method,
250
250
-- use `parse_many` instead.
251
251
expected_errmsg = " Incorrect URI: expected host:service or /unix.socket"
252
252
u , error = uri .parse ({ " /tmp/unix.sock, /tmp/unix.sock" })
253
253
test :isnil (u , " invalid uri" , u )
254
- test :is (tostring ( error ) , expected_errmsg , " error message" )
254
+ test :is (error . message , expected_errmsg , " error message" )
255
255
end
256
256
257
257
local function test_parse_uri_set_with_query_params (test )
@@ -314,24 +314,24 @@ local function test_parse_uri_set_with_query_params(test)
314
314
expected_errmsg = " Incorrect URI: expected host:service or /unix.socket"
315
315
uri_set , error = uri .parse_many (" /tmp/unix.sock,,/tmp/unix.sock" )
316
316
test :isnil (uri_set , " invalid uri" , uri_set )
317
- test :is (tostring ( error ) , expected_errmsg , " error message" )
317
+ test :is (error . message , expected_errmsg , " error message" )
318
318
uri_set , error = uri .parse_many (" /tmp/unix.sock, ,/tmp/unix.sock" )
319
319
test :isnil (uri_set , " invalid uri" , uri_set )
320
- test :is (tostring ( error ) , expected_errmsg , " error message" )
320
+ test :is (error . message , expected_errmsg , " error message" )
321
321
uri_set , error = uri .parse_many (" /tmp/unix.sock,, /tmp/unix.sock" )
322
322
test :isnil (uri_set , " invalid uri" , uri_set )
323
- test :is (tostring ( error ) , expected_errmsg , " error message" )
323
+ test :is (error . message , expected_errmsg , " error message" )
324
324
uri_set , error = uri .parse_many (" /tmp/unix.sock ,,/tmp/unix.sock" )
325
325
test :isnil (uri_set , " invalid uri" , uri_set )
326
- test :is (tostring ( error ) , expected_errmsg , " error message" )
326
+ test :is (error . message , expected_errmsg , " error message" )
327
327
328
328
329
329
-- Check that we can't parse string with multiple URIs,
330
330
-- using old method.
331
331
expected_errmsg = " Incorrect URI: expected host:service or /unix.socket"
332
332
local u , error = uri .parse (" /tmp/unix.sock, /tmp/unix.sock" )
333
333
test :isnil (u , " invalid uri" , u )
334
- test :is (tostring ( error ) , expected_errmsg , " error message" )
334
+ test :is (error . message , expected_errmsg , " error message" )
335
335
end
336
336
337
337
local function test_parse_uri_set_from_lua_table (test )
@@ -575,75 +575,75 @@ local function test_parse_invalid_uri_set_from_lua_table(test)
575
575
expected_errmsg = " Incorrect type for URI: should be string, number or table"
576
576
uri_set , error = uri .parse_many (function () end )
577
577
test :isnil (uri_set , " invalid uri" , uri_set )
578
- test :is (tostring ( error ) , expected_errmsg , " error message" )
578
+ test :is (error . message , expected_errmsg , " error message" )
579
579
-- Invalid type of value for numerical key
580
580
expected_errmsg = " Incorrect type for URI: should be string, number or table"
581
581
uri_set , error = uri .parse_many ({" /tmp/unix.sock" , function () end })
582
582
test :isnil (uri_set , " invalid uri" , uri_set )
583
- test :is (tostring ( error ) , expected_errmsg , " error message" )
583
+ test :is (error . message , expected_errmsg , " error message" )
584
584
-- Invalid type of value for string keys
585
585
expected_errmsg = " Invalid URI table: expected " ..
586
586
" {uri = string, params = table}" .. " or " ..
587
587
" {string, params = table}"
588
588
uri_set , error = uri .parse_many ({" /tmp/unix.sock" , uri = function () end })
589
589
test :isnil (uri_set , " invalid uri" , uri_set )
590
- test :is (tostring ( error ) , expected_errmsg , " error message" )
590
+ test :is (error . message , expected_errmsg , " error message" )
591
591
expected_errmsg = " Incorrect type for URI parameters: should be a table"
592
592
uri_set , error = uri .parse_many ({" /tmp/unix.sock" , params = function () end })
593
593
test :isnil (uri_set , " invalid uri" , uri_set )
594
- test :is (tostring ( error ) , expected_errmsg , " error message" )
594
+ test :is (error . message , expected_errmsg , " error message" )
595
595
expected_errmsg = " Incorrect type for URI parameters: should be a table"
596
596
uri_set , error = uri .parse_many ({" /tmp/unix.sock" , params = " " })
597
597
test :isnil (uri_set , " invalid uri" , uri_set )
598
- test :is (tostring ( error ) , expected_errmsg , " error message" )
598
+ test :is (error . message , expected_errmsg , " error message" )
599
599
expected_errmsg = " Default URI parameters are not allowed for single URI"
600
600
uri_set , error = uri .parse_many ({" /tmp/unix.sock" , default_params = " " })
601
601
test :isnil (uri_set , " invalid uri" , uri_set )
602
- test :is (tostring ( error ) , expected_errmsg , " error message" )
602
+ test :is (error . message , expected_errmsg , " error message" )
603
603
expected_errmsg = " Default URI parameters are not allowed for single URI"
604
604
uri_set , error = uri .parse_many ({" /tmp/unix.sock" , default_params = " " })
605
605
test :isnil (uri_set , " invalid uri" , uri_set )
606
- test :is (tostring ( error ) , expected_errmsg , " error message" )
606
+ test :is (error . message , expected_errmsg , " error message" )
607
607
608
608
-- Mix "uri=" and numerical keys is banned
609
609
expected_errmsg = " Invalid URI table: expected " ..
610
610
" {uri = string, params = table}" .. " or " ..
611
611
" {string, params = table}"
612
612
uri_set , error = uri .parse_many ({" /tmp/unix.sock" , uri = " /tmp/unix.sock" })
613
613
test :isnil (uri_set , " invalid uri" , uri_set )
614
- test :is (tostring ( error ) , expected_errmsg , " error message" )
614
+ test :is (error . message , expected_errmsg , " error message" )
615
615
-- Several URIs in one string is allowed only when the
616
616
-- passed as a single string.
617
617
expected_errmsg = " Incorrect URI: expected host:service or /unix.socket"
618
618
uri_set , error = uri .parse_many ({" /tmp/unix.sock, /tmp/unix.sock" })
619
619
test :isnil (uri_set , " invalid uri" , uri_set )
620
- test :is (tostring ( error ) , expected_errmsg , " error message" )
620
+ test :is (error . message , expected_errmsg , " error message" )
621
621
-- "params" table is allowed only for single URI
622
622
expected_errmsg = " URI parameters are not allowed for multiple URIs"
623
623
uri_set , error = uri .parse_many ({
624
624
" /tmp/unix.sock" , " /tmp/unix.sock" ,
625
625
params = {q1 = " v1" }
626
626
})
627
627
test :isnil (uri_set , " invalid uri" , uri_set )
628
- test :is (tostring ( error ) , expected_errmsg , " error message" )
628
+ test :is (error . message , expected_errmsg , " error message" )
629
629
-- "params" table is not allowed with nested tables
630
630
expected_errmsg = " URI parameters are not allowed for multiple URIs"
631
631
uri_set , error = uri .parse_many ({
632
632
{" /tmp/unix.sock" },
633
633
params = {q1 = " v1" }
634
634
})
635
635
test :isnil (uri_set , " invalid uri" , uri_set )
636
- test :is (tostring ( error ) , expected_errmsg , " error message" )
636
+ test :is (error . message , expected_errmsg , " error message" )
637
637
-- "default_params" table is not allowed in nested URI tables
638
638
expected_errmsg = " Default URI parameters are not allowed for single URI"
639
639
uri_set , error = uri .parse_many ({{" /tmp/unix.sock" , default_params = {}}})
640
640
test :isnil (uri_set , " invalid uri" , uri_set )
641
- test :is (tostring ( error ) , expected_errmsg , " error message" )
641
+ test :is (error . message , expected_errmsg , " error message" )
642
642
-- "default_params" table is not allowed for single URI
643
643
expected_errmsg = " Default URI parameters are not allowed for single URI"
644
644
uri_set , error = uri .parse_many ({" /tmp/unix.sock" , default_params = {}})
645
645
test :isnil (uri_set , " invalid uri" , uri_set )
646
- test :is (tostring ( error ) , expected_errmsg , " error message" )
646
+ test :is (error . message , expected_errmsg , " error message" )
647
647
-- Only one URI is allowed in nested tables
648
648
expected_errmsg = " Invalid URI table: expected " ..
649
649
" {uri = string, params = table}" .. " or " ..
@@ -653,7 +653,7 @@ local function test_parse_invalid_uri_set_from_lua_table(test)
653
653
default_params = {q = " v" }
654
654
})
655
655
test :isnil (uri_set , " invalid uri" , uri_set )
656
- test :is (tostring ( error ) , expected_errmsg , " error message" )
656
+ test :is (error . message , expected_errmsg , " error message" )
657
657
-- Nested URI tables is not allowed in nested tables
658
658
expected_errmsg = " Invalid URI table: expected " ..
659
659
" {uri = string, params = table}" .. " or " ..
@@ -662,7 +662,7 @@ local function test_parse_invalid_uri_set_from_lua_table(test)
662
662
{" /tmp/unix.sock" , {}}
663
663
})
664
664
test :isnil (uri_set , " invalid uri" , uri_set )
665
- test :is (tostring ( error ) , expected_errmsg , " error message" )
665
+ test :is (error . message , expected_errmsg , " error message" )
666
666
-- Nested URI table without URI is now allowed
667
667
expected_errmsg = " Invalid URI table: expected " ..
668
668
" {uri = string, params = table}" .. " or " ..
@@ -672,7 +672,7 @@ local function test_parse_invalid_uri_set_from_lua_table(test)
672
672
{ params = {q = " v" } }
673
673
})
674
674
test :isnil (uri_set , " invalid uri" , uri_set )
675
- test :is (tostring ( error ) , expected_errmsg , " error message" )
675
+ test :is (error . message , expected_errmsg , " error message" )
676
676
-- Only string key types are allowed in "params" and
677
677
-- "default_params" table
678
678
expected_errmsg = " Incorrect type for URI parameter name: " ..
@@ -682,14 +682,14 @@ local function test_parse_invalid_uri_set_from_lua_table(test)
682
682
params = {" v" },
683
683
})
684
684
test :isnil (uri_set , " invalid uri" , uri_set )
685
- test :is (tostring ( error ) , expected_errmsg , " error message" )
685
+ test :is (error . message , expected_errmsg , " error message" )
686
686
expected_errmsg = " Default URI parameters are not allowed for single URI"
687
687
uri_set , error = uri .parse_many ({
688
688
" /tmp/unix.sock" ,
689
689
default_params = {" v" },
690
690
})
691
691
test :isnil (uri_set , " invalid uri" , uri_set )
692
- test :is (tostring ( error ) , expected_errmsg , " error message" )
692
+ test :is (error . message , expected_errmsg , " error message" )
693
693
-- Invalid type of values in "params" and
694
694
-- "default_params" table
695
695
expected_errmsg = " Incorrect type for URI parameter value: " ..
@@ -699,53 +699,53 @@ local function test_parse_invalid_uri_set_from_lua_table(test)
699
699
params = {q = function () end },
700
700
})
701
701
test :isnil (uri_set , " invalid uri" , uri_set )
702
- test :is (tostring ( error ) , expected_errmsg , " error message" )
702
+ test :is (error . message , expected_errmsg , " error message" )
703
703
expected_errmsg = " Default URI parameters are not allowed for single URI"
704
704
uri_set , error = uri .parse_many ({
705
705
" /tmp/unix.sock" ,
706
706
default_params = {q = function () end },
707
707
})
708
708
test :isnil (uri_set , " invalid uri" , uri_set )
709
- test :is (tostring ( error ) , expected_errmsg , " error message" )
709
+ test :is (error . message , expected_errmsg , " error message" )
710
710
expected_errmsg = " Incorrect type for URI parameter value: " ..
711
711
" should be string or number"
712
712
uri_set , error = uri .parse_many ({
713
713
" /tmp/unix.sock" ,
714
714
params = {q = {function () end }},
715
715
})
716
716
test :isnil (uri_set , " invalid uri" , uri_set )
717
- test :is (tostring ( error ) , expected_errmsg , " error message" )
717
+ test :is (error . message , expected_errmsg , " error message" )
718
718
expected_errmsg = " Default URI parameters are not allowed for single URI"
719
719
uri_set , error = uri .parse_many ({
720
720
" /tmp/unix.sock" ,
721
721
default_params = {q = {function () end }},
722
722
})
723
723
test :isnil (uri_set , " invalid uri" , uri_set )
724
- test :is (tostring ( error ) , expected_errmsg , " error message" )
724
+ test :is (error . message , expected_errmsg , " error message" )
725
725
-- Invalid uri string in URIs table
726
726
expected_errmsg = " Incorrect URI: expected host:service or /unix.socket"
727
727
uri_set , error = uri .parse_many ({
728
728
" /tmp/unix.sock" ,
729
729
" ://"
730
730
})
731
731
test :isnil (uri_set , " invalid uri" , uri_set )
732
- test :is (tostring ( error ) , expected_errmsg , " error message" )
732
+ test :is (error . message , expected_errmsg , " error message" )
733
733
-- Invalid uri in nested URI table
734
734
expected_errmsg = " Incorrect URI: expected host:service or /unix.socket"
735
735
uri_set , error = uri .parse_many ({
736
736
" /tmp/unix.sock" ,
737
737
{" ://" }
738
738
})
739
739
test :isnil (uri_set , " invalid uri" , uri_set )
740
- test :is (tostring ( error ) , expected_errmsg , " error message" )
740
+ test :is (error . message , expected_errmsg , " error message" )
741
741
-- Same as previous but with "uri=" syntax
742
742
expected_errmsg = " Incorrect URI: expected host:service or /unix.socket"
743
743
uri_set , error = uri .parse_many ({
744
744
" /tmp/unix.sock" ,
745
745
{uri = " ://" }
746
746
})
747
747
test :isnil (uri_set , " invalid uri" , uri_set )
748
- test :is (tostring ( error ) , expected_errmsg , " error message" )
748
+ test :is (error . message , expected_errmsg , " error message" )
749
749
end
750
750
751
751
local test = tap .test (" uri" )
0 commit comments