Merge pull request #415 from plgd-dev/jkralik/feature/statusUnwrap

status error: implement Unwrap

Author: jkralik

message/status/status.go

@@ -37,26 +37,26 @@ func CodeToString(c codes.Code) string {
 	return c.String()
 }
 
-func (se Status) Error() string {
-	return fmt.Sprintf("coap error: code = %s desc = %v", CodeToString(se.Code()), se.err)
+func (s Status) Error() string {
+	return fmt.Sprintf("coap error: code = %s desc = %v", CodeToString(s.Code()), s.err)
 }
 
-// Code returns the status code contained in se.
-func (se Status) Code() codes.Code {
-	if se.msg != nil {
-		return se.msg.Code()
+// Code returns the status code contained in s.
+func (s Status) Code() codes.Code {
+	if s.msg != nil {
+		return s.msg.Code()
 	}
-	return se.code
+	return s.code
 }
 
 // Message returns a coap message.
-func (se Status) Message() *pool.Message {
-	return se.msg
+func (s Status) Message() *pool.Message {
+	return s.msg
 }
 
 // COAPError just for check interface
-func (se Status) COAPError() Status {
-	return se
+func (s Status) COAPError() Status {
+	return s
 }
 
 // Error returns an error representing c and msg.  If c is OK, returns nil.
@@ -142,3 +142,8 @@ func FromContextError(err error) Status {
 		}
 	}
 }
+
+// Unwrap unpacks wrapped errors.
+func (s Status) Unwrap() error {
+	return s.err
+}

message/status/status_test.go

@@ -0,0 +1,49 @@
+package status
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"testing"
+
+	"github.com/plgd-dev/go-coap/v3/message/codes"
+	"github.com/plgd-dev/go-coap/v3/message/pool"
+	"github.com/stretchr/testify/require"
+)
+
+func TestStatus(t *testing.T) {
+	s, ok := FromError(nil)
+	require.True(t, ok)
+	require.Equal(t, OK, s.Code())
+
+	_, ok = FromError(fmt.Errorf("test"))
+	require.False(t, ok)
+
+	msg := pool.NewMessage(context.TODO())
+	msg.SetCode(codes.NotFound)
+	err := Errorf(msg, "test %w", context.Canceled)
+	s, ok = FromError(err)
+	require.True(t, ok)
+	require.Equal(t, codes.NotFound, s.Code())
+	require.True(t, errors.Is(err, context.Canceled))
+
+	s = Convert(err)
+	require.Equal(t, codes.NotFound, s.Code())
+	require.Equal(t, codes.NotFound, Code(err))
+
+	require.Equal(t, OK, Code(nil))
+
+	err = FromContextError(context.Canceled)
+	require.True(t, errors.Is(err, context.Canceled))
+	require.Equal(t, Canceled, Code(err))
+
+	err = FromContextError(nil)
+	require.Equal(t, OK, Code(err))
+
+	err = FromContextError(context.DeadlineExceeded)
+	require.Equal(t, Timeout, Code(err))
+
+	err = FromContextError(fmt.Errorf("test"))
+	require.Equal(t, Unknown, Code(err))
+	require.Equal(t, Unknown, Code(fmt.Errorf("test")))
+}