From 7e51077714b1b0009e75870647bc86c228fc36cc Mon Sep 17 00:00:00 2001 From: Yann David Date: Tue, 6 Dec 2022 21:03:23 -0500 Subject: [PATCH] Adjust tests --- streaming_test.go | 4 ++++ streaming_ws_test.go | 24 +++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/streaming_test.go b/streaming_test.go index fd61f9c..2397bbd 100644 --- a/streaming_test.go +++ b/streaming_test.go @@ -22,6 +22,8 @@ data: {content: error} event: update data: {"content": "foo"} event: update +data: {"text": "foo"} +event: update data: {"content": "%s"} event: notification data: {"type": "mention"} @@ -42,6 +44,8 @@ data: 1234567 case *UpdateEvent: if event.Status.Content == "foo" { passUpdate = true + } else if event.Status.Text == "foo" { + passUpdate = true } else if event.Status.Content == largeContent { passUpdateLarge = true } else { diff --git a/streaming_ws_test.go b/streaming_ws_test.go index 856702a..c915c7c 100644 --- a/streaming_ws_test.go +++ b/streaming_ws_test.go @@ -79,6 +79,13 @@ func wsMock(w http.ResponseWriter, r *http.Request) { return } + err = conn.WriteMessage(websocket.TextMessage, + []byte(`{"event":"update","payload":"{\"text\":\"foo\"}"}`)) + if err != nil { + http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) + return + } + err = conn.WriteMessage(websocket.TextMessage, []byte(`{"event":"notification","payload":"{\"id\":123}"}`)) if err != nil { @@ -111,20 +118,20 @@ func wsTest(t *testing.T, q chan Event, cancel func()) { for e := range q { events = append(events, e) } - if len(events) != 6 { + if len(events) != 7 { t.Fatalf("result should be four: %d", len(events)) } if events[0].(*UpdateEvent).Status.Content != "foo" { t.Fatalf("want %q but %q", "foo", events[0].(*UpdateEvent).Status.Content) } - if events[1].(*NotificationEvent).Notification.ID != "123" { - t.Fatalf("want %q but %q", "123", events[1].(*NotificationEvent).Notification.ID) + if events[1].(*UpdateEvent).Status.Text != "foo" { + t.Fatalf("want %q but %q", "foo", events[1].(*UpdateEvent).Status.Content) } - if events[2].(*DeleteEvent).ID != "1234567" { - t.Fatalf("want %q but %q", "1234567", events[2].(*DeleteEvent).ID) + if events[2].(*NotificationEvent).Notification.ID != "123" { + t.Fatalf("want %q but %q", "123", events[2].(*NotificationEvent).Notification.ID) } - if errorEvent, ok := events[3].(*ErrorEvent); !ok { - t.Fatalf("should be fail: %v", errorEvent.err) + if events[3].(*DeleteEvent).ID != "1234567" { + t.Fatalf("want %q but %q", "1234567", events[3].(*DeleteEvent).ID) } if errorEvent, ok := events[4].(*ErrorEvent); !ok { t.Fatalf("should be fail: %v", errorEvent.err) @@ -132,6 +139,9 @@ func wsTest(t *testing.T, q chan Event, cancel func()) { if errorEvent, ok := events[5].(*ErrorEvent); !ok { t.Fatalf("should be fail: %v", errorEvent.err) } + if errorEvent, ok := events[6].(*ErrorEvent); !ok { + t.Fatalf("should be fail: %v", errorEvent.err) + } } func TestStreamingWS(t *testing.T) {