simplify testing setup (#71)

Author: marten-seemann

.github/workflows/test.yml

@@ -10,6 +10,8 @@ jobs:
     name: Unit tests (Go ${{ matrix.go }})
     steps:
       - uses: actions/checkout@v5
+        with:
+          submodules: recursive
       - uses: actions/setup-go@v6
         with: 
           go-version: ${{ matrix.go }}
@@ -18,6 +20,8 @@ jobs:
         run: go run example/main.go
       - name: Run tests
         run: go test -v -cover -coverprofile coverage.txt -race -shuffle=on .
+      - name: Run interop tests
+        run: go test -shuffle=on -v ./interop
       - name: Upload coverage to Codecov
         if: ${{ !cancelled() }}
         uses: codecov/codecov-action@v5
@@ -27,25 +31,3 @@ jobs:
           files: coverage.txt
           env_vars: GO
           token: ${{ secrets.CODECOV_TOKEN }}
-  integration:
-    strategy:
-      fail-fast: false
-      matrix:
-        go: [ "1.24.x", "1.25.x" ]
-    runs-on: ubuntu-latest
-    name: Integration tests (Go ${{ matrix.go }})
-    steps:
-      - uses: actions/checkout@v5
-        with:
-          submodules: 'recursive'
-      - uses: actions/setup-go@v6
-        with: 
-          go-version: ${{ matrix.go }}
-      - run: go version
-      - name: Run interop tests
-        run: go test -v ./integrationtests/interop/
-      - name: Run integration tests
-        run: |
-          for i in {1..25}; do
-            go test -v -race -shuffle=on ./integrationtests/self
-          done

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "integrationtests/interop/qifs"]
-	path = integrationtests/interop/qifs
+[submodule "interop/qifs"]
+	path = interop/qifs
 	url = https://github.com/qpackers/qifs.git

integrationtests/interop/interop_test.go interop/interop_test.gointegrationtests/interop/interop_test.go renamed to interop/interop_test.go

@@ -1,7 +1,8 @@
-package self
+package qpack_test
 
 import (
 	"bytes"
+	"fmt"
 	"math/rand/v2"
 	"testing"
 	_ "unsafe" // for go:linkname
@@ -34,19 +35,7 @@ func getEncoder() (*qpack.Encoder, *bytes.Buffer) {
 	return qpack.NewEncoder(output), output
 }
 
-func TestEncodingAndDecodingSingleHeaderField(t *testing.T) {
-	hf := qpack.HeaderField{
-		Name:  randomString(15),
-		Value: randomString(15),
-	}
-	encoder, output := getEncoder()
-	require.NoError(t, encoder.WriteField(hf))
-	headerFields, err := qpack.NewDecoder(nil).DecodeFull(output.Bytes())
-	require.NoError(t, err)
-	require.Equal(t, []qpack.HeaderField{hf}, headerFields)
-}
-
-func TestEncodingAndDecodingMultipleHeaderFields(t *testing.T) {
+func TestEncodeDecode(t *testing.T) {
 	hfs := []qpack.HeaderField{
 		{Name: "foo", Value: "bar"},
 		{Name: "lorem", Value: "ipsum"},
@@ -61,34 +50,6 @@ func TestEncodingAndDecodingMultipleHeaderFields(t *testing.T) {
 	require.Equal(t, hfs, headerFields)
 }
 
-func TestEncodingAndDecodingMultipleRequests(t *testing.T) {
-	hfs1 := []qpack.HeaderField{{Name: "foo", Value: "bar"}}
-	hfs2 := []qpack.HeaderField{
-		{Name: "lorem", Value: "ipsum"},
-		{Name: randomString(15), Value: randomString(20)},
-	}
-	encoder, output := getEncoder()
-	for _, hf := range hfs1 {
-		require.NoError(t, encoder.WriteField(hf))
-	}
-	req1 := append([]byte{}, output.Bytes()...)
-	output.Reset()
-	for _, hf := range hfs2 {
-		require.NoError(t, encoder.WriteField(hf))
-	}
-	req2 := append([]byte{}, output.Bytes()...)
-
-	var headerFields []qpack.HeaderField
-	decoder := qpack.NewDecoder(func(hf qpack.HeaderField) { headerFields = append(headerFields, hf) })
-	_, err := decoder.Write(req1)
-	require.NoError(t, err)
-	require.Equal(t, hfs1, headerFields)
-	headerFields = nil
-	_, err = decoder.Write(req2)
-	require.NoError(t, err)
-	require.Equal(t, hfs2, headerFields)
-}
-
 // replace one character by a random character at a random position
 func replaceRandomCharacter(s string) string {
 	pos := rand.IntN(len(s))
@@ -105,13 +66,22 @@ func replaceRandomCharacter(s string) string {
 
 func check(t *testing.T, encoded []byte, hf qpack.HeaderField) {
 	t.Helper()
+
 	headerFields, err := qpack.NewDecoder(nil).DecodeFull(encoded)
 	require.NoError(t, err)
 	require.Len(t, headerFields, 1)
 	require.Equal(t, hf, headerFields[0])
 }
 
-func TestUsingStaticTableForFieldNamesWithoutValues(t *testing.T) {
+func TestStaticTableForFieldNamesWithoutValues(t *testing.T) {
+	for i := range 10 {
+		t.Run(fmt.Sprintf("run %d", i), func(t *testing.T) {
+			testStaticTableForFieldNamesWithoutValues(t)
+		})
+	}
+}
+
+func testStaticTableForFieldNamesWithoutValues(t *testing.T) {
 	var hf qpack.HeaderField
 	for {
 		if entry := staticTable[rand.IntN(len(staticTable))]; len(entry.Value) == 0 {
@@ -131,7 +101,15 @@ func TestUsingStaticTableForFieldNamesWithoutValues(t *testing.T) {
 	require.Greater(t, output.Len(), encodedLen)
 }
 
-func TestUsingStaticTableForFieldNamesWithCustomValues(t *testing.T) {
+func TestStaticTableForFieldNamesWithCustomValues(t *testing.T) {
+	for i := range 10 {
+		t.Run(fmt.Sprintf("run %d", i), func(t *testing.T) {
+			testStaticTableForFieldNamesWithCustomValues(t)
+		})
+	}
+}
+
+func testStaticTableForFieldNamesWithCustomValues(t *testing.T) {
 	var hf qpack.HeaderField
 	for {
 		if entry := staticTable[rand.IntN(len(staticTable))]; len(entry.Value) == 0 {
@@ -155,6 +133,14 @@ func TestUsingStaticTableForFieldNamesWithCustomValues(t *testing.T) {
 }
 
 func TestStaticTableForFieldNamesWithValues(t *testing.T) {
+	for i := range 10 {
+		t.Run(fmt.Sprintf("run %d", i), func(t *testing.T) {
+			testStaticTableForFieldNamesWithValues(t)
+		})
+	}
+}
+
+func testStaticTableForFieldNamesWithValues(t *testing.T) {
 	var hf qpack.HeaderField
 	for {
 		// Only use values with at least 2 characters.
@@ -180,6 +166,14 @@ func TestStaticTableForFieldNamesWithValues(t *testing.T) {
 }
 
 func TestStaticTableForFieldValues(t *testing.T) {
+	for i := range 10 {
+		t.Run(fmt.Sprintf("run %d", i), func(t *testing.T) {
+			testStaticTableForFieldValues(t)
+		})
+	}
+}
+
+func testStaticTableForFieldValues(t *testing.T) {
 	var hf qpack.HeaderField
 	for {
 		// Only use values with at least 2 characters.