Skip to content

Commit 6697460

Browse files
naglisnaglis
authored
Use functions from require (#287)
1 parent 84d2440 commit 6697460

26 files changed

+457
-461
lines changed

‎pkg/fetcher/fetcher_archive_test.go‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ import (
77
"github.com/readium/go-toolkit/pkg/manifest"
88
"github.com/readium/go-toolkit/pkg/mediatype"
99
"github.com/stretchr/testify/assert"
10+
"github.com/stretchr/testify/require"
1011
)
1112

1213
func withArchiveFetcher(t *testing.T, callback func(a *ArchiveFetcher)) {
1314
a, err := NewArchiveFetcherFromPath(t.Context(), "./testdata/epub.epub")
14-
assert.NoError(t, err)
15+
require.NoError(t, err)
1516
callback(a)
1617
}
1718

@@ -55,7 +56,7 @@ func TestArchiveFetcherLinks(t *testing.T) {
5556

5657
withArchiveFetcher(t, func(a *ArchiveFetcher) {
5758
links, err := a.Links(t.Context())
58-
assert.Nil(t, err)
59+
require.Nil(t, err)
5960

6061
mustLinks := make([]manifest.Link, len(mustContain))
6162
for i, l := range mustContain {
@@ -88,39 +89,35 @@ func TestArchiveFetcherRead(t *testing.T) {
8889
withArchiveFetcher(t, func(a *ArchiveFetcher) {
8990
resource := a.Get(t.Context(), manifest.Link{Href: manifest.MustNewHREFFromString("mimetype", false)})
9091
bin, err := resource.Read(t.Context(), 0, 0)
91-
if assert.Nil(t, err) {
92-
assert.Equal(t, "application/epub+zip", string(bin))
93-
}
92+
require.Nil(t, err)
93+
assert.Equal(t, "application/epub+zip", string(bin))
9494
var b bytes.Buffer
9595
n, err := resource.Stream(t.Context(), &b, 0, 0)
96-
if assert.Nil(t, err) {
97-
assert.EqualValues(t, 20, n)
98-
assert.Equal(t, "application/epub+zip", b.String())
99-
}
96+
require.Nil(t, err)
97+
assert.EqualValues(t, 20, n)
98+
assert.Equal(t, "application/epub+zip", b.String())
10099
})
101100
}
102101

103102
func TestArchiveFetcherReadRange(t *testing.T) {
104103
withArchiveFetcher(t, func(a *ArchiveFetcher) {
105104
resource := a.Get(t.Context(), manifest.Link{Href: manifest.MustNewHREFFromString("mimetype", false)})
106105
bin, err := resource.Read(t.Context(), 0, 10)
107-
if assert.Nil(t, err) {
108-
assert.Equal(t, "application", string(bin))
109-
}
106+
require.Nil(t, err)
107+
assert.Equal(t, "application", string(bin))
110108
var b bytes.Buffer
111109
n, err := resource.Stream(t.Context(), &b, 0, 10)
112-
if assert.Nil(t, err) {
113-
assert.EqualValues(t, 11, n)
114-
assert.Equal(t, "application", b.String())
115-
}
110+
require.Nil(t, err)
111+
assert.EqualValues(t, 11, n)
112+
assert.Equal(t, "application", b.String())
116113
})
117114
}
118115

119116
func TestArchiveFetcherComputingLength(t *testing.T) {
120117
withArchiveFetcher(t, func(a *ArchiveFetcher) {
121118
resource := a.Get(t.Context(), manifest.Link{Href: manifest.MustNewHREFFromString("mimetype", false)})
122119
length, err := resource.Length(t.Context())
123-
assert.Nil(t, err)
120+
require.Nil(t, err)
124121
assert.EqualValues(t, 20, length)
125122
})
126123
}

‎pkg/fetcher/fetcher_file_test.go‎

Lines changed: 41 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"github.com/readium/go-toolkit/pkg/manifest"
88
"github.com/readium/go-toolkit/pkg/mediatype"
99
"github.com/stretchr/testify/assert"
10+
"github.com/stretchr/testify/require"
1011
)
1112

1213
var testFileFetcher = &FileFetcher{
@@ -33,42 +34,37 @@ func TestFileFetcherReadNotFound(t *testing.T) {
3334
func TestFileFetcherHrefInMap(t *testing.T) {
3435
resource := testFileFetcher.Get(t.Context(), manifest.Link{Href: manifest.MustNewHREFFromString("file_href", false)})
3536
bin, err := resource.Read(t.Context(), 0, 0)
36-
if assert.Nil(t, err) {
37-
assert.Equal(t, "text", string(bin))
38-
}
37+
require.Nil(t, err)
38+
assert.Equal(t, "text", string(bin))
3939
var b bytes.Buffer
4040
n, err := resource.Stream(t.Context(), &b, 0, 0)
41-
if assert.Nil(t, err) {
42-
assert.EqualValues(t, 4, n)
43-
assert.Equal(t, "text", b.String())
44-
}
41+
require.Nil(t, err)
42+
assert.EqualValues(t, 4, n)
43+
assert.Equal(t, "text", b.String())
4544
}
4645

4746
func TestFileFetcherDirectoryFile(t *testing.T) {
4847
resource := testFileFetcher.Get(t.Context(), manifest.Link{Href: manifest.MustNewHREFFromString("dir_href/text1.txt", false)})
4948
bin, err := resource.Read(t.Context(), 0, 0)
50-
if assert.Nil(t, err) {
51-
assert.Equal(t, "text1", string(bin))
52-
}
49+
require.Nil(t, err)
50+
assert.Equal(t, "text1", string(bin))
5351
var b bytes.Buffer
5452
n, err := resource.Stream(t.Context(), &b, 0, 0)
55-
if assert.Nil(t, err) {
56-
assert.EqualValues(t, 5, n)
57-
assert.Equal(t, "text1", b.String())
58-
}
53+
require.Nil(t, err)
54+
assert.EqualValues(t, 5, n)
55+
assert.Equal(t, "text1", b.String())
5956
}
6057

6158
func TestFileFetcherSubdirectoryFile(t *testing.T) {
6259
resource := testFileFetcher.Get(t.Context(), manifest.Link{Href: manifest.MustNewHREFFromString("dir_href/subdirectory/text2.txt", false)})
6360
bin, err := resource.Read(t.Context(), 0, 0)
64-
assert.Nil(t, err)
61+
require.Nil(t, err)
6562
assert.Equal(t, "text2", string(bin))
6663
var b bytes.Buffer
6764
n, err := resource.Stream(t.Context(), &b, 0, 0)
68-
if assert.Nil(t, err) {
69-
assert.EqualValues(t, 5, n)
70-
assert.Equal(t, "text2", b.String())
71-
}
65+
require.Nil(t, err)
66+
assert.EqualValues(t, 5, n)
67+
assert.Equal(t, "text2", b.String())
7268
}
7369

7470
func TestFileFetcherDirectoryNotFound(t *testing.T) {
@@ -90,73 +86,63 @@ func TestFileFetcherDirectoryTraversalNotFound(t *testing.T) {
9086
func TestFileFetcherReadRange(t *testing.T) {
9187
resource := testFileFetcher.Get(t.Context(), manifest.Link{Href: manifest.MustNewHREFFromString("file_href", false)})
9288
bin, err := resource.Read(t.Context(), 0, 2)
93-
if assert.Nil(t, err) {
94-
assert.Equal(t, "tex", string(bin), "read data should be the first three bytes of the file")
95-
}
89+
require.Nil(t, err)
90+
assert.Equal(t, "tex", string(bin), "read data should be the first three bytes of the file")
9691

9792
var b bytes.Buffer
9893
n, err := resource.Stream(t.Context(), &b, 0, 2)
99-
if assert.Nil(t, err) {
100-
assert.EqualValues(t, 3, n)
101-
assert.Equal(t, "tex", b.String(), "read data should be the first three bytes of the file")
102-
}
94+
require.Nil(t, err)
95+
assert.EqualValues(t, 3, n)
96+
assert.Equal(t, "tex", b.String(), "read data should be the first three bytes of the file")
10397
}
10498

10599
func TestFileFetcherTwoRangesSameResource(t *testing.T) {
106100
resource := testFileFetcher.Get(t.Context(), manifest.Link{Href: manifest.MustNewHREFFromString("file_href", false)})
107101
bin, err := resource.Read(t.Context(), 0, 1)
108-
if assert.Nil(t, err) {
109-
assert.Equal(t, "te", string(bin))
110-
}
102+
require.Nil(t, err)
103+
assert.Equal(t, "te", string(bin))
111104
var b bytes.Buffer
112105
n, err := resource.Stream(t.Context(), &b, 0, 1)
113-
if assert.Nil(t, err) {
114-
assert.EqualValues(t, 2, n)
115-
assert.Equal(t, "te", b.String())
116-
}
106+
require.Nil(t, err)
107+
assert.EqualValues(t, 2, n)
108+
assert.Equal(t, "te", b.String())
117109

118110
bin, err = resource.Read(t.Context(), 1, 3)
119-
if assert.Nil(t, err) {
120-
assert.Equal(t, "ext", string(bin))
121-
}
111+
require.Nil(t, err)
112+
assert.Equal(t, "ext", string(bin))
122113
b.Reset()
123114
n, err = resource.Stream(t.Context(), &b, 1, 3)
124-
if assert.Nil(t, err) {
125-
assert.EqualValues(t, 3, n)
126-
assert.Equal(t, "ext", b.String())
127-
}
115+
require.Nil(t, err)
116+
assert.EqualValues(t, 3, n)
117+
assert.Equal(t, "ext", b.String())
128118
}
129119

130120
func TestFileFetcherOutOfRangeClamping(t *testing.T) {
131121
resource := testFileFetcher.Get(t.Context(), manifest.Link{Href: manifest.MustNewHREFFromString("file_href", false)})
132122
bin, err := resource.Read(t.Context(), -5, 60)
133-
if assert.Nil(t, err) {
134-
assert.Equal(t, "text", string(bin))
135-
}
123+
require.Nil(t, err)
124+
assert.Equal(t, "text", string(bin))
136125
var b bytes.Buffer
137126
n, err := resource.Stream(t.Context(), &b, -5, 60)
138-
if assert.Nil(t, err) {
139-
assert.EqualValues(t, 4, n)
140-
assert.Equal(t, "text", b.String())
141-
}
127+
require.Nil(t, err)
128+
assert.EqualValues(t, 4, n)
129+
assert.Equal(t, "text", b.String())
142130
}
143131

144132
func TestFileFetcherDecreasingRange(t *testing.T) {
145133
resource := testFileFetcher.Get(t.Context(), manifest.Link{Href: manifest.MustNewHREFFromString("file_href", false)})
146134
_, err := resource.Read(t.Context(), 60, 20)
147-
if assert.Error(t, err) {
148-
assert.Equal(t, RangeNotSatisfiable(err.Cause), err, "range isn't satisfiable")
149-
}
135+
require.Error(t, err)
136+
assert.Equal(t, RangeNotSatisfiable(err.Cause), err, "range isn't satisfiable")
150137
_, err = resource.Stream(t.Context(), &bytes.Buffer{}, 60, 20)
151-
if assert.Error(t, err) {
152-
assert.Equal(t, RangeNotSatisfiable(err.Cause), err, "range isn't satisfiable")
153-
}
138+
require.Error(t, err)
139+
assert.Equal(t, RangeNotSatisfiable(err.Cause), err, "range isn't satisfiable")
154140
}
155141

156142
func TestFileFetcherComputingLength(t *testing.T) {
157143
resource := testFileFetcher.Get(t.Context(), manifest.Link{Href: manifest.MustNewHREFFromString("file_href", false)})
158144
length, err := resource.Length(t.Context())
159-
assert.Nil(t, err)
145+
require.Nil(t, err)
160146
assert.EqualValues(t, 4, length)
161147
}
162148

@@ -174,7 +160,7 @@ func TestFileFetcherFileNotFoundLength(t *testing.T) {
174160

175161
func TestFileFetcherLinks(t *testing.T) {
176162
links, err := testFileFetcher.Links(t.Context())
177-
assert.Nil(t, err)
163+
require.Nil(t, err)
178164

179165
mustContain := manifest.LinkList{{
180166
Href: manifest.MustNewHREFFromString("dir_href/subdirectory/hello.mp3", false),

‎pkg/internal/util/css_test.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66

77
"github.com/andybalholm/cascadia"
88
"github.com/stretchr/testify/assert"
9+
"github.com/stretchr/testify/require"
910
"golang.org/x/net/html"
1011
)
1112

@@ -30,15 +31,11 @@ const testDoc = `<?xml version="1.0" encoding="UTF-8"?>
3031

3132
func TestCSSSelector(t *testing.T) {
3233
doc, err := html.Parse(strings.NewReader(testDoc))
33-
if !assert.NoError(t, err) {
34-
return
35-
}
34+
require.NoError(t, err)
3635

3736
qf := func(query string) string {
3837
n := cascadia.Query(doc, cascadia.MustCompile(query))
39-
if !assert.NotNil(t, n) {
40-
t.FailNow()
41-
}
38+
require.NotNil(t, n)
4239
return CSSSelector(n)
4340
}
4441

‎pkg/manifest/a11y_test.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@ import (
55
"testing"
66

77
"github.com/stretchr/testify/assert"
8+
"github.com/stretchr/testify/require"
89
)
910

1011
func TestA11yUnmarshalMinimalJSON(t *testing.T) {
1112
var m A11y
12-
assert.NoError(t, json.Unmarshal([]byte("{}"), &m))
13+
require.NoError(t, json.Unmarshal([]byte("{}"), &m))
1314
assert.Equal(t, NewA11y(), m, "unmarshalled JSON object should be equal to A11y object")
1415
}
1516

1617
func TestA11yUnmarshalFullJSON(t *testing.T) {
1718
var m A11y
18-
assert.NoError(t, json.Unmarshal([]byte(`{
19+
require.NoError(t, json.Unmarshal([]byte(`{
1920
"conformsTo": ["https://profile1", "https://profile2"],
2021
"certification": {
2122
"certifiedBy": "company1",
@@ -67,21 +68,21 @@ func TestA11yUnmarshalFullJSON(t *testing.T) {
6768

6869
func TestA11yUnmarshalInvalidSummaryIsIgnored(t *testing.T) {
6970
var m A11y
70-
assert.NoError(t, json.Unmarshal([]byte(`{"summary": ["sum1", "sum2"]}`), &m))
71+
require.NoError(t, json.Unmarshal([]byte(`{"summary": ["sum1", "sum2"]}`), &m))
7172
assert.Equal(t, NewA11y(), m, "unmarshalled JSON object should be equal to A11y object")
7273
}
7374

7475
func TestA11yUnmarshalConformsToString(t *testing.T) {
7576
var m A11y
76-
assert.NoError(t, json.Unmarshal([]byte(`{"conformsTo": "http://www.idpf.org/epub/a11y/accessibility-20170105.html#wcag-a"}`), &m))
77+
require.NoError(t, json.Unmarshal([]byte(`{"conformsTo": "http://www.idpf.org/epub/a11y/accessibility-20170105.html#wcag-a"}`), &m))
7778
var e A11y = NewA11y()
7879
e.ConformsTo = []A11yProfile{EPUBA11y10WCAG20A}
7980
assert.Equal(t, e, m, "unmarshalled JSON object should be equal to A11y object")
8081
}
8182

8283
func TestA11yUnmarshalConformsToArray(t *testing.T) {
8384
var m A11y
84-
assert.NoError(t, json.Unmarshal([]byte(`{"conformsTo": ["http://www.idpf.org/epub/a11y/accessibility-20170105.html#wcag-a", "https://profile2"]}`), &m))
85+
require.NoError(t, json.Unmarshal([]byte(`{"conformsTo": ["http://www.idpf.org/epub/a11y/accessibility-20170105.html#wcag-a", "https://profile2"]}`), &m))
8586
var e A11y = NewA11y()
8687
e.ConformsTo = []A11yProfile{EPUBA11y10WCAG20A, "https://profile2"}
8788
assert.Equal(t, e, m, "unmarshalled JSON object should be equal to A11y object")
@@ -107,7 +108,7 @@ func TestA11ySortConformsTo(t *testing.T) {
107108

108109
func TestA11yUnmarshalAccessModeSufficientContainingBothStringsAndArrays(t *testing.T) {
109110
var m A11y
110-
assert.NoError(t, json.Unmarshal([]byte(`{"accessModeSufficient": ["auditory", ["visual", "tactile"], [], "visual"]}`), &m))
111+
require.NoError(t, json.Unmarshal([]byte(`{"accessModeSufficient": ["auditory", ["visual", "tactile"], [], "visual"]}`), &m))
111112
var e A11y = NewA11y()
112113
e.AccessModesSufficient = [][]A11yPrimaryAccessMode{
113114
{A11yPrimaryAccessModeAuditory},
@@ -127,7 +128,7 @@ func TestA11yMarshalMinimalJSON(t *testing.T) {
127128
Exemptions: []A11yExemption{},
128129
}
129130
data, err := json.Marshal(m)
130-
assert.NoError(t, err)
131+
require.NoError(t, err)
131132
assert.Equal(t, data, []byte(`{}`), "unmarshalled JSON object should be equal to A11y object")
132133
}
133134

@@ -169,7 +170,7 @@ func TestA11yMarshalFullJSON(t *testing.T) {
169170
},
170171
}
171172
data, err := json.Marshal(m)
172-
assert.NoError(t, err)
173+
require.NoError(t, err)
173174
assert.Equal(
174175
t,
175176
data,

0 commit comments

Comments
 (0)