From 7c8813ee6d39eeafbecaa07fae54fbb586faa61a Mon Sep 17 00:00:00 2001 From: Alliballibaba Date: Sat, 1 Nov 2025 22:37:35 +0100 Subject: [PATCH] Also moves php_headers test. --- internal/phpheaders/phpheaders_test.go | 22 ++++++++++++++++++++++ phpmainthread_test.go | 15 --------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 internal/phpheaders/phpheaders_test.go diff --git a/internal/phpheaders/phpheaders_test.go b/internal/phpheaders/phpheaders_test.go new file mode 100644 index 00000000..a741ec38 --- /dev/null +++ b/internal/phpheaders/phpheaders_test.go @@ -0,0 +1,22 @@ +package phpheaders + +import ( + "net/http/httptest" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestAllCommonHeadersAreCorrect(t *testing.T) { + fakeRequest := httptest.NewRequest("GET", "http://localhost", nil) + + for header, phpHeader := range CommonRequestHeaders { + // verify that common and uncommon headers return the same result + expectedPHPHeader := GetUnCommonHeader(header) + assert.Equal(t, phpHeader+"\x00", expectedPHPHeader, "header is not well formed: "+phpHeader) + + // net/http will capitalize lowercase headers, verify that headers are capitalized + fakeRequest.Header.Add(header, "foo") + assert.Contains(t, fakeRequest.Header, header, "header is not correctly capitalized: "+header) + } +} diff --git a/phpmainthread_test.go b/phpmainthread_test.go index 3cb7de13..81d94c2d 100644 --- a/phpmainthread_test.go +++ b/phpmainthread_test.go @@ -12,7 +12,6 @@ import ( "testing" "time" - "github.com/dunglas/frankenphp/internal/phpheaders" "github.com/dunglas/frankenphp/internal/state" "github.com/stretchr/testify/assert" ) @@ -237,20 +236,6 @@ func allPossibleTransitions(worker1Path string, worker2Path string) []func(*phpT } } -func TestAllCommonHeadersAreCorrect(t *testing.T) { - fakeRequest := httptest.NewRequest("GET", "http://localhost", nil) - - for header, phpHeader := range phpheaders.CommonRequestHeaders { - // verify that common and uncommon headers return the same result - expectedPHPHeader := phpheaders.GetUnCommonHeader(header) - assert.Equal(t, phpHeader+"\x00", expectedPHPHeader, "header is not well formed: "+phpHeader) - - // net/http will capitalize lowercase headers, verify that headers are capitalized - fakeRequest.Header.Add(header, "foo") - assert.Contains(t, fakeRequest.Header, header, "header is not correctly capitalized: "+header) - } -} - func TestCorrectThreadCalculation(t *testing.T) { maxProcs := runtime.GOMAXPROCS(0) * 2 oneWorkerThread := []workerOpt{{num: 1}}