From 60efd5980f5624aee2e240abff61c1904bbdf410 Mon Sep 17 00:00:00 2001 From: Aykhan Shahsuvarov Date: Fri, 18 Apr 2025 20:41:25 +0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20Update=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/cli_test.go | 14 +++++--------- config/config_test.go | 11 ++++++----- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/config/cli_test.go b/config/cli_test.go index 9adc205..48abee2 100644 --- a/config/cli_test.go +++ b/config/cli_test.go @@ -8,6 +8,7 @@ import ( "time" "github.com/aykhans/dodo/types" + "github.com/aykhans/dodo/utils" "github.com/stretchr/testify/assert" ) @@ -42,13 +43,13 @@ func TestReadCLI(t *testing.T) { expectFile: "/path/to/config.json", expectError: false, expectedConfig: &Config{ - Method: toPtr("POST"), + Method: utils.ToPtr("POST"), URL: &types.RequestURL{}, - DodosCount: toPtr[uint](10), - RequestCount: toPtr[uint](1000), + DodosCount: utils.ToPtr[uint](10), + RequestCount: utils.ToPtr[uint](1000), Duration: &types.Duration{Duration: 3 * time.Minute}, Timeout: &types.Timeout{Duration: 3 * time.Second}, - Yes: toPtr(true), + Yes: utils.ToPtr(true), }, }, { @@ -156,8 +157,3 @@ func TestCLIYesOrNoReaderBasic(t *testing.T) { // Default value should be returned assert.True(t, result) } - -// Helper types and functions for testing -func toPtr[T any](value T) *T { - return &value -} diff --git a/config/config_test.go b/config/config_test.go index 7d9c2e4..6fe7044 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -3,6 +3,7 @@ package config import ( "net/url" "os" + "slices" "testing" "time" @@ -415,11 +416,11 @@ func TestMergeConfig(t *testing.T) { RequestCount: utils.ToPtr(*baseConfig.RequestCount), Duration: &types.Duration{Duration: baseConfig.Duration.Duration}, Yes: utils.ToPtr(*baseConfig.Yes), - Params: append(types.Params{}, baseConfig.Params...), - Headers: append(types.Headers{}, baseConfig.Headers...), - Cookies: append(types.Cookies{}, baseConfig.Cookies...), - Body: append(types.Body{}, baseConfig.Body...), - Proxies: append(types.Proxies{}, baseConfig.Proxies...), + Params: slices.Clone(baseConfig.Params), + Headers: slices.Clone(baseConfig.Headers), + Cookies: slices.Clone(baseConfig.Cookies), + Body: slices.Clone(baseConfig.Body), + Proxies: slices.Clone(baseConfig.Proxies), } // Call the function being tested