@@ -420,7 +420,7 @@ func TestCanonicalization(t *testing.T) {
420420 },
421421 },
422422 "@query-param for request - valid" : {
423- identifier : `"@query-param";name=bar` ,
423+ identifier : `"@query-param";name=" bar" ` ,
424424 message : & Message {URL : testURL1 , IsRequest : true },
425425 assert : func (t * testing.T , err error , value []string ) {
426426 t .Helper ()
@@ -430,7 +430,7 @@ func TestCanonicalization(t *testing.T) {
430430 },
431431 },
432432 "@query-param for request - valid with duplicate unrelated parameter" : {
433- identifier : `"@query-param";name=foo` ,
433+ identifier : `"@query-param";name=" foo" ` ,
434434 message : & Message {URL : & url.URL {RawQuery : "foo=bar&other=one&other=two" }, IsRequest : true },
435435 assert : func (t * testing.T , err error , value []string ) {
436436 t .Helper ()
@@ -440,7 +440,7 @@ func TestCanonicalization(t *testing.T) {
440440 },
441441 },
442442 "@query-param for request - invalid, duplicate parameter" : {
443- identifier : `"@query-param";name=foo` ,
443+ identifier : `"@query-param";name=" foo" ` ,
444444 message : & Message {URL : & url.URL {RawQuery : "foo=one&foo=two" }, IsRequest : true },
445445 assert : func (t * testing.T , err error , _ []string ) {
446446 t .Helper ()
@@ -450,7 +450,7 @@ func TestCanonicalization(t *testing.T) {
450450 },
451451 },
452452 "@query-param for request - invalid, duplicate encoded parameter" : {
453- identifier : `"@query-param";name=foo` ,
453+ identifier : `"@query-param";name=" foo" ` ,
454454 message : & Message {URL : & url.URL {RawQuery : "foo=one&%66oo=two" }, IsRequest : true },
455455 assert : func (t * testing.T , err error , _ []string ) {
456456 t .Helper ()
@@ -460,7 +460,7 @@ func TestCanonicalization(t *testing.T) {
460460 },
461461 },
462462 "@query-param for response - invalid, duplicate request parameter" : {
463- identifier : `"@query-param";name=foo;req` ,
463+ identifier : `"@query-param";name=" foo" ;req` ,
464464 message : & Message {URL : & url.URL {RawQuery : "foo=one&foo=two" }, IsRequest : false },
465465 assert : func (t * testing.T , err error , _ []string ) {
466466 t .Helper ()
@@ -480,19 +480,19 @@ func TestCanonicalization(t *testing.T) {
480480 require .ErrorContains (t , err , "named parameter" )
481481 },
482482 },
483- "@query-param for request - invalid query param escaping " : {
484- identifier : `"@query-param";name=1 ` ,
483+ "@query-param for request - invalid token name parameter " : {
484+ identifier : `"@query-param";name=foo ` ,
485485 message : & Message {URL : testURL1 , IsRequest : true },
486486 assert : func (t * testing.T , err error , _ []string ) {
487487 t .Helper ()
488488
489489 require .Error (t , err )
490- require .ErrorIs (t , err , ErrCanonicalization )
490+ require .ErrorIs (t , err , ErrInvalidComponentIdentifier )
491491 require .ErrorContains (t , err , "must be a string" )
492492 },
493493 },
494494 "@query-param for request - invalid, parameter not present in query" : {
495- identifier : `"@query-param";name=moo` ,
495+ identifier : `"@query-param";name=" moo" ` ,
496496 message : & Message {URL : testURL1 , IsRequest : true },
497497 assert : func (t * testing.T , err error , _ []string ) {
498498 t .Helper ()
@@ -503,7 +503,7 @@ func TestCanonicalization(t *testing.T) {
503503 },
504504 },
505505 "@query-param for response - valid" : {
506- identifier : `"@query-param";name=foo;req` ,
506+ identifier : `"@query-param";name=" foo" ;req` ,
507507 message : & Message {URL : testURL1 , IsRequest : false },
508508 assert : func (t * testing.T , err error , value []string ) {
509509 t .Helper ()
@@ -513,7 +513,7 @@ func TestCanonicalization(t *testing.T) {
513513 },
514514 },
515515 "@query-param for response - invalid" : {
516- identifier : `"@query-param";name=foo` ,
516+ identifier : `"@query-param";name=" foo" ` ,
517517 message : & Message {URL : testURL1 , IsRequest : false },
518518 assert : func (t * testing.T , err error , _ []string ) {
519519 t .Helper ()
@@ -589,7 +589,7 @@ func TestCanonicalization(t *testing.T) {
589589 },
590590 },
591591 "header component for request - invalid, serialization error" : {
592- identifier : `"X-Foo-Bar";sf;key=foo` ,
592+ identifier : `"X-Foo-Bar";sf;key=" foo" ` ,
593593 message : & Message {Header : http.Header {"X-Foo-Bar" : []string {"baz" }}, IsRequest : true },
594594 assert : func (t * testing.T , err error , _ []string ) {
595595 t .Helper ()
@@ -637,7 +637,7 @@ func TestCanonicalization(t *testing.T) {
637637 c , err := canonicalizerFor (strings .ToLower (item .Value .(string )))
638638 require .NoError (t , err )
639639
640- res , err := c .canonicalize (tc .message , normaliseParams ( item .Params ) )
640+ res , err := c .canonicalize (tc .message , item .Params )
641641
642642 tc .assert (t , err , res )
643643 })
0 commit comments