@@ -90,10 +90,10 @@ local function test_parse(test)
9090 expected_errmsg = " Incorrect URI: expected host:service or /unix.socket"
9191 u , error = uri .parse (" " )
9292 test :isnil (u , " invalid uri" , u )
93- test :is (tostring ( error ) , expected_errmsg , " error message" )
93+ test :is (error . message , expected_errmsg , " error message" )
9494 u , error = uri .parse (" ://" )
9595 test :isnil (u , " invalid uri" , u )
96- test :is (tostring ( error ) , expected_errmsg , " error message" )
96+ test :is (error . message , expected_errmsg , " error message" )
9797end
9898
9999local function test_format (test )
@@ -245,13 +245,13 @@ local function test_parse_uri_query_params(test)
245245 expected_errmsg = " Default URI parameters are not allowed for single URI"
246246 u , error = uri .parse ({ " /tmp/unix.sock" , default_params = {q = " v" } })
247247 test :isnil (u , " invalid uri" , u )
248- test :is (tostring ( error ) , expected_errmsg , " error message" )
248+ test :is (error . message , expected_errmsg , " error message" )
249249 -- Multiple URIs is not allowed in `parse` method,
250250 -- use `parse_many` instead.
251251 expected_errmsg = " Incorrect URI: expected host:service or /unix.socket"
252252 u , error = uri .parse ({ " /tmp/unix.sock, /tmp/unix.sock" })
253253 test :isnil (u , " invalid uri" , u )
254- test :is (tostring ( error ) , expected_errmsg , " error message" )
254+ test :is (error . message , expected_errmsg , " error message" )
255255end
256256
257257local function test_parse_uri_set_with_query_params (test )
@@ -314,24 +314,24 @@ local function test_parse_uri_set_with_query_params(test)
314314 expected_errmsg = " Incorrect URI: expected host:service or /unix.socket"
315315 uri_set , error = uri .parse_many (" /tmp/unix.sock,,/tmp/unix.sock" )
316316 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" )
318318 uri_set , error = uri .parse_many (" /tmp/unix.sock, ,/tmp/unix.sock" )
319319 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" )
321321 uri_set , error = uri .parse_many (" /tmp/unix.sock,, /tmp/unix.sock" )
322322 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" )
324324 uri_set , error = uri .parse_many (" /tmp/unix.sock ,,/tmp/unix.sock" )
325325 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" )
327327
328328
329329 -- Check that we can't parse string with multiple URIs,
330330 -- using old method.
331331 expected_errmsg = " Incorrect URI: expected host:service or /unix.socket"
332332 local u , error = uri .parse (" /tmp/unix.sock, /tmp/unix.sock" )
333333 test :isnil (u , " invalid uri" , u )
334- test :is (tostring ( error ) , expected_errmsg , " error message" )
334+ test :is (error . message , expected_errmsg , " error message" )
335335end
336336
337337local function test_parse_uri_set_from_lua_table (test )
@@ -575,75 +575,75 @@ local function test_parse_invalid_uri_set_from_lua_table(test)
575575 expected_errmsg = " Incorrect type for URI: should be string, number or table"
576576 uri_set , error = uri .parse_many (function () end )
577577 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" )
579579 -- Invalid type of value for numerical key
580580 expected_errmsg = " Incorrect type for URI: should be string, number or table"
581581 uri_set , error = uri .parse_many ({" /tmp/unix.sock" , function () end })
582582 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" )
584584 -- Invalid type of value for string keys
585585 expected_errmsg = " Invalid URI table: expected " ..
586586 " {uri = string, params = table}" .. " or " ..
587587 " {string, params = table}"
588588 uri_set , error = uri .parse_many ({" /tmp/unix.sock" , uri = function () end })
589589 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" )
591591 expected_errmsg = " Incorrect type for URI parameters: should be a table"
592592 uri_set , error = uri .parse_many ({" /tmp/unix.sock" , params = function () end })
593593 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" )
595595 expected_errmsg = " Incorrect type for URI parameters: should be a table"
596596 uri_set , error = uri .parse_many ({" /tmp/unix.sock" , params = " " })
597597 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" )
599599 expected_errmsg = " Default URI parameters are not allowed for single URI"
600600 uri_set , error = uri .parse_many ({" /tmp/unix.sock" , default_params = " " })
601601 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" )
603603 expected_errmsg = " Default URI parameters are not allowed for single URI"
604604 uri_set , error = uri .parse_many ({" /tmp/unix.sock" , default_params = " " })
605605 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" )
607607
608608 -- Mix "uri=" and numerical keys is banned
609609 expected_errmsg = " Invalid URI table: expected " ..
610610 " {uri = string, params = table}" .. " or " ..
611611 " {string, params = table}"
612612 uri_set , error = uri .parse_many ({" /tmp/unix.sock" , uri = " /tmp/unix.sock" })
613613 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" )
615615 -- Several URIs in one string is allowed only when the
616616 -- passed as a single string.
617617 expected_errmsg = " Incorrect URI: expected host:service or /unix.socket"
618618 uri_set , error = uri .parse_many ({" /tmp/unix.sock, /tmp/unix.sock" })
619619 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" )
621621 -- "params" table is allowed only for single URI
622622 expected_errmsg = " URI parameters are not allowed for multiple URIs"
623623 uri_set , error = uri .parse_many ({
624624 " /tmp/unix.sock" , " /tmp/unix.sock" ,
625625 params = {q1 = " v1" }
626626 })
627627 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" )
629629 -- "params" table is not allowed with nested tables
630630 expected_errmsg = " URI parameters are not allowed for multiple URIs"
631631 uri_set , error = uri .parse_many ({
632632 {" /tmp/unix.sock" },
633633 params = {q1 = " v1" }
634634 })
635635 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" )
637637 -- "default_params" table is not allowed in nested URI tables
638638 expected_errmsg = " Default URI parameters are not allowed for single URI"
639639 uri_set , error = uri .parse_many ({{" /tmp/unix.sock" , default_params = {}}})
640640 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" )
642642 -- "default_params" table is not allowed for single URI
643643 expected_errmsg = " Default URI parameters are not allowed for single URI"
644644 uri_set , error = uri .parse_many ({" /tmp/unix.sock" , default_params = {}})
645645 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" )
647647 -- Only one URI is allowed in nested tables
648648 expected_errmsg = " Invalid URI table: expected " ..
649649 " {uri = string, params = table}" .. " or " ..
@@ -653,7 +653,7 @@ local function test_parse_invalid_uri_set_from_lua_table(test)
653653 default_params = {q = " v" }
654654 })
655655 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" )
657657 -- Nested URI tables is not allowed in nested tables
658658 expected_errmsg = " Invalid URI table: expected " ..
659659 " {uri = string, params = table}" .. " or " ..
@@ -662,7 +662,7 @@ local function test_parse_invalid_uri_set_from_lua_table(test)
662662 {" /tmp/unix.sock" , {}}
663663 })
664664 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" )
666666 -- Nested URI table without URI is now allowed
667667 expected_errmsg = " Invalid URI table: expected " ..
668668 " {uri = string, params = table}" .. " or " ..
@@ -672,7 +672,7 @@ local function test_parse_invalid_uri_set_from_lua_table(test)
672672 { params = {q = " v" } }
673673 })
674674 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" )
676676 -- Only string key types are allowed in "params" and
677677 -- "default_params" table
678678 expected_errmsg = " Incorrect type for URI parameter name: " ..
@@ -682,14 +682,14 @@ local function test_parse_invalid_uri_set_from_lua_table(test)
682682 params = {" v" },
683683 })
684684 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" )
686686 expected_errmsg = " Default URI parameters are not allowed for single URI"
687687 uri_set , error = uri .parse_many ({
688688 " /tmp/unix.sock" ,
689689 default_params = {" v" },
690690 })
691691 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" )
693693 -- Invalid type of values in "params" and
694694 -- "default_params" table
695695 expected_errmsg = " Incorrect type for URI parameter value: " ..
@@ -699,53 +699,53 @@ local function test_parse_invalid_uri_set_from_lua_table(test)
699699 params = {q = function () end },
700700 })
701701 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" )
703703 expected_errmsg = " Default URI parameters are not allowed for single URI"
704704 uri_set , error = uri .parse_many ({
705705 " /tmp/unix.sock" ,
706706 default_params = {q = function () end },
707707 })
708708 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" )
710710 expected_errmsg = " Incorrect type for URI parameter value: " ..
711711 " should be string or number"
712712 uri_set , error = uri .parse_many ({
713713 " /tmp/unix.sock" ,
714714 params = {q = {function () end }},
715715 })
716716 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" )
718718 expected_errmsg = " Default URI parameters are not allowed for single URI"
719719 uri_set , error = uri .parse_many ({
720720 " /tmp/unix.sock" ,
721721 default_params = {q = {function () end }},
722722 })
723723 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" )
725725 -- Invalid uri string in URIs table
726726 expected_errmsg = " Incorrect URI: expected host:service or /unix.socket"
727727 uri_set , error = uri .parse_many ({
728728 " /tmp/unix.sock" ,
729729 " ://"
730730 })
731731 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" )
733733 -- Invalid uri in nested URI table
734734 expected_errmsg = " Incorrect URI: expected host:service or /unix.socket"
735735 uri_set , error = uri .parse_many ({
736736 " /tmp/unix.sock" ,
737737 {" ://" }
738738 })
739739 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" )
741741 -- Same as previous but with "uri=" syntax
742742 expected_errmsg = " Incorrect URI: expected host:service or /unix.socket"
743743 uri_set , error = uri .parse_many ({
744744 " /tmp/unix.sock" ,
745745 {uri = " ://" }
746746 })
747747 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" )
749749end
750750
751751local test = tap .test (" uri" )
0 commit comments