mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-12-22 16:36:30 +00:00
Code Issues Projects Releases Wiki Activity

make EqualStringSlice to generic EqualSliceValues (#2179)

Browse source 
just a fly-by refactoring
This commit is contained in:
6543 2023-08-09 09:00:12 +02:00 committed by GitHub
parent b7af77685e
commit ada3659eb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 60 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/forge/gitea/gitea_test.go
View file

@ -161,7 +161,7 @@ func Test_gitea(t *testing.T) {
g.Assert(b).IsNotNil()
g.Assert(err).IsNil()
g.Assert(b.Event).Equal(model.EventPull)
g.Assert(utils.EqualStringSlice(b.ChangedFiles, []string{"README.md"})).IsTrue()
g.Assert(utils.EqualSliceValues(b.ChangedFiles, []string{"README.md"})).IsTrue()
})
})
}

2
server/forge/gitea/helper_test.go
View file

@ -104,7 +104,7 @@ func Test_parse(t *testing.T) {
g.Assert(pipeline.Message).Equal(hook.Commits[0].Message)
g.Assert(pipeline.Avatar).Equal("http://1.gravatar.com/avatar/8c58a0be77ee441bb8f8595b7f1b4e87")
g.Assert(pipeline.Author).Equal(hook.Sender.UserName)
g.Assert(utils.EqualStringSlice(pipeline.ChangedFiles, []string{"CHANGELOG.md", "app/controller/application.rb"})).IsTrue()
g.Assert(utils.EqualSliceValues(pipeline.ChangedFiles, []string{"CHANGELOG.md", "app/controller/application.rb"})).IsTrue()
})
g.It("Should return a Repo struct from a push hook", func() {

2
server/forge/gitea/parse_test.go
View file

@ -64,7 +64,7 @@ func Test_parser(t *testing.T) {
g.Assert(r).IsNotNil()
g.Assert(b).IsNotNil()
g.Assert(b.Event).Equal(model.EventPush)
g.Assert(utils.EqualStringSlice(b.ChangedFiles, []string{"CHANGELOG.md", "app/controller/application.rb"})).IsTrue()
g.Assert(utils.EqualSliceValues(b.ChangedFiles, []string{"CHANGELOG.md", "app/controller/application.rb"})).IsTrue()
})
})
g.Describe("given a push hook from an branch creation", func() {

26
shared/utils/slices.go
View file

@ -31,3 +31,29 @@ func MergeSlices[T any](slices ...[]T) []T {
}
return result
}
// EqualSliceValues compare two slices if they have equal values independent of how they are sorted
func EqualSliceValues[E comparable](s1, s2 []E) bool {
if len(s1) != len(s2) {
return false
}
m1 := sliceToCountMap(s1)
m2 := sliceToCountMap(s2)
for k, v := range m1 {
if m2[k] != v {
return false
}
}
return true
}
func sliceToCountMap[E comparable](list []E) map[E]int {
m := make(map[E]int)
for i := range list {
m[list[i]]++
}
return m
}

31
shared/utils/slices_test.go
View file

@ -27,3 +27,34 @@ func TestMergeSlices(t *testing.T) {
resultIS := MergeSlices([]int{}, []int{1, 2}, []int{4}, nil)
assert.EqualValues(t, []int{1, 2, 4}, resultIS)
}
func TestEqualSliceValues(t *testing.T) {
tests := []struct {
in1 []string
in2 []string
out bool
}{{
in1: []string{"", "ab", "12", "ab"},
in2: []string{"12", "ab"},
out: false,
}, {
in1: nil,
in2: nil,
out: true,
}, {
in1: []string{"AA", "AA", "2", " "},
in2: []string{"2", "AA", " ", "AA"},
out: true,
}, {
in1: []string{"AA", "AA", "2", " "},
in2: []string{"2", "2", " ", "AA"},
out: false,
}}
for _, tc := range tests {
assert.EqualValues(t, tc.out, EqualSliceValues(tc.in1, tc.in2), "could not correctly process input: '%#v', %#v", tc.in1, tc.in2)
}
assert.True(t, EqualSliceValues([]bool{true, false, false}, []bool{false, false, true}))
assert.False(t, EqualSliceValues([]bool{true, false, false}, []bool{true, false, true}))
}

26
shared/utils/strings.go
View file

@ -34,29 +34,3 @@ func DedupStrings(src []string) []string {
return dst
}
// EqualStringSlice compare two string slices if they have equal values independent of how they are sorted
func EqualStringSlice(l1, l2 []string) bool {
if len(l1) != len(l2) {
return false
}
m1 := sliceToCountMap(l1)
m2 := sliceToCountMap(l2)
for k, v := range m1 {
if m2[k] != v {
return false
}
}
return true
}
func sliceToCountMap(list []string) map[string]int {
m := make(map[string]int)
for i := range list {
m[list[i]]++
}
return m
}

28
shared/utils/strings_test.go
View file

@ -46,31 +46,3 @@ func TestDedupStrings(t *testing.T) {
}
}
}
func TestEqualStringSlice(t *testing.T) {
tests := []struct {
in1 []string
in2 []string
out bool
}{{
in1: []string{"", "ab", "12", "ab"},
in2: []string{"12", "ab"},
out: false,
}, {
in1: nil,
in2: nil,
out: true,
}, {
in1: []string{"AA", "AA", "2", " "},
in2: []string{"2", "AA", " ", "AA"},
out: true,
}, {
in1: []string{"AA", "AA", "2", " "},
in2: []string{"2", "2", " ", "AA"},
out: false,
}}
for _, tc := range tests {
assert.EqualValues(t, tc.out, EqualStringSlice(tc.in1, tc.in2), "could not correctly process input: '%#v', %#v", tc.in1, tc.in2)
}
}