Update coders with error return values
This commit is contained in:
@@ -4,10 +4,11 @@ import "bytes"
|
|||||||
|
|
||||||
type ASCIICoder struct{}
|
type ASCIICoder struct{}
|
||||||
|
|
||||||
func (c *ASCIICoder) Encode(s string, buf *bytes.Buffer) {
|
func (c *ASCIICoder) Encode(s string, buf *bytes.Buffer) error {
|
||||||
buf.WriteString(s)
|
buf.WriteString(s)
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ASCIICoder) Decode(buf *bytes.Buffer) string {
|
func (c *ASCIICoder) Decode(buf *bytes.Buffer) (string, error) {
|
||||||
return buf.String()
|
return buf.String(), nil
|
||||||
}
|
}
|
||||||
|
@@ -11,7 +11,11 @@ func TestASCIIEncodeSimpleASCIIString(t *testing.T) {
|
|||||||
input := "Hello, World!"
|
input := "Hello, World!"
|
||||||
|
|
||||||
expected := []byte{72, 101, 108, 108, 111, 44, 32, 87, 111, 114, 108, 100, 33}
|
expected := []byte{72, 101, 108, 108, 111, 44, 32, 87, 111, 114, 108, 100, 33}
|
||||||
coder.Encode(input, &buf)
|
err := coder.Encode(input, &buf)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Expected no error, but got %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
if !bytes.Equal(buf.Bytes(), expected) {
|
if !bytes.Equal(buf.Bytes(), expected) {
|
||||||
t.Errorf("Expected %v, but got %v", expected, buf.Bytes())
|
t.Errorf("Expected %v, but got %v", expected, buf.Bytes())
|
||||||
@@ -25,7 +29,11 @@ func TestASCIIDecodeSimpleASCIIString(t *testing.T) {
|
|||||||
|
|
||||||
expected := "Hello, World!"
|
expected := "Hello, World!"
|
||||||
buf.Write(input)
|
buf.Write(input)
|
||||||
output := coder.Decode(&buf)
|
output, err := coder.Decode(&buf)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Expected no error, but got %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
if output != expected {
|
if output != expected {
|
||||||
t.Errorf("Expected %v, but got %v", expected, output)
|
t.Errorf("Expected %v, but got %v", expected, output)
|
||||||
@@ -38,7 +46,11 @@ func TestASCIIEncodeEmptyString(t *testing.T) {
|
|||||||
input := ""
|
input := ""
|
||||||
|
|
||||||
expected := []byte{}
|
expected := []byte{}
|
||||||
coder.Encode(input, &buf)
|
err := coder.Encode(input, &buf)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Expected no error, but got %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
if !bytes.Equal(buf.Bytes(), expected) {
|
if !bytes.Equal(buf.Bytes(), expected) {
|
||||||
t.Errorf("Expected %v, but got %v", expected, buf.Bytes())
|
t.Errorf("Expected %v, but got %v", expected, buf.Bytes())
|
||||||
@@ -50,7 +62,11 @@ func TestASCIIDecodeEmptyString(t *testing.T) {
|
|||||||
buf := bytes.NewBuffer([]byte{})
|
buf := bytes.NewBuffer([]byte{})
|
||||||
|
|
||||||
expected := ""
|
expected := ""
|
||||||
output := coder.Decode(buf)
|
output, err := coder.Decode(buf)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("Expected no error, but got %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
if output != expected {
|
if output != expected {
|
||||||
t.Errorf("Expected %v, but got %v", expected, output)
|
t.Errorf("Expected %v, but got %v", expected, output)
|
||||||
|
@@ -3,6 +3,6 @@ package encoding
|
|||||||
import "bytes"
|
import "bytes"
|
||||||
|
|
||||||
type Coder interface {
|
type Coder interface {
|
||||||
Encode(s string, buf *bytes.Buffer)
|
Encode(s string, buf *bytes.Buffer) error
|
||||||
Decode(buf *bytes.Buffer) string
|
Decode(buf *bytes.Buffer) (string, error)
|
||||||
}
|
}
|
Reference in New Issue
Block a user