Skip to content

Commit

Permalink
fix: follow golangci-lint suggestion
Browse files Browse the repository at this point in the history
  • Loading branch information
@zoumo
zoumo committed Dec 11, 2020
1 parent 7afbcc7 commit 8dc5973
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 71 deletions.
7 changes: 0 additions & 7 deletions safe.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ func (s *threadSafeSet) Remove(elems ...interface{}) {
s.mu.Lock()
defer s.mu.Unlock()
s.unsafe.Remove(elems...)

}

func (s *threadSafeSet) Copy() Set {
Expand All @@ -63,7 +62,6 @@ func (s *threadSafeSet) Copy() Set {
return &threadSafeSet{
unsafe: (s.unsafe.Copy()).(*set),
}

}

func (s *threadSafeSet) Len() int {
Expand Down Expand Up @@ -95,11 +93,9 @@ func (s *threadSafeSet) ContainsAny(elems ...interface{}) bool {
s.mu.RLock()
defer s.mu.RUnlock()
return s.unsafe.ContainsAny(elems...)

}

func (s *threadSafeSet) Equal(b Set) bool {

safeb, ok := b.(*threadSafeSet)
if ok {
safeb.mu.RLock()
Expand All @@ -122,7 +118,6 @@ func (s *threadSafeSet) IsSubsetOf(b Set) bool {
defer s.mu.RUnlock()

return s.unsafe.IsSubsetOf(b)

}

func (s *threadSafeSet) IsSupersetOf(b Set) bool {
Expand All @@ -135,7 +130,6 @@ func (s *threadSafeSet) IsSupersetOf(b Set) bool {
defer s.mu.RUnlock()

return s.unsafe.IsSupersetOf(b)

}

func (s *threadSafeSet) String() string {
Expand All @@ -151,7 +145,6 @@ func (s *threadSafeSet) ToThreadUnsafe() Set {

func (s *threadSafeSet) ToThreadSafe() Set {
return s

}

func (s *threadSafeSet) Diff(b Set) Set {
Expand Down
31 changes: 16 additions & 15 deletions safe_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@ func Test_threadSafeSet_Equal(t *testing.T) {
},
}
var wg sync.WaitGroup
for _, tt := range tests {
for i := range tests {
tt := tests[i]
wg.Add(1)
go func(tt test) {
defer wg.Done()
if got := s.Equal(tt.b); got != tt.want {
t.Errorf("threadSafeSet.Equal() == %v, want %v", got, tt.b)

}
}(tt)
}
Expand Down Expand Up @@ -163,19 +163,18 @@ func Test_threadSafeSet_IsSubsetOf(t *testing.T) {
},
}
var wg sync.WaitGroup
for _, tt := range tests {
for i := range tests {
tt := tests[i]
wg.Add(1)
go func(tt test) {
defer wg.Done()
if got := s.IsSubsetOf(tt.b); got != tt.want {
t.Errorf("threadSafeSet.IsSubsetOf() == %v, want %v", got, tt.b)

}
}(tt)
}

wg.Wait()

}

func Test_threadSafeSet_IsSupersetOf(t *testing.T) {
Expand Down Expand Up @@ -205,13 +204,13 @@ func Test_threadSafeSet_IsSupersetOf(t *testing.T) {
},
}
var wg sync.WaitGroup
for _, tt := range tests {
for i := range tests {
tt := tests[i]
wg.Add(1)
go func(tt test) {
defer wg.Done()
if got := s.IsSupersetOf(tt.b); got != tt.want {
t.Errorf("threadSafeSet.IsSupersetOf() == %v, want %v", got, tt.want)

}
}(tt)
}
Expand All @@ -231,7 +230,8 @@ func Test_threadSafeSet_ToThreadUnsafe_And_Safe(t *testing.T) {
true,
},
}
for _, tt := range tests {
for i := range tests {
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
unsafe := tt.a.ToThreadUnsafe()
if _, got := unsafe.(*set); got != tt.want {
Expand All @@ -242,7 +242,6 @@ func Test_threadSafeSet_ToThreadUnsafe_And_Safe(t *testing.T) {
t.Errorf("threadSafeSet.ToThreadUnsafe() = %v, want %v", got, tt.want)
}
})

}
}

Expand All @@ -264,7 +263,8 @@ func Test_threadSafeSet_Diff(t *testing.T) {
},
}
var wg sync.WaitGroup
for _, tt := range tests {
for i := range tests {
tt := tests[i]
wg.Add(1)
go func(tt test) {
defer wg.Done()
Expand All @@ -275,7 +275,6 @@ func Test_threadSafeSet_Diff(t *testing.T) {
}

wg.Wait()

}

func Test_threadSafeSet_SymmetricDiff(t *testing.T) {
Expand All @@ -296,7 +295,8 @@ func Test_threadSafeSet_SymmetricDiff(t *testing.T) {
},
}
var wg sync.WaitGroup
for _, tt := range tests {
for i := range tests {
tt := tests[i]
wg.Add(1)
go func(tt test) {
defer wg.Done()
Expand All @@ -307,7 +307,6 @@ func Test_threadSafeSet_SymmetricDiff(t *testing.T) {
}

wg.Wait()

}

func Test_threadSafeSet_Unite(t *testing.T) {
Expand All @@ -328,7 +327,8 @@ func Test_threadSafeSet_Unite(t *testing.T) {
},
}
var wg sync.WaitGroup
for _, tt := range tests {
for i := range tests {
tt := tests[i]
wg.Add(1)
go func(tt test) {
defer wg.Done()
Expand Down Expand Up @@ -357,7 +357,8 @@ func Test_threadSafeSet_Intersect(t *testing.T) {
},
}
var wg sync.WaitGroup
for _, tt := range tests {
for i := range tests {
tt := tests[i]
wg.Add(1)
go func(tt test) {
defer wg.Done()
Expand Down
2 changes: 1 addition & 1 deletion set.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func (s *set) Extend(b interface{}) error {

s2 := setb.ToThreadUnsafe().(*set)
s2.Range(func(_ int, elem interface{}) bool {
s.Add(elem)
s.Add(elem) //nolint:errcheck
return true
})

Expand Down
44 changes: 28 additions & 16 deletions set_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ import (

func Test_set_Add(t *testing.T) {
s := newSet()
//nolint
type temp struct {
test int
}
//nolint
type temp2 struct {
test int
m map[string]int
Expand All @@ -45,7 +47,8 @@ func Test_set_Add(t *testing.T) {
{"add slice error", []int{1, 2, 3}, true},
{"add map error", map[string]int{"1": 2}, true},
}
for _, tt := range tests {
for i := range tests {
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
if err := s.Add(tt.elem); (err != nil) != tt.wantErr {
t.Errorf("set.Add() error = %v, wantErr %v", err, tt.wantErr)
Expand All @@ -70,7 +73,8 @@ func Test_set_Extend(t *testing.T) {
{"extend err", "test", true},
{"extend nil", nil, false},
}
for _, tt := range tests {
for i := range tests {
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
if err := s.Extend(tt.b); (err != nil) != tt.wantErr {
t.Errorf("set.Extend() error = %v, wantErr %v", err, tt.wantErr)
Expand All @@ -92,7 +96,8 @@ func Test_set_Remove(t *testing.T) {
{"remove float", 3.0},
{"remove missing", 1},
}
for _, tt := range tests {
for i := range tests {
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
s.Remove(tt.elem)
if s.Contains(tt.elem) != false {
Expand All @@ -117,7 +122,8 @@ func Test_set_Contains(t *testing.T) {
{"contains missing", 3, false},
{"contains missing", []int{1, 2, 3}, false},
}
for _, tt := range tests {
for i := range tests {
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
if got := s.Contains(tt.elem); got != tt.want {
t.Errorf("set.Contains() = %v, want %v", got, tt.want)
Expand All @@ -127,7 +133,6 @@ func Test_set_Contains(t *testing.T) {
}

func Test_set_Equal(t *testing.T) {

tests := []struct {
name string
a *set
Expand All @@ -147,7 +152,8 @@ func Test_set_Equal(t *testing.T) {
false,
},
}
for _, tt := range tests {
for i := range tests {
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
if got := tt.a.Equal(tt.b); got != tt.want {
t.Errorf("set.Equal() = %v, want %v", got, tt.want)
Expand All @@ -157,7 +163,6 @@ func Test_set_Equal(t *testing.T) {
}

func Test_set_IsSubsetOf(t *testing.T) {

tests := []struct {
name string
a Set
Expand All @@ -183,7 +188,8 @@ func Test_set_IsSubsetOf(t *testing.T) {
true,
},
}
for _, tt := range tests {
for i := range tests {
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
if got := tt.a.IsSubsetOf(tt.b); got != tt.want {
t.Errorf("set.IsSubsetOf() = %v, want %v", got, tt.want)
Expand All @@ -193,7 +199,6 @@ func Test_set_IsSubsetOf(t *testing.T) {
}

func Test_set_IsSupersetOf(t *testing.T) {

tests := []struct {
name string
a Set
Expand All @@ -219,7 +224,8 @@ func Test_set_IsSupersetOf(t *testing.T) {
false,
},
}
for _, tt := range tests {
for i := range tests {
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
if got := tt.a.IsSupersetOf(tt.b); got != tt.want {
t.Errorf("set.IsSupersetOf() = %v, want %v", got, tt.want)
Expand All @@ -240,7 +246,8 @@ func Test_set_ToThreadUnsafe_And_Safe(t *testing.T) {
true,
},
}
for _, tt := range tests {
for i := range tests {
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
unsafe := tt.a.ToThreadUnsafe()
if _, got := unsafe.(*set); got != tt.want {
Expand Down Expand Up @@ -280,7 +287,8 @@ func Test_set_Diff(t *testing.T) {
newSet(),
},
}
for _, tt := range tests {
for i := range tests {
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
if got := tt.a.Diff(tt.b); !got.Equal(tt.want) {
t.Errorf("set.Diff() = %v, want %v", got, tt.want)
Expand Down Expand Up @@ -315,7 +323,8 @@ func Test_set_SymmetricDiff(t *testing.T) {
newSet("2", 3, 4),
},
}
for _, tt := range tests {
for i := range tests {
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
if got := tt.a.SymmetricDiff(tt.b); !got.Equal(tt.want) {
t.Errorf("set.SymmetricDiff() = %v, want %v", got, tt.want)
Expand Down Expand Up @@ -350,7 +359,8 @@ func Test_set_Unite(t *testing.T) {
newSet(1, "2", 3, 4),
},
}
for _, tt := range tests {
for i := range tests {
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
if got := tt.a.Unite(tt.b); !got.Equal(tt.want) {
t.Errorf("set.Unite() = %v, want %v", got, tt.want)
Expand Down Expand Up @@ -385,7 +395,8 @@ func Test_set_Intersect(t *testing.T) {
newSet(1),
},
}
for _, tt := range tests {
for i := range tests {
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
if got := tt.a.Intersect(tt.b); !got.Equal(tt.want) {
t.Errorf("set.Intersect() = %v, want %v", got, tt.want)
Expand All @@ -404,7 +415,8 @@ func Test_set_Range(t *testing.T) {
newSet(1, 2, 3, 4),
},
}
for _, tt := range tests {
for i := range tests {
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
seen := make([]interface{}, 0, tt.a.Len())
tt.a.Range(func(index int, elem interface{}) bool {
Expand Down
6 changes: 4 additions & 2 deletions set_to_slice_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ func Test_set_ToStrings(t *testing.T) {
}{
{"", newSet(1, 2, "str", "str1"), []string{"str", "str1"}},
}
for _, tt := range tests {
for i := range tests {
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
got := tt.s.ToStrings()
sort.Strings(got)
Expand All @@ -50,7 +51,8 @@ func Test_set_ToInts(t *testing.T) {
}{
{"", newSet(1, 2, "str", "str1"), []int{1, 2}},
}
for _, tt := range tests {
for i := range tests {
tt := tests[i]
t.Run(tt.name, func(t *testing.T) {
got := tt.s.ToInts()
sort.Ints(got)
Expand Down

0 comments on commit 8dc5973

Please sign in to comment.