Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Go 1.13's errors.Is/As functions #461

Merged
merged 2 commits into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions v3/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ func (e *Error) Error() string {
return fmt.Sprintf("LDAP Result Code %d %q: %s", e.ResultCode, LDAPResultCodeMap[e.ResultCode], e.Err.Error())
}

func (e *Error) Unwrap() error { return e.Err }

// GetLDAPError creates an Error out of a BER packet representing a LDAPResult
// The return is an error object. It can be casted to a Error structure.
// This function returns nil if resultCode in the LDAPResult sequence is success(0).
Expand Down
19 changes: 19 additions & 0 deletions v3/error_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package ldap

import (
"errors"
"io"
"net"
"strings"
"testing"
Expand Down Expand Up @@ -103,6 +104,24 @@ func TestGetLDAPErrorInvalidResponse(t *testing.T) {
}
}

func TestErrorIs(t *testing.T) {
err := NewError(ErrorNetwork, io.EOF)
if !errors.Is(err, io.EOF) {
t.Errorf("Expected an io.EOF error: %v", err)
}
}

func TestErrorAs(t *testing.T) {
var netErr net.InvalidAddrError = "invalid addr"
err := NewError(ErrorNetwork, netErr)

var target net.InvalidAddrError
ok := errors.As(err, &target)
if !ok {
t.Error("Expected an InvalidAddrError")
}
}

// TestGetLDAPErrorSuccess tests parsing of a result with no error (resultCode == 0).
func TestGetLDAPErrorSuccess(t *testing.T) {
bindResponse := ber.Encode(ber.ClassApplication, ber.TypeConstructed, ApplicationBindResponse, nil, "Bind Response")
Expand Down