Skip to content

Commit 73d0006

Browse files
authored
Merge pull request #58 from yutopp/feature/update_deps_and_add_tests
Feature/update deps and add tests
2 parents 9a7a975 + 39f0a77 commit 73d0006

23 files changed

+274
-227
lines changed

.golangci.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
linters:
2+
enable:
3+
- nilerr

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ check: fmt lint vet
99
.PHONY: download-ci-tools
1010
download-ci-tools:
1111
go install golang.org/x/tools/cmd/goimports@latest
12-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.50.1
13-
curl -sSfL https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh | sh -s v0.14.1
12+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.53.1
13+
curl -sSfL https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh | sh -s v0.14.2
1414

1515
.PHONY: fmt
1616
fmt:
@@ -19,11 +19,11 @@ fmt:
1919

2020
.PHONY: lint
2121
lint:
22-
./bin/golangci-lint run ./...
22+
./bin/golangci-lint run
2323

2424
.PHONY: lint-ci
2525
lint-ci:
26-
./bin/golangci-lint run ./... | \
26+
./bin/golangci-lint run | \
2727
./bin/reviewdog -f=golangci-lint -reporter=github-pr-review -filter-mode=nofilter
2828

2929
.PHONY: vet

chunk_header_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"bytes"
1212
"testing"
1313

14-
"github.com/stretchr/testify/assert"
14+
"github.com/stretchr/testify/require"
1515
)
1616

1717
func TestChunkBasicHeader(t *testing.T) {
@@ -116,8 +116,8 @@ func TestChunkBasicHeader(t *testing.T) {
116116

117117
buf := new(bytes.Buffer)
118118
err := encodeChunkBasicHeader(buf, tc.value)
119-
assert.Nil(t, err)
120-
assert.Equal(t, tc.binary, buf.Bytes())
119+
require.Nil(t, err)
120+
require.Equal(t, tc.binary, buf.Bytes())
121121
})
122122
}
123123
})
@@ -132,8 +132,8 @@ func TestChunkBasicHeader(t *testing.T) {
132132
r := bytes.NewReader(tc.binary)
133133
var mh chunkBasicHeader
134134
err := decodeChunkBasicHeader(r, nil, &mh)
135-
assert.Nil(t, err)
136-
assert.Equal(t, tc.value, &mh)
135+
require.Nil(t, err)
136+
require.Equal(t, tc.value, &mh)
137137
})
138138
}
139139
})
@@ -146,7 +146,7 @@ func TestChunkBasicHeaderError(t *testing.T) {
146146
fmt: 3,
147147
chunkStreamID: 65600,
148148
})
149-
assert.EqualError(t, err, "Chunk stream id is out of range: 65600 must be in range [2, 65599]")
149+
require.EqualError(t, err, "Chunk stream id is out of range: 65600 must be in range [2, 65599]")
150150
})
151151

152152
t.Run("Out of range(under)", func(t *testing.T) {
@@ -155,7 +155,7 @@ func TestChunkBasicHeaderError(t *testing.T) {
155155
fmt: 3,
156156
chunkStreamID: 1,
157157
})
158-
assert.EqualError(t, err, "Chunk stream id is out of range: 1 must be in range [2, 65599]")
158+
require.EqualError(t, err, "Chunk stream id is out of range: 1 must be in range [2, 65599]")
159159
})
160160
}
161161

@@ -367,8 +367,8 @@ func TestChunkMessageHeader(t *testing.T) {
367367

368368
buf := new(bytes.Buffer)
369369
err := encodeChunkMessageHeader(buf, tc.fmt, tc.value)
370-
assert.Nil(t, err)
371-
assert.Equal(t, tc.binary, buf.Bytes())
370+
require.Nil(t, err)
371+
require.Equal(t, tc.binary, buf.Bytes())
372372
})
373373
}
374374
})
@@ -383,8 +383,8 @@ func TestChunkMessageHeader(t *testing.T) {
383383
r := bytes.NewReader(tc.binary)
384384
var mh chunkMessageHeader
385385
err := decodeChunkMessageHeader(r, tc.fmt, nil, &mh)
386-
assert.Nil(t, err)
387-
assert.Equal(t, tc.value, &mh)
386+
require.Nil(t, err)
387+
require.Equal(t, tc.value, &mh)
388388
})
389389
}
390390
})

0 commit comments

Comments
 (0)