Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

don't reuse the encoder in the integration tests #18

Merged
merged 1 commit into from
Aug 8, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 22 additions & 26 deletions integrationtests/self/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,10 @@ import (
)

var _ = Describe("Self Tests", func() {
var (
// for the encoder
output *bytes.Buffer
encoder *qpack.Encoder
// for the decoder
headerFields []qpack.HeaderField
decoder *qpack.Decoder
)

BeforeEach(func() {
output = &bytes.Buffer{}
encoder = qpack.NewEncoder(output)
headerFields = nil
decoder = qpack.NewDecoder(func(hf qpack.HeaderField) {
headerFields = append(headerFields, hf)
})
})
getEncoder := func() (*qpack.Encoder, *bytes.Buffer) {
output := &bytes.Buffer{}
return qpack.NewEncoder(output), output
}

randomString := func(l int) string {
const charset = "abcdefghijklmnopqrstuvwxyz" +
Expand All @@ -45,8 +32,9 @@ var _ = Describe("Self Tests", func() {
Name: randomString(15),
Value: randomString(15),
}
encoder, output := getEncoder()
Expect(encoder.WriteField(hf)).To(Succeed())
_, err := decoder.Write(output.Bytes())
headerFields, err := qpack.NewDecoder(nil).DecodeFull(output.Bytes())
Expect(err).ToNot(HaveOccurred())
Expect(headerFields).To(Equal([]qpack.HeaderField{hf}))
})
Expand All @@ -57,10 +45,11 @@ var _ = Describe("Self Tests", func() {
{Name: "lorem", Value: "ipsum"},
{Name: randomString(15), Value: randomString(20)},
}
encoder, output := getEncoder()
for _, hf := range hfs {
Expect(encoder.WriteField(hf)).To(Succeed())
}
_, err := decoder.Write(output.Bytes())
headerFields, err := qpack.NewDecoder(nil).DecodeFull(output.Bytes())
Expect(err).ToNot(HaveOccurred())
Expect(headerFields).To(Equal(hfs))
})
Expand All @@ -71,6 +60,7 @@ var _ = Describe("Self Tests", func() {
{Name: "lorem", Value: "ipsum"},
{Name: randomString(15), Value: randomString(20)},
}
encoder, output := getEncoder()
for _, hf := range hfs1 {
Expect(encoder.WriteField(hf)).To(Succeed())
}
Expand All @@ -81,6 +71,8 @@ var _ = Describe("Self Tests", func() {
}
req2 := append([]byte{}, output.Bytes()...)

var headerFields []qpack.HeaderField
decoder := qpack.NewDecoder(func(hf qpack.HeaderField) { headerFields = append(headerFields, hf) })
_, err := decoder.Write(req1)
Expect(err).ToNot(HaveOccurred())
Expect(headerFields).To(Equal(hfs1))
Expand All @@ -105,10 +97,10 @@ var _ = Describe("Self Tests", func() {
}

check := func(encoded []byte, hf qpack.HeaderField) {
hfs, err := decoder.DecodeFull(encoded)
headerFields, err := qpack.NewDecoder(nil).DecodeFull(encoded)
ExpectWithOffset(1, err).ToNot(HaveOccurred())
Expect(hfs).To(HaveLen(1))
Expect(hfs[0]).To(Equal(hf))
ExpectWithOffset(1, headerFields).To(HaveLen(1))
ExpectWithOffset(1, headerFields[0]).To(Equal(hf))
}

// use an entry with a value, for example "set-cookie"
Expand All @@ -120,10 +112,11 @@ var _ = Describe("Self Tests", func() {
break
}
}
encoder, output := getEncoder()
Expect(encoder.WriteField(hf)).To(Succeed())
encodedLen := output.Len()
check(output.Bytes(), hf)
output.Reset()
encoder, output = getEncoder()
oldName := hf.Name
hf.Name = replaceRandomCharacter(hf.Name)
Expect(encoder.WriteField(hf)).To(Succeed())
Expand All @@ -144,10 +137,11 @@ var _ = Describe("Self Tests", func() {
break
}
}
encoder, output := getEncoder()
Expect(encoder.WriteField(hf)).To(Succeed())
encodedLen := output.Len()
check(output.Bytes(), hf)
output.Reset()
encoder, output = getEncoder()
oldName := hf.Name
hf.Name = replaceRandomCharacter(hf.Name)
Expect(encoder.WriteField(hf)).To(Succeed())
Expand All @@ -172,10 +166,11 @@ var _ = Describe("Self Tests", func() {
break
}
}
encoder, output := getEncoder()
Expect(encoder.WriteField(hf)).To(Succeed())
encodedLen := output.Len()
check(output.Bytes(), hf)
output.Reset()
encoder, output = getEncoder()
oldName := hf.Name
hf.Name = replaceRandomCharacter(hf.Name)
Expect(encoder.WriteField(hf)).To(Succeed())
Expand All @@ -196,10 +191,11 @@ var _ = Describe("Self Tests", func() {
break
}
}
encoder, output := getEncoder()
Expect(encoder.WriteField(hf)).To(Succeed())
encodedLen := output.Len()
check(output.Bytes(), hf)
output.Reset()
encoder, output = getEncoder()
oldValue := hf.Value
hf.Value = replaceRandomCharacter(hf.Value)
Expect(encoder.WriteField(hf)).To(Succeed())
Expand Down