👔 up: arr,byte - update and add more unit test cases

arrutil/check.go

@@ -15,12 +15,11 @@ func SliceHas[T comdef.ScalarType](slice []T, val T) bool {
 			return true
 		}
 	}
-
 	return false
 }
 
-// IntsHas check the []int contains the given value
-func IntsHas(ints []int, val int) bool {
+// IntsHas check the []comdef.Integer contains the given value
+func IntsHas[T comdef.Integer](ints []T, val T) bool {
 	for _, ele := range ints {
 		if ele == val {
 			return true
@@ -39,9 +38,6 @@ func Int64sHas(ints []int64, val int64) bool {
 	return false
 }
 
-// InStrings alias of StringsHas()
-func InStrings(elem string, ss []string) bool { return StringsHas(ss, elem) }
-
 // StringsHas check the []string contains the given element
 func StringsHas(ss []string, val string) bool {
 	for _, ele := range ss {
@@ -52,6 +48,9 @@ func StringsHas(ss []string, val string) bool {
 	return false
 }
 
+// InStrings alias of StringsHas()
+func InStrings(elem string, ss []string) bool { return StringsHas(ss, elem) }
+
 // NotIn check the given value whether not in the list
 func NotIn[T comdef.ScalarType](value T, list []T) bool {
 	return !In(value, list)

arrutil/check_test.go

@@ -26,6 +26,10 @@ func TestIntsHas(t *testing.T) {
 	assert.True(t, arrutil.IntsHas(ints, 2))
 	assert.True(t, arrutil.IntsHas(ints, 5))
 	assert.False(t, arrutil.IntsHas(ints, 3))
+
+	uints := []uint{2, 4, 5}
+	assert.True(t, arrutil.IntsHas(uints, 2))
+	assert.False(t, arrutil.IntsHas(uints, 3))
 }
 
 func TestInt64sHas(t *testing.T) {

arrutil/convert_test.go

@@ -91,6 +91,9 @@ func TestAnyToSlice(t *testing.T) {
 	sl, err := arrutil.AnyToSlice([]int{1, 2})
 	is.NoErr(err)
 	is.Eq("[]interface {}{1, 2}", fmt.Sprintf("%#v", sl))
+
+	_, err = arrutil.AnyToSlice(123)
+	is.Err(err)
 }
 
 func TestConvType(t *testing.T) {

byteutil/buffer.go

@@ -6,11 +6,13 @@ import (
 )
 
 // Buffer wrap and extends the bytes.Buffer, add some useful methods
+// and implements the io.Writer, io.Closer and stdio.Flusher interfaces
 type Buffer struct {
 	bytes.Buffer
 	// custom error for testing
 	CloseErr error
 	FlushErr error
+	SyncErr  error
 }
 
 // NewBuffer instance
@@ -117,3 +119,8 @@ func (b *Buffer) Close() error {
 func (b *Buffer) Flush() error {
 	return b.FlushErr
 }
+
+// Sync anf flush buffer
+func (b *Buffer) Sync() error {
+	return b.SyncErr
+}

byteutil/buffer_test.go

@@ -26,6 +26,7 @@ func TestBuffer_WriteAny(t *testing.T) {
 
 	assert.NoErr(t, buf.Close())
 	assert.NoErr(t, buf.Flush())
+	assert.NoErr(t, buf.Sync())
 
 	buf.WriteStr1Nl("abc")
 	assert.Eq(t, "abc\n", buf.ResetAndGet())

byteutil/pool.go

@@ -13,14 +13,14 @@ package byteutil
 // from https://github.com/minio/minio/blob/master/internal/bpool/bpool.go
 type ChanPool struct {
 	c    chan []byte
-	w    int
-	wcap int
+	w    int // init byte width
+	wcap int // set byte cap
 }
 
 // NewChanPool instance
-func NewChanPool(maxSize int, width int, capWidth int) *ChanPool {
+func NewChanPool(chSize int, width int, capWidth int) *ChanPool {
 	return &ChanPool{
-		c:    make(chan []byte, maxSize),
+		c:    make(chan []byte, chSize),
 		w:    width,
 		wcap: capWidth,
 	}
@@ -30,8 +30,7 @@ func NewChanPool(maxSize int, width int, capWidth int) *ChanPool {
 // available in the pool.
 func (bp *ChanPool) Get() (b []byte) {
 	select {
-	case b = <-bp.c:
-	// reuse existing buffer
+	case b = <-bp.c: // reuse existing buffer
 	default:
 		// create new buffer
 		if bp.wcap > 0 {

byteutil/pool_test.go

@@ -1,6 +1,7 @@
 package byteutil_test
 
 import (
+	"sync"
 	"testing"
 
 	"github.com/gookit/goutil/byteutil"
@@ -15,4 +16,22 @@ func TestNewChanPool(t *testing.T) {
 
 	p.Put([]byte("abc"))
 	assert.Equal(t, []byte("abc"), p.Get())
+
+	// test concurrent get and put
+	t.Run("concurrent", func(t *testing.T) {
+		p := byteutil.NewChanPool(10, 8, 8)
+		wg := sync.WaitGroup{}
+
+		for i := 0; i < 100; i++ {
+			wg.Add(1)
+			go func(i int) {
+				p.Put([]byte("abc"))
+				assert.Equal(t, []byte("abc"), p.Get())
+				wg.Done()
+			}(i)
+		}
+
+		p.Put([]byte("abc"))
+		assert.Equal(t, []byte("abc"), p.Get())
+	})
 }