diff --git a/internal/models/UploadStatus_test.go b/internal/models/UploadStatus_test.go index ca0be83..150251e 100644 --- a/internal/models/UploadStatus_test.go +++ b/internal/models/UploadStatus_test.go @@ -9,5 +9,5 @@ func TestUploadStatus_ToJson(t *testing.T) { status := UploadStatus{} output, err := status.ToJson() test.IsNil(t, err) - test.IsEqualString(t, string(output), "{\"chunkid\":\"\",\"currentstatus\":0,\"type\":\"uploadstatus\"}") + test.IsEqualString(t, string(output), "{\"chunkid\":\"\",\"currentstatus\":0}") } diff --git a/internal/webserver/sse/Sse_test.go b/internal/webserver/sse/Sse_test.go index 9684ca6..f84e345 100644 --- a/internal/webserver/sse/Sse_test.go +++ b/internal/webserver/sse/Sse_test.go @@ -47,7 +47,7 @@ func TestPublishNewStatus(t *testing.T) { go PublishNewStatus("test_status") receivedStatus := <-replyChannel - test.IsEqualString(t, receivedStatus, "test_status") + test.IsEqualString(t, receivedStatus, "event: message\ndata: test_status\n\n") removeListener("test_status") } @@ -89,18 +89,19 @@ func TestGetStatusSSE(t *testing.T) { body, err := io.ReadAll(rr.Body) test.IsNil(t, err) - test.IsEqualString(t, string(body), "{\"chunkid\":\"validstatus_0\",\"currentstatus\":0,\"type\":\"uploadstatus\"}\n{\"chunkid\":\"validstatus_1\",\"currentstatus\":1,\"type\":\"uploadstatus\"}\n") + test.IsEqualString(t, string(body), "event: message\ndata: {\"chunkid\":\"validstatus_0\",\"currentstatus\":0}\n\n"+ + "event: message\ndata: {\"chunkid\":\"validstatus_1\",\"currentstatus\":1}\n\n") // Test ping message time.Sleep(3 * time.Second) body, err = io.ReadAll(rr.Body) test.IsNil(t, err) - test.IsEqualString(t, string(body), "{\"type\":\"ping\"}\n") + test.IsEqualString(t, string(body), "event: ping\n\n") PublishNewStatus("testcontent") time.Sleep(1 * time.Second) body, err = io.ReadAll(rr.Body) test.IsNil(t, err) - test.IsEqualString(t, string(body), "testcontent") + test.IsEqualString(t, string(body), "event: message\ndata: testcontent\n\n") Shutdown() }