test: add more tests (#1106)

* style: format code

* test: add more tests

* fix: staticcheck errors
master
Kevin Wan 3 years ago committed by GitHub
parent d1bfb5ef61
commit d1e702e8a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -23,6 +23,7 @@ func NewResourceManager() *ResourceManager {
} }
// Close closes the manager. // Close closes the manager.
// Don't use the ResourceManager after Close() called.
func (manager *ResourceManager) Close() error { func (manager *ResourceManager) Close() error {
manager.lock.Lock() manager.lock.Lock()
defer manager.lock.Unlock() defer manager.lock.Unlock()
@ -33,8 +34,10 @@ func (manager *ResourceManager) Close() error {
be.Add(err) be.Add(err)
} }
} }
// reset resources
manager.resources = make(map[string]io.Closer) // release resources to avoid using it later
manager.resources = nil
return be.Err() return be.Err()
} }

@ -47,14 +47,28 @@ func TestResourceManager_GetResourceError(t *testing.T) {
func TestResourceManager_Close(t *testing.T) { func TestResourceManager_Close(t *testing.T) {
manager := NewResourceManager() manager := NewResourceManager()
for i := 0; i < 10; i++ { for i := 0; i < 10; i++ {
_, err := manager.GetResource("key", func() (io.Closer, error) { _, err := manager.GetResource("key", func() (io.Closer, error) {
return nil, errors.New("fail") return nil, errors.New("fail")
}) })
assert.NotNil(t, err) assert.NotNil(t, err)
} }
err := manager.Close()
assert.NoError(t, err) if assert.NoError(t, manager.Close()) {
assert.Equal(t, 0, len(manager.resources)) assert.Equal(t, 0, len(manager.resources))
} }
}
func TestResourceManager_UseAfterClose(t *testing.T) {
manager := NewResourceManager()
_, err := manager.GetResource("key", func() (io.Closer, error) {
return nil, errors.New("fail")
})
assert.NotNil(t, err)
if assert.NoError(t, manager.Close()) {
_, err = manager.GetResource("key", func() (io.Closer, error) {
return nil, errors.New("fail")
})
assert.NotNil(t, err)
}
}

@ -1,11 +1,14 @@
package syncx package syncx
import ( import (
"runtime"
"sync" "sync"
"sync/atomic"
"testing" "testing"
"time" "time"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/tal-tech/go-zero/core/lang"
) )
func TestTryLock(t *testing.T) { func TestTryLock(t *testing.T) {
@ -37,3 +40,31 @@ func TestSpinLockRace(t *testing.T) {
wait.Wait() wait.Wait()
assert.True(t, lock.TryLock()) assert.True(t, lock.TryLock())
} }
func TestSpinLock_TryLock(t *testing.T) {
var lock SpinLock
var count int32
var wait sync.WaitGroup
wait.Add(2)
sig := make(chan lang.PlaceholderType)
go func() {
lock.TryLock()
sig <- lang.Placeholder
atomic.AddInt32(&count, 1)
runtime.Gosched()
lock.Unlock()
wait.Done()
}()
go func() {
<-sig
lock.Lock()
atomic.AddInt32(&count, 1)
lock.Unlock()
wait.Done()
}()
wait.Wait()
assert.Equal(t, int32(2), atomic.LoadInt32(&count))
}

Loading…
Cancel
Save