Skip to content

Commit a07222d

Browse files
committed
common bench cases for rw tests
1 parent b985e6d commit a07222d

File tree

3 files changed

+19
-23
lines changed

3 files changed

+19
-23
lines changed

read_test.go

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ import (
99
)
1010

1111
func TestReadHeader(t *testing.T) {
12-
for i, test := range append([]RWCase{
12+
for i, test := range append([]RWTestCase{
1313
{
1414
Data: bits("0000 0000 0 1111111 10000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000"),
1515
// _______________________________________________________________________
1616
// |
1717
// Length value
1818
Err: true,
1919
},
20-
}, RWCases...) {
20+
}, RWTestCases...) {
2121
t.Run(fmt.Sprintf("#%d", i), func(t *testing.T) {
2222
r := bytes.NewReader(test.Data)
2323
h, err := ReadHeader(r)
@@ -38,15 +38,7 @@ func TestReadHeader(t *testing.T) {
3838
}
3939

4040
func BenchmarkReadHeader(b *testing.B) {
41-
for i, bench := range []struct {
42-
label string
43-
header Header
44-
}{
45-
{"t", Header{OpCode: OpText, Fin: true}},
46-
{"t-m", Header{OpCode: OpText, Fin: true, Mask: NewMask()}},
47-
{"t-m-u16", Header{OpCode: OpText, Fin: true, Length: len16, Mask: NewMask()}},
48-
{"t-m-u64", Header{OpCode: OpText, Fin: true, Length: len64, Mask: NewMask()}},
49-
} {
41+
for i, bench := range RWBenchCases {
5042
b.Run(fmt.Sprintf("%s#%d", bench.label, i), func(b *testing.B) {
5143
bts := MustCompileFrame(Frame{Header: bench.header})
5244
rds := make([]io.Reader, b.N)

rw_test.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,25 @@ import (
55
"strings"
66
)
77

8-
type RWCase struct {
8+
type RWTestCase struct {
99
Data []byte
1010
Header Header
1111
Err bool
1212
}
1313

14-
var RWCases = []RWCase{
14+
type RWBenchCase struct {
15+
label string
16+
header Header
17+
}
18+
19+
var RWBenchCases = []RWBenchCase{
20+
{"t", Header{OpCode: OpText, Fin: true}},
21+
{"t-m", Header{OpCode: OpText, Fin: true, Mask: NewMask()}},
22+
{"t-m-u16", Header{OpCode: OpText, Fin: true, Length: len16, Mask: NewMask()}},
23+
{"t-m-u64", Header{OpCode: OpText, Fin: true, Length: len64, Mask: NewMask()}},
24+
}
25+
26+
var RWTestCases = []RWTestCase{
1527
{
1628
Data: bits("1 001 0001 0 1100100"),
1729
// _ ___ ____ _ _______

write_test.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
)
99

1010
func TestWriteHeader(t *testing.T) {
11-
for i, test := range RWCases {
11+
for i, test := range RWTestCases {
1212
t.Run(fmt.Sprintf("#%d", i), func(t *testing.T) {
1313
buf := &bytes.Buffer{}
1414
err := WriteHeader(buf, test.Header)
@@ -29,15 +29,7 @@ func TestWriteHeader(t *testing.T) {
2929
}
3030

3131
func BenchmarkWriteHeader(b *testing.B) {
32-
for _, bench := range []struct {
33-
label string
34-
header Header
35-
}{
36-
{"t", Header{OpCode: OpText, Fin: true}},
37-
{"t-m", Header{OpCode: OpText, Fin: true, Mask: NewMask()}},
38-
{"t-m-u16", Header{OpCode: OpText, Fin: true, Length: len16, Mask: NewMask()}},
39-
{"t-m-u64", Header{OpCode: OpText, Fin: true, Length: len64, Mask: NewMask()}},
40-
} {
32+
for i, bench := range RWBenchCases {
4133
b.Run(bench.label, func(b *testing.B) {
4234
for i := 0; i < b.N; i++ {
4335
if err := WriteHeader(ioutil.Discard, bench.header); err != nil {

0 commit comments

Comments
 (0)