@@ -546,53 +546,45 @@ func TestBase64Bytes_MarshalYAML(t *testing.T) {
546
546
}
547
547
func TestGetSliceFromPointer (t * testing.T ) {
548
548
tests := []struct {
549
- name string
550
- input * []string
551
- expected []string
552
- expectNil bool
549
+ name string
550
+ input * []string
551
+ expected []string
553
552
}{
554
553
{
555
- name : "nil pointer" ,
556
- input : nil ,
557
- expected : []string {},
558
- expectNil : false ,
554
+ name : "nil pointer" ,
555
+ input : nil ,
556
+ expected : []string {},
559
557
},
560
558
{
561
559
name : "pointer to nil slice" ,
562
560
input : func () * []string {
563
561
var s []string
564
562
return & s
565
563
}(),
566
- expected : nil ,
567
- expectNil : true ,
564
+ expected : []string {},
568
565
},
569
566
{
570
- name : "empty slice" ,
571
- input : & []string {},
572
- expected : []string {},
573
- expectNil : false ,
567
+ name : "empty slice" ,
568
+ input : & []string {},
569
+ expected : []string {},
574
570
},
575
571
{
576
- name : "populated slice" ,
577
- input : & []string {"item1" , "item2" },
578
- expected : []string {"item1" , "item2" },
579
- expectNil : false ,
572
+ name : "populated slice" ,
573
+ input : & []string {"item1" , "item2" },
574
+ expected : []string {"item1" , "item2" },
580
575
},
581
576
}
582
577
583
578
for _ , tt := range tests {
584
579
t .Run (tt .name , func (t * testing.T ) {
585
580
result := GetSliceFromPointer (tt .input )
586
581
587
- if tt .expectNil {
588
- if result != nil {
589
- t .Errorf ("GetSliceFromPointer() = %v, want nil" , result )
590
- }
582
+ if result == nil && tt .expected == nil {
591
583
return
592
584
}
593
585
594
- if result == nil {
595
- t .Errorf ("GetSliceFromPointer() = nil , want %v" , tt .expected )
586
+ if ( result == nil && tt . expected != nil ) || ( result != nil && tt . expected == nil ) {
587
+ t .Errorf ("GetSliceFromPointer() = %v , want %v" , result , tt .expected )
596
588
return
597
589
}
598
590
0 commit comments