X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/72dd37f1abb2b550aaaac48eac677403d5664797..HEAD:/hotline/news_test.go

diff --git a/hotline/news_test.go b/hotline/news_test.go
index 02e11a9..d1b043e 100644
--- a/hotline/news_test.go
+++ b/hotline/news_test.go
@@ -1,21 +1,21 @@
 package hotline
 
 import (
-	"bytes"
-	"reflect"
+	"github.com/stretchr/testify/assert"
+	"io"
 	"testing"
 )
 
 func TestNewsCategoryListData15_MarshalBinary(t *testing.T) {
 	type fields struct {
-		Type     []byte
+		Type     [2]byte
 		Name     string
 		Articles map[uint32]*NewsArtData
 		SubCats  map[string]NewsCategoryListData15
 		Count    []byte
-		AddSN    []byte
-		DeleteSN []byte
-		GUID     []byte
+		AddSN    [4]byte
+		DeleteSN [4]byte
+		GUID     [16]byte
 	}
 	tests := []struct {
 		name     string
@@ -26,7 +26,7 @@ func TestNewsCategoryListData15_MarshalBinary(t *testing.T) {
 		{
 			name: "returns expected bytes when type is a bundle",
 			fields: fields{
-				Type: []byte{0x00, 0x02},
+				Type: [2]byte{0x00, 0x02},
 				Articles: map[uint32]*NewsArtData{
 					uint32(1): {
 						Title:  "",
@@ -47,7 +47,7 @@ func TestNewsCategoryListData15_MarshalBinary(t *testing.T) {
 		{
 			name: "returns expected bytes when type is a category",
 			fields: fields{
-				Type: []byte{0x00, 0x03},
+				Type: [2]byte{0x00, 0x03},
 				Articles: map[uint32]*NewsArtData{
 					uint32(1): {
 						Title:  "",
@@ -61,8 +61,8 @@ func TestNewsCategoryListData15_MarshalBinary(t *testing.T) {
 				0x00, 0x03,
 				0x00, 0x01,
 				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x01,
-				0x00, 0x00, 0x00, 0x02,
+				0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00,
 				0x03,
 				0x66, 0x6f, 0x6f,
 			},
@@ -76,13 +76,12 @@ func TestNewsCategoryListData15_MarshalBinary(t *testing.T) {
 				Name:     tt.fields.Name,
 				Articles: tt.fields.Articles,
 				SubCats:  tt.fields.SubCats,
-				Count:    tt.fields.Count,
 				AddSN:    tt.fields.AddSN,
 				DeleteSN: tt.fields.DeleteSN,
 				GUID:     tt.fields.GUID,
 			}
-			gotData, err := newscat.MarshalBinary()
-			if bytes.Equal(newscat.Type, []byte{0, 3}) {
+			gotData, err := io.ReadAll(newscat)
+			if newscat.Type == [2]byte{0, 3} {
 				// zero out the random GUID before comparison
 				for i := 4; i < 20; i++ {
 					gotData[i] = 0
@@ -92,7 +91,7 @@ func TestNewsCategoryListData15_MarshalBinary(t *testing.T) {
 				t.Errorf("MarshalBinary() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			if !reflect.DeepEqual(gotData, tt.wantData) {
+			if !assert.Equal(t, tt.wantData, gotData) {
 				t.Errorf("MarshalBinary() gotData = %v, want %v", gotData, tt.wantData)
 			}
 		})