Skip to content

Commit b6435f4

Browse files
committed
remove deprecated code
1 parent ef50673 commit b6435f4

File tree

3 files changed

+18
-27
lines changed

3 files changed

+18
-27
lines changed

env.go

-6
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ func New(t T) *EnvT {
5050
return env
5151
}
5252

53-
// NewEnv create EnvT from test
54-
// Deprecated: use New instead
55-
func NewEnv(t T) *EnvT {
56-
return New(t)
57-
}
58-
5953
func newEnv(t T, c *cache, m sync.Locker, scopes map[string]*scopeInfo) *EnvT {
6054
return &EnvT{
6155
t: t,

env_test.go

+18-17
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,6 @@ func Test_Env__NewEnv(t *testing.T) {
6666
})
6767
}
6868

69-
func testFailedFixture(env Env) {
70-
env.CacheResult(func() (*Result, error) {
71-
return nil, errors.New("test error")
72-
})
73-
}
74-
7569
func Test_Env_CacheResult(t *testing.T) {
7670
t.Run("Simple", func(t *testing.T) {
7771
tMock := &internal.TestMock{TestName: "mock", SkipGoexit: true}
@@ -166,6 +160,24 @@ func Test_Env_CacheResult(t *testing.T) {
166160
<-done
167161
requireEquals(t, 1, len(tMock.Fatals))
168162
})
163+
t.Run("check_unserializable_params", func(t *testing.T) {
164+
tMock := &internal.TestMock{TestName: "mock", SkipGoexit: true}
165+
e := newTestEnv(tMock)
166+
e.CacheResult(func() (*Result, error) {
167+
return nil, ErrSkipTest
168+
}, CacheOptions{CacheKey: func() {}})
169+
requireEquals(t, len(tMock.Fatals), 1)
170+
})
171+
t.Run("check_unreachable_code", func(t *testing.T) {
172+
tMock := &internal.TestMock{TestName: "mock", SkipGoexit: true}
173+
e := newTestEnv(tMock)
174+
requirePanic(t, func() {
175+
e.CacheResult(func() (*Result, error) {
176+
return nil, ErrSkipTest
177+
})
178+
})
179+
requireEquals(t, 1, tMock.SkipCount)
180+
})
169181
}
170182

171183
func Test_FixtureWrapper(t *testing.T) {
@@ -489,17 +501,6 @@ func Test_ScopeName(t *testing.T) {
489501
})
490502
}
491503

492-
func TestNewEnv(t *testing.T) {
493-
tm := &internal.TestMock{}
494-
tm.SkipGoexit = true
495-
New(tm)
496-
497-
NewEnv(tm)
498-
if len(tm.Fatals) == 0 {
499-
t.Fatal("bad double login between new and NewEnv")
500-
}
501-
}
502-
503504
func runUntilFatal(f func()) {
504505
stopped := make(chan bool)
505506
go func() {

result_generic.go

-4
This file was deleted.

0 commit comments

Comments
 (0)