Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit ef0384f

Browse files
authored
testlib coverage (#27)
1 parent c91b718 commit ef0384f

File tree

3 files changed

+20
-39
lines changed

3 files changed

+20
-39
lines changed

‎omniparser/samples/sampleutil/util_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@ import (
44
"testing"
55

66
"github.com/bradleyjkemp/cupaloy"
7-
"github.com/stretchr/testify/assert"
87

98
"github.com/jf-tech/omniparser/jsons"
109
"github.com/jf-tech/omniparser/testlib"
1110
)
1211

1312
func createTempFile(t *testing.T, content string) string {
14-
f, err := testlib.CreateTempFileWithContent("", "", content)
15-
assert.NoError(t, err)
16-
return f.Name()
13+
return testlib.CreateTempFileWithContent(t, "", "", content).Name()
1714
}
1815

1916
func TestSampleTestCommon(t *testing.T) {

‎testlib/tempfile.go‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,26 @@ package testlib
33
import (
44
"io/ioutil"
55
"os"
6+
"testing"
7+
8+
"github.com/stretchr/testify/assert"
69

710
"github.com/jf-tech/omniparser/strs"
811
)
912

1013
// For dir/pattern params check https://golang.org/pkg/io/ioutil/#TempFile
1114
// Caller is responsible for calling os.Remove on the returned file.
12-
func CreateTempFileWithContent(dir, pattern, content string) (*os.File, error) {
15+
func CreateTempFileWithContent(t*testing.T, dir, pattern, content string) *os.File {
1316
f, err := ioutil.TempFile(dir, pattern)
14-
if err != nil {
15-
return nil, err
16-
}
17-
17+
assert.NoError(t, err)
1818
// If content is empty, no need to write
1919
if !strs.IsStrNonBlank(content) {
2020
_ = f.Close()
21-
return f, nil
22-
}
23-
24-
if _, err := f.Write([]byte(content)); err != nil {
25-
_ = os.Remove(f.Name())
26-
return nil, err
27-
}
28-
29-
if err := f.Close(); err != nil {
30-
_ = os.Remove(f.Name())
31-
return nil, err
21+
return f
3222
}
33-
34-
return f, nil
23+
_, err = f.Write([]byte(content))
24+
assert.NoError(t, err)
25+
err = f.Close()
26+
assert.NoError(t, err)
27+
return f
3528
}

‎testlib/tempfile_test.go‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,16 @@ import (
88
"github.com/stretchr/testify/assert"
99
)
1010

11-
func TestCreateTempFileWithContent_BadDir(t *testing.T) {
12-
_, err := CreateTempFileWithContent("some_dir_does_not_exist", t.Name(), "success")
13-
assert.Error(t, err)
14-
}
15-
1611
func TestCreateTempFileWithContent_Success(t *testing.T) {
17-
tmp, err := CreateTempFileWithContent("", t.Name(), "success")
18-
assert.NoError(t, err)
19-
defer func() { assert.NoError(t, os.Remove(tmp.Name())) }()
20-
actual, err := ioutil.ReadFile(tmp.Name())
12+
tmpEmpty := CreateTempFileWithContent(t, "", t.Name(), "")
13+
defer func() { assert.NoError(t, os.Remove(tmpEmpty.Name())) }()
14+
actual, err := ioutil.ReadFile(tmpEmpty.Name())
2115
assert.NoError(t, err)
22-
assert.Equal(t, "success", string(actual))
23-
}
16+
assert.Equal(t, "", string(actual))
2417

25-
func TestCreateTempFileWithContent_EmptyContent(t *testing.T) {
26-
tmp, err := CreateTempFileWithContent("", t.Name(), "")
27-
assert.NoError(t, err)
28-
defer func() { assert.NoError(t, os.Remove(tmp.Name())) }()
29-
actual, err := ioutil.ReadFile(tmp.Name())
18+
tmpSuccess := CreateTempFileWithContent(t, "", t.Name(), "success")
19+
defer func() { assert.NoError(t, os.Remove(tmpSuccess.Name())) }()
20+
actual, err = ioutil.ReadFile(tmpSuccess.Name())
3021
assert.NoError(t, err)
31-
assert.Equal(t, "", string(actual))
22+
assert.Equal(t, "success", string(actual))
3223
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /