From 11ce5e07f4a6cd3c4291405319f721da65b31437 Mon Sep 17 00:00:00 2001 From: keitosuwahara Date: Sun, 27 Jul 2025 17:08:38 +0900 Subject: [PATCH 1/3] Add test of json.go Signed-off-by: keitosuwahara --- pkg/progress/json_test.go | 87 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 pkg/progress/json_test.go diff --git a/pkg/progress/json_test.go b/pkg/progress/json_test.go new file mode 100644 index 00000000000..f77702ec716 --- /dev/null +++ b/pkg/progress/json_test.go @@ -0,0 +1,87 @@ +/* + Copyright 2024 Docker Compose CLI authors + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package progress + +import ( + "bytes" + "context" + "encoding/json" + "testing" + + "gotest.tools/v3/assert" +) + +func TestJsonWriter_Event(t *testing.T) { + var out bytes.Buffer + w := &jsonWriter{ + out: &out, + done: make(chan bool), + dryRun: true, + } + + event := Event{ + ID: "service1", + ParentID: "project", + Text: "Creating", + StatusText: "Working", + Current: 50, + Total: 100, + Percent: 50, + } + w.Event(event) + + var msg jsonMessage + err := json.Unmarshal(out.Bytes(), &msg) + assert.NilError(t, err) + + assert.Equal(t, true, msg.DryRun) + assert.Equal(t, false, msg.Tail) + assert.Equal(t, "service1", msg.ID) + assert.Equal(t, "project", msg.ParentID) + assert.Equal(t, "Creating", msg.Text) + assert.Equal(t, "Working", msg.Status) + assert.Equal(t, int64(50), msg.Current) + assert.Equal(t, int64(100), msg.Total) + assert.Equal(t, 50, msg.Percent) +} + +func TestJsonWriter_TailMsgf(t *testing.T) { + var out bytes.Buffer + w := &jsonWriter{ + out: &out, + done: make(chan bool), + dryRun: false, + } + + go func() { + _ = w.Start(context.Background()) + }() + + w.TailMsgf("hello %s", "world") + + w.Stop() + + var msg jsonMessage + err := json.Unmarshal(out.Bytes(), &msg) + assert.NilError(t, err) + + assert.Equal(t, false, msg.DryRun) + assert.Equal(t, true, msg.Tail) + assert.Equal(t, "hello world", msg.Text) + assert.Equal(t, "", msg.ID) + assert.Equal(t, "", msg.Status) +} \ No newline at end of file From d6b57af1a4764d5cefcaf14812ddc864c1f19bba Mon Sep 17 00:00:00 2001 From: keitosuwahara Date: Sun, 27 Jul 2025 21:44:22 +0900 Subject: [PATCH 2/3] improved test Signed-off-by: keitosuwahara --- pkg/progress/json_test.go | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/pkg/progress/json_test.go b/pkg/progress/json_test.go index f77702ec716..2cf236e509e 100644 --- a/pkg/progress/json_test.go +++ b/pkg/progress/json_test.go @@ -44,19 +44,21 @@ func TestJsonWriter_Event(t *testing.T) { } w.Event(event) - var msg jsonMessage - err := json.Unmarshal(out.Bytes(), &msg) + var actual jsonMessage + err := json.Unmarshal(out.Bytes(), &actual) assert.NilError(t, err) - assert.Equal(t, true, msg.DryRun) - assert.Equal(t, false, msg.Tail) - assert.Equal(t, "service1", msg.ID) - assert.Equal(t, "project", msg.ParentID) - assert.Equal(t, "Creating", msg.Text) - assert.Equal(t, "Working", msg.Status) - assert.Equal(t, int64(50), msg.Current) - assert.Equal(t, int64(100), msg.Total) - assert.Equal(t, 50, msg.Percent) + expected := jsonMessage{ + DryRun: true, + ID: event.ID, + ParentID: event.ParentID, + Text: event.Text, + Status: event.StatusText, + Current: event.Current, + Total: event.Total, + Percent: event.Percent, + } + assert.DeepEqual(t, expected, actual) } func TestJsonWriter_TailMsgf(t *testing.T) { @@ -75,13 +77,13 @@ func TestJsonWriter_TailMsgf(t *testing.T) { w.Stop() - var msg jsonMessage - err := json.Unmarshal(out.Bytes(), &msg) + var actual jsonMessage + err := json.Unmarshal(out.Bytes(), &actual) assert.NilError(t, err) - assert.Equal(t, false, msg.DryRun) - assert.Equal(t, true, msg.Tail) - assert.Equal(t, "hello world", msg.Text) - assert.Equal(t, "", msg.ID) - assert.Equal(t, "", msg.Status) + expected := jsonMessage{ + Tail: true, + Text: "hello world", + } + assert.DeepEqual(t, expected, actual) } \ No newline at end of file From 22a7a787fa8a145063d165341c216c3ef6eb7836 Mon Sep 17 00:00:00 2001 From: keitosuwahara Date: Sun, 27 Jul 2025 21:55:41 +0900 Subject: [PATCH 3/3] improved lint error Signed-off-by: keitosuwahara --- pkg/progress/json_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/progress/json_test.go b/pkg/progress/json_test.go index 2cf236e509e..fffe535af08 100644 --- a/pkg/progress/json_test.go +++ b/pkg/progress/json_test.go @@ -86,4 +86,4 @@ func TestJsonWriter_TailMsgf(t *testing.T) { Text: "hello world", } assert.DeepEqual(t, expected, actual) -} \ No newline at end of file +}