Skip to content

Commit cf8db3e

Browse files
committed
Enhance error handling in ConfigGetDirResponseAssertion for element validation
1 parent 5a07114 commit cf8db3e

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

internal/resp_assertions/config_get_dir_response_assertion.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,18 @@ func (a ConfigGetDirResponseAssertion) Run(value resp_value.Value) error {
2828
firstElement := value.Array()[0]
2929
secondElement := value.Array()[1]
3030

31-
err := NewBulkStringAssertion("dir").Run(firstElement)
32-
if err != nil {
33-
return err
31+
if firstElement.Type != resp_value.BULK_STRING {
32+
return fmt.Errorf("Expected element 1 to be a bulk string, got %s", firstElement.Type)
33+
}
34+
if firstElement.String() != "dir" {
35+
return fmt.Errorf("Expected element 1 to be %q, got %q", "dir", firstElement.String())
3436
}
3537

3638
if secondElement.Type != resp_value.BULK_STRING {
37-
return fmt.Errorf("Expected element 1 to be a bulk string, got %s", secondElement.Type)
39+
return fmt.Errorf("Expected element 2 to be a bulk string, got %s", secondElement.Type)
3840
}
39-
4041
if secondElement.String() != a.ExpectedDirValue && secondElement.String() != a.ExpectedDirValue+"/" {
41-
return fmt.Errorf("Expected element 1 to be %q, got %q", a.ExpectedDirValue, secondElement.String())
42+
return fmt.Errorf("Expected element 2 to be %q, got %q", a.ExpectedDirValue, secondElement.String())
4243
}
4344

4445
return nil

0 commit comments

Comments
 (0)