Skip to content

Commit b1bdce3

Browse files
committed
tests: simplify benchmarks code
1 parent c9ad9fc commit b1bdce3

1 file changed

Lines changed: 17 additions & 30 deletions

File tree

frankenphp_test.go

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -776,22 +776,17 @@ func ExampleExecuteScriptCLI() {
776776
}
777777

778778
func BenchmarkHelloWorld(b *testing.B) {
779-
if err := frankenphp.Init(frankenphp.WithLogger(slog.New(slog.NewTextHandler(io.Discard, nil)))); err != nil {
780-
panic(err)
781-
}
782-
defer frankenphp.Shutdown()
779+
require.NoError(b, frankenphp.Init())
780+
b.Cleanup(frankenphp.Shutdown)
781+
783782
cwd, _ := os.Getwd()
784783
testDataDir := cwd + "/testdata/"
785784

786785
handler := func(w http.ResponseWriter, r *http.Request) {
787786
req, err := frankenphp.NewRequestWithContext(r, frankenphp.WithRequestDocumentRoot(testDataDir, false))
788-
if err != nil {
789-
panic(err)
790-
}
787+
require.NoError(b, err)
791788

792-
if err := frankenphp.ServeHTTP(w, req); err != nil {
793-
panic(err)
794-
}
789+
require.NoError(b, frankenphp.ServeHTTP(w, req))
795790
}
796791

797792
req := httptest.NewRequest("GET", "http://example.com/index.php", nil)
@@ -803,21 +798,17 @@ func BenchmarkHelloWorld(b *testing.B) {
803798
}
804799

805800
func BenchmarkEcho(b *testing.B) {
806-
if err := frankenphp.Init(frankenphp.WithLogger(slog.New(slog.NewTextHandler(io.Discard, nil)))); err != nil {
807-
panic(err)
808-
}
809-
defer frankenphp.Shutdown()
801+
require.NoError(b, frankenphp.Init())
802+
b.Cleanup(frankenphp.Shutdown)
803+
810804
cwd, _ := os.Getwd()
811805
testDataDir := cwd + "/testdata/"
812806

813807
handler := func(w http.ResponseWriter, r *http.Request) {
814808
req, err := frankenphp.NewRequestWithContext(r, frankenphp.WithRequestDocumentRoot(testDataDir, false))
815-
if err != nil {
816-
panic(err)
817-
}
818-
if err := frankenphp.ServeHTTP(w, req); err != nil {
819-
panic(err)
820-
}
809+
require.NoError(b, err)
810+
811+
require.NoError(b, frankenphp.ServeHTTP(w, req))
821812
}
822813

823814
const body = `{
@@ -869,10 +860,9 @@ func BenchmarkEcho(b *testing.B) {
869860
}
870861

871862
func BenchmarkServerSuperGlobal(b *testing.B) {
872-
if err := frankenphp.Init(frankenphp.WithLogger(slog.New(slog.NewTextHandler(io.Discard, nil)))); err != nil {
873-
panic(err)
874-
}
875-
defer frankenphp.Shutdown()
863+
require.NoError(b, frankenphp.Init())
864+
b.Cleanup(frankenphp.Shutdown)
865+
876866
cwd, _ := os.Getwd()
877867
testDataDir := cwd + "/testdata/"
878868

@@ -919,14 +909,11 @@ func BenchmarkServerSuperGlobal(b *testing.B) {
919909

920910
handler := func(w http.ResponseWriter, r *http.Request) {
921911
req, err := frankenphp.NewRequestWithContext(r, frankenphp.WithRequestDocumentRoot(testDataDir, false), frankenphp.WithRequestPreparedEnv(preparedEnv))
922-
if err != nil {
923-
panic(err)
924-
}
912+
require.NoError(b, err)
925913

926914
r.Header = headers
927-
if err := frankenphp.ServeHTTP(w, req); err != nil {
928-
panic(err)
929-
}
915+
916+
require.NoError(b, frankenphp.ServeHTTP(w, req))
930917
}
931918

932919
req := httptest.NewRequest("GET", "http://example.com/server-variable.php", nil)

0 commit comments

Comments
 (0)