diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-04-10 20:39:06 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-04-10 20:47:30 +0900 |
| commit | 560cb626a1a8f7d4bfca5d30f262cc90fb5d4608 (patch) | |
| tree | 0be44e6cf70bae8b608b6a12efc06d66d1f2e5d9 /hst/enablement_test.go | |
| parent | c33a6a5b7ee130370aeeebf6635977415115f7da (diff) | |
hst: remove enablement json adapter
The go116 behaviour of built-in new function makes this cleaner.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'hst/enablement_test.go')
| -rw-r--r-- | hst/enablement_test.go | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/hst/enablement_test.go b/hst/enablement_test.go index 5ba9b710..166c3d93 100644 --- a/hst/enablement_test.go +++ b/hst/enablement_test.go @@ -13,7 +13,7 @@ func TestEnablementString(t *testing.T) { t.Parallel() testCases := []struct { - flags hst.Enablement + flags hst.Enablements want string }{ {0, "(no enablements)"}, @@ -59,13 +59,13 @@ func TestEnablements(t *testing.T) { sData string }{ {"nil", nil, "null", `{"value":null,"magic":3236757504}`}, - {"zero", hst.NewEnablements(0), `{}`, `{"value":{},"magic":3236757504}`}, - {"wayland", hst.NewEnablements(hst.EWayland), `{"wayland":true}`, `{"value":{"wayland":true},"magic":3236757504}`}, - {"x11", hst.NewEnablements(hst.EX11), `{"x11":true}`, `{"value":{"x11":true},"magic":3236757504}`}, - {"dbus", hst.NewEnablements(hst.EDBus), `{"dbus":true}`, `{"value":{"dbus":true},"magic":3236757504}`}, - {"pipewire", hst.NewEnablements(hst.EPipeWire), `{"pipewire":true}`, `{"value":{"pipewire":true},"magic":3236757504}`}, - {"pulse", hst.NewEnablements(hst.EPulse), `{"pulse":true}`, `{"value":{"pulse":true},"magic":3236757504}`}, - {"all", hst.NewEnablements(hst.EM - 1), `{"wayland":true,"x11":true,"dbus":true,"pipewire":true,"pulse":true}`, `{"value":{"wayland":true,"x11":true,"dbus":true,"pipewire":true,"pulse":true},"magic":3236757504}`}, + {"zero", new(hst.Enablements(0)), `{}`, `{"value":{},"magic":3236757504}`}, + {"wayland", new(hst.EWayland), `{"wayland":true}`, `{"value":{"wayland":true},"magic":3236757504}`}, + {"x11", new(hst.EX11), `{"x11":true}`, `{"value":{"x11":true},"magic":3236757504}`}, + {"dbus", new(hst.EDBus), `{"dbus":true}`, `{"value":{"dbus":true},"magic":3236757504}`}, + {"pipewire", new(hst.EPipeWire), `{"pipewire":true}`, `{"value":{"pipewire":true},"magic":3236757504}`}, + {"pulse", new(hst.EPulse), `{"pulse":true}`, `{"value":{"pulse":true},"magic":3236757504}`}, + {"all", new(hst.EM - 1), `{"wayland":true,"x11":true,"dbus":true,"pipewire":true,"pulse":true}`, `{"value":{"wayland":true,"x11":true,"dbus":true,"pipewire":true,"pulse":true},"magic":3236757504}`}, } for _, tc := range testCases { @@ -137,7 +137,7 @@ func TestEnablements(t *testing.T) { }) t.Run("val", func(t *testing.T) { - if got := hst.NewEnablements(hst.EWayland | hst.EPulse).Unwrap(); got != hst.EWayland|hst.EPulse { + if got := new(hst.EWayland | hst.EPulse).Unwrap(); got != hst.EWayland|hst.EPulse { t.Errorf("Unwrap: %v", got) } }) @@ -146,9 +146,6 @@ func TestEnablements(t *testing.T) { t.Run("passthrough", func(t *testing.T) { t.Parallel() - if _, err := (*hst.Enablements)(nil).MarshalJSON(); !errors.Is(err, syscall.EINVAL) { - t.Errorf("MarshalJSON: error = %v", err) - } if err := (*hst.Enablements)(nil).UnmarshalJSON(nil); !errors.Is(err, syscall.EINVAL) { t.Errorf("UnmarshalJSON: error = %v", err) } |