From ec5e91b8c97f02707a70a789ba4af84d51394ea5 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 25 Mar 2025 04:42:30 +0900 Subject: system: optimise string formatting Signed-off-by: Ophestra --- system/op_internal_test.go | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'system/op_internal_test.go') diff --git a/system/op_internal_test.go b/system/op_internal_test.go index 7ec4f174..4d43309e 100644 --- a/system/op_internal_test.go +++ b/system/op_internal_test.go @@ -47,10 +47,10 @@ func (ptc tcOp) test(t *testing.T, gotOps []Op, wantOps []Op, fn string) { ec *Criteria want bool }{ - {"nil", newCriteria(), ptc.et != User}, + {"nil", nil, ptc.et != User}, {"self", newCriteria(ptc.et), true}, - {"all", newCriteria(EWayland, EX11, EDBus, EPulse, User, Process), true}, - {"enablements", newCriteria(EWayland, EX11, EDBus, EPulse), ptc.et != User && ptc.et != Process}, + {"all", newCriteria(EWayland | EX11 | EDBus | EPulse | User | Process), true}, + {"enablements", newCriteria(EWayland | EX11 | EDBus | EPulse), ptc.et != User && ptc.et != Process}, } for _, tc := range testCases { @@ -65,15 +65,4 @@ func (ptc tcOp) test(t *testing.T, gotOps []Op, wantOps []Op, fn string) { } } -func newCriteria(labels ...Enablement) *Criteria { - ec := new(Criteria) - if len(labels) == 0 { - return ec - } - - ec.Enablements = new(Enablements) - for _, e := range labels { - ec.Set(e) - } - return ec -} +func newCriteria(e Enablement) *Criteria { return (*Criteria)(&e) } -- cgit v1.3.1