erius/shad-go
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'genericsum' into 'master'

Browse source 
Move tests to _test package in genericsum and treeiter

See merge request slon/shad-go-private!67
This commit is contained in:
Kositsyn Pavel 2022-04-08 11:48:34 +00:00
commit c367daddbf
4 changed files with 43 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
genericsum/genericsum.go
View file

@ -22,10 +22,6 @@ func MergeChans(chs ...<-chan int) <-chan int {
panic("implement me") panic("implement me")
} }
func MergeChans(chs ...<-chan int) <-chan int {
panic("implement me")
}
func IsHermitianMatrix(m [][]int) bool { func IsHermitianMatrix(m [][]int) bool {
panic("implement me") panic("implement me")
} }

61
genericsum/genericsum_test.go
View file

@ -1,4 +1,4 @@
package genericsum package genericsum_test
import ( import (
"context" "context"
@ -7,75 +7,76 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gitlab.com/slon/shad-go/genericsum"
"go.uber.org/goleak" "go.uber.org/goleak"
) )
func TestMin(t *testing.T) { func TestMin(t *testing.T) {
assert.Equal(t, 10, Min(10, 20)) assert.Equal(t, 10, genericsum.Min(10, 20))
assert.Equal(t, -10, Min(20, -10)) assert.Equal(t, -10, genericsum.Min(20, -10))
assert.Equal(t, 1.0, Min(1.0, 2.0)) assert.Equal(t, 1.0, genericsum.Min(1.0, 2.0))
assert.Equal(t, int64(10), Min(int64(10), 20)) assert.Equal(t, int64(10), genericsum.Min(int64(10), 20))
assert.Equal(t, "abc", Min("def", "abc")) assert.Equal(t, "abc", genericsum.Min("def", "abc"))
type myString string type myString string
assert.Equal(t, myString("abc"), Min(myString("def"), myString("abc"))) assert.Equal(t, myString("abc"), genericsum.Min(myString("def"), myString("abc")))
} }
func TestSortSlice(t *testing.T) { func TestSortSlice(t *testing.T) {
t.Run("ints", func(t *testing.T) { t.Run("ints", func(t *testing.T) {
inputs, expected := []int{3, 6, 2, 4, 5, 1}, []int{1, 2, 3, 4, 5, 6} inputs, expected := []int{3, 6, 2, 4, 5, 1}, []int{1, 2, 3, 4, 5, 6}
SortSlice(inputs) genericsum.SortSlice(inputs)
assert.Equal(t, expected, inputs) assert.Equal(t, expected, inputs)
}) })
t.Run("ints64", func(t *testing.T) { t.Run("ints64", func(t *testing.T) {
inputs, expected := []int64{3, 6, 2, 4, 5, 1}, []int64{1, 2, 3, 4, 5, 6} inputs, expected := []int64{3, 6, 2, 4, 5, 1}, []int64{1, 2, 3, 4, 5, 6}
SortSlice(inputs) genericsum.SortSlice(inputs)
assert.Equal(t, expected, inputs) assert.Equal(t, expected, inputs)
}) })
t.Run("strings", func(t *testing.T) { t.Run("strings", func(t *testing.T) {
inputs, expected := []string{"d", "b", "ab", "a"}, []string{"a", "ab", "b", "d"} inputs, expected := []string{"d", "b", "ab", "a"}, []string{"a", "ab", "b", "d"}
SortSlice(inputs) genericsum.SortSlice(inputs)
assert.Equal(t, expected, inputs) assert.Equal(t, expected, inputs)
}) })
type myStringSlice []string type myStringSlice []string
t.Run("strings custom type", func(t *testing.T) { t.Run("strings custom type", func(t *testing.T) {
inputs, expected := myStringSlice([]string{"d", "b", "ab", "a"}), myStringSlice([]string{"a", "ab", "b", "d"}) inputs, expected := myStringSlice([]string{"d", "b", "ab", "a"}), myStringSlice([]string{"a", "ab", "b", "d"})
SortSlice(inputs) genericsum.SortSlice(inputs)
assert.Equal(t, expected, inputs) assert.Equal(t, expected, inputs)
}) })
} }
func TestMapsEqual(t *testing.T) { func TestMapsEqual(t *testing.T) {
assert.True(t, MapsEqual(map[string]string{"1": "3", "2": "4"}, map[string]string{"2": "4", "1": "3"})) assert.True(t, genericsum.MapsEqual(map[string]string{"1": "3", "2": "4"}, map[string]string{"2": "4", "1": "3"}))
var i int var i int
assert.False(t, MapsEqual(map[string]*int{"1": &i, "2": nil}, map[string]*int{"1": &i})) assert.False(t, genericsum.MapsEqual(map[string]*int{"1": &i, "2": nil}, map[string]*int{"1": &i}))
assert.False(t, MapsEqual(map[string]*int{"1": &i}, map[string]*int{"1": &i, "2": nil})) assert.False(t, genericsum.MapsEqual(map[string]*int{"1": &i}, map[string]*int{"1": &i, "2": nil}))
assert.False(t, MapsEqual(map[string]*int{"1": new(int)}, map[string]*int{"1": new(int)}), assert.False(t, genericsum.MapsEqual(map[string]*int{"1": new(int)}, map[string]*int{"1": new(int)}),
"different pointers") "different pointers")
type k struct { type k struct {
i int i int
s string s string
} }
assert.True(t, MapsEqual(map[k]k{{10, "abc"}: {20, "def"}}, map[k]k{{10, "abc"}: {20, "def"}})) assert.True(t, genericsum.MapsEqual(map[k]k{{10, "abc"}: {20, "def"}}, map[k]k{{10, "abc"}: {20, "def"}}))
type myMap map[int]int type myMap map[int]int
assert.True(t, MapsEqual(myMap(nil), myMap(nil)), "type aliases must also be ok") assert.True(t, genericsum.MapsEqual(myMap(nil), myMap(nil)), "type aliases must also be ok")
} }
func TestSliceContains(t *testing.T) { func TestSliceContains(t *testing.T) {
assert.True(t, SliceContains([]int{5, 9, 12}, 5)) assert.True(t, genericsum.SliceContains([]int{5, 9, 12}, 5))
assert.False(t, SliceContains([]int{5, 9, 12}, 7)) assert.False(t, genericsum.SliceContains([]int{5, 9, 12}, 7))
type k struct{ i, j int } type k struct{ i, j int }
assert.True(t, SliceContains([]k{{1, 2}, {5, 7}, {9, 12}}, k{5, 7})) assert.True(t, genericsum.SliceContains([]k{{1, 2}, {5, 7}, {9, 12}}, k{5, 7}))
type mySlice []k type mySlice []k
assert.True(t, SliceContains(mySlice{{1, 2}, {5, 7}, {9, 12}}, k{5, 7})) assert.True(t, genericsum.SliceContains(mySlice{{1, 2}, {5, 7}, {9, 12}}, k{5, 7}))
} }
func TestMergeChansTypes(t *testing.T) { func TestMergeChansTypes(t *testing.T) {
@ -89,7 +90,7 @@ func TestMergeChansTypes(t *testing.T) {
chanArgs[i] = chans[i] chanArgs[i] = chans[i]
} }
ch := MergeChans(chanArgs...) ch := genericsum.MergeChans(chanArgs...)
for _, ch := range chans { for _, ch := range chans {
close(ch) close(ch)
@ -111,7 +112,7 @@ func TestMergeChansTypes(t *testing.T) {
chanArgs[i] = chans[i] chanArgs[i] = chans[i]
} }
ch := MergeChans(chanArgs...) ch := genericsum.MergeChans(chanArgs...)
for _, ch := range chans { for _, ch := range chans {
close(ch) close(ch)
@ -134,7 +135,7 @@ func TestMergeChans(t *testing.T) {
chanArgs[i] = chans[i] chanArgs[i] = chans[i]
} }
ch := MergeChans(chanArgs...) ch := genericsum.MergeChans(chanArgs...)
chans[5] <- 10 chans[5] <- 10
assert.Equal(t, 10, <-ch) assert.Equal(t, 10, <-ch)
chans[1] <- 5 chans[1] <- 5
@ -177,31 +178,31 @@ Loop:
} }
func TestIsHermitianMatrix(t *testing.T) { func TestIsHermitianMatrix(t *testing.T) {
assert.True(t, IsHermitianMatrix([][]int{ assert.True(t, genericsum.IsHermitianMatrix([][]int{
{1, 7, 9}, {1, 7, 9},
{7, 2, 12}, {7, 2, 12},
{9, 12, 19}, {9, 12, 19},
})) }))
assert.False(t, IsHermitianMatrix([][]int{ assert.False(t, genericsum.IsHermitianMatrix([][]int{
{1, 12, 8}, {1, 12, 8},
{3, 4, 7}, {3, 4, 7},
{8, 7, 11}, {8, 7, 11},
})) }))
assert.True(t, IsHermitianMatrix([][]complex64{ assert.True(t, genericsum.IsHermitianMatrix([][]complex64{
{1, 3 + 2i}, {1, 3 + 2i},
{3 - 2i, 4}, {3 - 2i, 4},
})) }))
assert.True(t, IsHermitianMatrix([][]complex128{ assert.True(t, genericsum.IsHermitianMatrix([][]complex128{
{1, 3 + 2i, 9 - 1i}, {1, 3 + 2i, 9 - 1i},
{3 - 2i, 5, 7 - 3i}, {3 - 2i, 5, 7 - 3i},
{9 + 1i, 7 + 3i, 19}, {9 + 1i, 7 + 3i, 19},
})) }))
assert.False(t, IsHermitianMatrix([][]complex64{ assert.False(t, genericsum.IsHermitianMatrix([][]complex64{
{1 + 1i, 3 + 2i}, {1 + 1i, 3 + 2i},
{3 - 2i, 4}, {3 - 2i, 4},
})) }))
first, second := [][]int{{1, 2}, {3, 4}}, [][]int{{1, 2}, {3, 4}} first, second := [][]int{{1, 2}, {3, 4}}, [][]int{{1, 2}, {3, 4}}
assert.False(t, IsHermitianMatrix(first)) assert.False(t, genericsum.IsHermitianMatrix(first))
assert.Equal(t, second, first, "shouldn't change matrix in the method") assert.Equal(t, second, first, "shouldn't change matrix in the method")
} }

10
treeiter/treeiter_example_test.go
View file

@ -1,6 +1,10 @@
package treeiter package treeiter_test
import "fmt" import (
"fmt"
"gitlab.com/slon/shad-go/treeiter"
)
func ExampleDoInOrder() { func ExampleDoInOrder() {
tree := &ValuesNode[string]{ tree := &ValuesNode[string]{
@ -13,7 +17,7 @@ func ExampleDoInOrder() {
}, },
} }
DoInOrder(tree, func(t *ValuesNode[string]) { treeiter.DoInOrder(tree, func(t *ValuesNode[string]) {
fmt.Println(t.value) fmt.Println(t.value)
}) })

9
treeiter/treeiter_test.go
View file

@ -1,9 +1,10 @@
package treeiter package treeiter_test
import ( import (
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gitlab.com/slon/shad-go/treeiter"
) )
type ValuesNode[T any] struct { type ValuesNode[T any] struct {
@ -29,14 +30,14 @@ func (c *Collector[T]) Collect(tree *ValuesNode[T]) {
func TestInOrderNil(t *testing.T) { func TestInOrderNil(t *testing.T) {
var collector Collector[any] var collector Collector[any]
DoInOrder(nil, collector.Collect) treeiter.DoInOrder(nil, collector.Collect)
} }
func TestInOrderIntTree(t *testing.T) { func TestInOrderIntTree(t *testing.T) {
root := &ValuesNode[int]{value: 1} root := &ValuesNode[int]{value: 1}
collector := Collector[int]{} collector := Collector[int]{}
DoInOrder(root, collector.Collect) treeiter.DoInOrder(root, collector.Collect)
assert.Equal(t, []*ValuesNode[int]{{value: 1}}, collector.nodes) assert.Equal(t, []*ValuesNode[int]{{value: 1}}, collector.nodes)
} }
@ -64,7 +65,7 @@ func TestInOrderStringTree(t *testing.T) {
} }
var collector Collector[string] var collector Collector[string]
DoInOrder(root, collector.Collect) treeiter.DoInOrder(root, collector.Collect)
assert.Equal(t, []*ValuesNode[string]{left, root, rightLeft, rightLeftRight, right}, collector.nodes) assert.Equal(t, []*ValuesNode[string]{left, root, rightLeft, rightLeftRight, right}, collector.nodes)
} }