Extensive refactor, quality of life enhancements

[rbdr/mobius] / hotline / news_test.go

diff --git a/hotline/news_test.go b/hotline/news_test.go
index 44776dd3723a0eee0f5631be3d594d1fb19f306e..d1b043edc333762066a694d62c61846757ac04e0 100644 (file)
--- a/hotline/news_test.go
+++ b/hotline/news_test.go
@@ -1,7 +1,8 @@
 package hotline
 
 import (
-       "reflect"
+       "github.com/stretchr/testify/assert"
+       "io"
        "testing"
 )
 
@@ -12,9 +13,9 @@ func TestNewsCategoryListData15_MarshalBinary(t *testing.T) {
                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
@@ -60,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,
                        },
@@ -75,12 +76,11 @@ 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()
+                       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++ {
@@ -91,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)
                        }
                })