mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
745c483e42
Un-export or remove utilities that have no (external) users; - AuxFormatter (not used) - FormatError (only used internally) - FormatStatus (only used internally) - NewJSONProgressOutput (used by CLI) - NewProgressOutput (used by compose, cli for classic builder) - NewStderrWriter (not used) - NewStdoutWriter (not used) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
100 lines
2.7 KiB
Go
100 lines
2.7 KiB
Go
package streamformatter
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"errors"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/google/go-cmp/cmp"
|
|
"github.com/moby/moby/api/types/jsonstream"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
)
|
|
|
|
func TestRawProgressFormatterFormatStatus(t *testing.T) {
|
|
sf := rawProgressFormatter{}
|
|
res := sf.formatStatus("ID", "%s%d", "a", 1)
|
|
assert.Check(t, is.Equal("a1\r\n", string(res)))
|
|
}
|
|
|
|
func TestRawProgressFormatterFormatProgress(t *testing.T) {
|
|
sf := rawProgressFormatter{}
|
|
jsonProgress := &jsonstream.Progress{
|
|
Current: 15,
|
|
Total: 30,
|
|
Start: 1,
|
|
}
|
|
res := sf.formatProgress("id", "action", jsonProgress, nil)
|
|
out := string(res)
|
|
assert.Check(t, strings.HasPrefix(out, "action [===="))
|
|
assert.Check(t, is.Contains(out, "15B/30B"))
|
|
assert.Check(t, strings.HasSuffix(out, "\r"))
|
|
}
|
|
|
|
func TestFormatStatus(t *testing.T) {
|
|
res := formatStatus("ID", "%s%d", "a", 1)
|
|
expected := `{"status":"a1","id":"ID"}` + streamNewline
|
|
assert.Check(t, is.Equal(expected, string(res)))
|
|
}
|
|
|
|
func TestFormatError(t *testing.T) {
|
|
res := formatError(errors.New("Error for formatter"))
|
|
expected := `{"errorDetail":{"message":"Error for formatter"}}` + "\r\n"
|
|
assert.Check(t, is.Equal(expected, string(res)))
|
|
}
|
|
|
|
func TestFormatJSONError(t *testing.T) {
|
|
err := &jsonstream.Error{Code: 50, Message: "Json error"}
|
|
res := formatError(err)
|
|
expected := `{"errorDetail":{"code":50,"message":"Json error"}}` + streamNewline
|
|
assert.Check(t, is.Equal(expected, string(res)))
|
|
}
|
|
|
|
func TestJsonProgressFormatterFormatProgress(t *testing.T) {
|
|
sf := &jsonProgressFormatter{}
|
|
jsonProgress := &jsonstream.Progress{
|
|
Current: 15,
|
|
Total: 30,
|
|
Start: 1,
|
|
}
|
|
aux := "aux message"
|
|
res := sf.formatProgress("id", "action", jsonProgress, aux)
|
|
msg := &jsonstream.Message{}
|
|
|
|
assert.NilError(t, json.Unmarshal(res, msg))
|
|
|
|
rawAux := json.RawMessage(`"` + aux + `"`)
|
|
expected := &jsonstream.Message{
|
|
ID: "id",
|
|
Status: "action",
|
|
Aux: &rawAux,
|
|
Progress: jsonProgress,
|
|
}
|
|
assert.DeepEqual(t, msg, expected, cmpJSONMessageOpt())
|
|
}
|
|
|
|
func cmpJSONMessageOpt() cmp.Option {
|
|
progressMessagePath := func(path cmp.Path) bool {
|
|
return path.String() == "ProgressMessage"
|
|
}
|
|
return cmp.Options{
|
|
// Ignore deprecated property that is a derivative of Progress
|
|
cmp.FilterPath(progressMessagePath, cmp.Ignore()),
|
|
}
|
|
}
|
|
|
|
func TestJsonProgressFormatterFormatStatus(t *testing.T) {
|
|
sf := jsonProgressFormatter{}
|
|
res := sf.formatStatus("ID", "%s%d", "a", 1)
|
|
assert.Check(t, is.Equal(`{"status":"a1","id":"ID"}`+streamNewline, string(res)))
|
|
}
|
|
|
|
func TestNewJSONProgressOutput(t *testing.T) {
|
|
b := bytes.Buffer{}
|
|
b.Write(formatStatus("id", "Downloading"))
|
|
_ = NewJSONProgressOutput(&b, false)
|
|
assert.Check(t, is.Equal(`{"status":"Downloading","id":"id"}`+streamNewline, b.String()))
|
|
}
|