Unexport fields in WebSocketEvent (#17912)

Automatic Merge

model/websocket_message_test.go

@@ -35,26 +35,23 @@ func TestWebSocketEventImmutable(t *testing.T) {
 	if new == m {
 		require.Fail(t, "pointers should not be the same")
 	}
-	require.NotEqual(t, m.Event, new.Event)
-	require.Equal(t, new.Event, "new_event")
-	require.Equal(t, new.Event, new.EventType())
+	require.NotEqual(t, m.EventType(), new.EventType())
+	require.Equal(t, new.EventType(), "new_event")
 
 	new = m.SetSequence(45)
 	if new == m {
 		require.Fail(t, "pointers should not be the same")
 	}
-	require.NotEqual(t, m.Sequence, new.Sequence)
-	require.Equal(t, new.Sequence, int64(45))
-	require.Equal(t, new.Sequence, new.GetSequence())
+	require.NotEqual(t, m.GetSequence(), new.GetSequence())
+	require.Equal(t, new.GetSequence(), int64(45))
 
 	broadcast := &WebsocketBroadcast{}
 	new = m.SetBroadcast(broadcast)
 	if new == m {
 		require.Fail(t, "pointers should not be the same")
 	}
-	require.NotEqual(t, m.Broadcast, new.Broadcast)
-	require.Equal(t, new.Broadcast, broadcast)
-	require.Equal(t, new.Broadcast, new.GetBroadcast())
+	require.NotEqual(t, m.GetBroadcast(), new.GetBroadcast())
+	require.Equal(t, new.GetBroadcast(), broadcast)
 
 	data := map[string]interface{}{
 		"key":  "val",
@@ -65,8 +62,8 @@ func TestWebSocketEventImmutable(t *testing.T) {
 		require.Fail(t, "pointers should not be the same")
 	}
 	require.NotEqual(t, m, new)
-	require.Equal(t, new.Data, data)
-	require.Equal(t, new.Data, new.GetData())
+	require.Equal(t, new.data, data)
+	require.Equal(t, new.data, new.GetData())
 
 	copy := m.Copy()
 	if copy == m {
@@ -81,10 +78,10 @@ func TestWebSocketEventFromJson(t *testing.T) {
 	data := `{"event": "test", "data": {"key": "val"}, "seq": 45, "broadcast": {"user_id": "userid"}}`
 	ev = WebSocketEventFromJson(strings.NewReader(data))
 	require.NotNil(t, ev, "should have parsed")
-	require.Equal(t, ev.Event, "test")
-	require.Equal(t, ev.Sequence, int64(45))
-	require.Equal(t, ev.Data, map[string]interface{}{"key": "val"})
-	require.Equal(t, ev.Broadcast, &WebsocketBroadcast{UserId: "userid"})
+	require.Equal(t, ev.EventType(), "test")
+	require.Equal(t, ev.GetSequence(), int64(45))
+	require.Equal(t, ev.data, map[string]interface{}{"key": "val"})
+	require.Equal(t, ev.GetBroadcast(), &WebsocketBroadcast{UserId: "userid"})
 }
 
 func TestWebSocketResponse(t *testing.T) {