refactoring tests util methods + adding context tests

internal/pkg/conf/conf.go

@@ -32,7 +32,9 @@ type Config struct {
 	logLevel                 xlog.Level
 }
 
-func defaultConfig() Config {
+// DefaultConfig returns the default
+// configuration.
+func DefaultConfig() Config {
 	return Config{
 		maximumWaitTimeout:       30.0,
 		maximumWaitDelay:         10.0,
@@ -53,7 +55,7 @@ to environment variables.
 func FromEnv() (Config, error) {
 	const op string = "conf.FromEnv"
 	resolver := func() (Config, error) {
-		c := defaultConfig()
+		c := DefaultConfig()
 		maximumWaitTimeout, err := xassert.Float64FromEnv(
 			maximumWaitTimeoutEnvVar,
 			c.maximumWaitTimeout,

internal/pkg/conf/conf_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/thecodingmachine/gotenberg/internal/pkg/xlog"
-	"github.com/thecodingmachine/gotenberg/test/internalpkg/xerrortest"
+	"github.com/thecodingmachine/gotenberg/test"
 )
 
 func TestEmptyFromEnv(t *testing.T) {
@@ -17,7 +17,7 @@ func TestEmptyFromEnv(t *testing.T) {
 	)
 	// no environment variables set,
 	// values should be equal to default config.
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
 	assert.Nil(t, err)
 	assert.Equal(t, expected, result)
@@ -31,7 +31,7 @@ func TestMaximumWaitTimeoutFromEnv(t *testing.T) {
 	)
 	// MAXIMUM_WAIT_TIMEOUT correctly set.
 	os.Setenv(maximumWaitTimeoutEnvVar, "10.0")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	expected.maximumWaitTimeout = 10.0
 	result, err = FromEnv()
 	assert.Nil(t, err)
@@ -39,16 +39,16 @@ func TestMaximumWaitTimeoutFromEnv(t *testing.T) {
 	os.Unsetenv(maximumWaitTimeoutEnvVar)
 	// MAXIMUM_WAIT_TIMEOUT wrongly set.
 	os.Setenv(maximumWaitTimeoutEnvVar, "foo")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(maximumWaitTimeoutEnvVar)
 	// MAXIMUM_WAIT_TIMEOUT < 0.
 	os.Setenv(maximumWaitTimeoutEnvVar, "-1.0")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(maximumWaitTimeoutEnvVar)
 }
@@ -61,7 +61,7 @@ func TestMaximumWaitDelayFromEnv(t *testing.T) {
 	)
 	// MAXIMUM_WAIT_DELAY correctly set.
 	os.Setenv(maximumWaitDelayEnvVar, "10.0")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	expected.maximumWaitDelay = 10.0
 	result, err = FromEnv()
 	assert.Nil(t, err)
@@ -69,16 +69,16 @@ func TestMaximumWaitDelayFromEnv(t *testing.T) {
 	os.Unsetenv(maximumWaitDelayEnvVar)
 	// MAXIMUM_WAIT_DELAY wrongly set.
 	os.Setenv(maximumWaitDelayEnvVar, "foo")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(maximumWaitDelayEnvVar)
 	// MAXIMUM_WAIT_DELAY < 0.
 	os.Setenv(maximumWaitDelayEnvVar, "-1.0")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(maximumWaitDelayEnvVar)
 }
@@ -91,7 +91,7 @@ func TestMaximumWebhookURLTimeoutFromEnv(t *testing.T) {
 	)
 	// MAXIMUM_WEBHOOK_URL_TIMEOUT correctly set.
 	os.Setenv(maximumWebhookURLTimeoutEnvVar, "10.0")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	expected.maximumWebhookURLTimeout = 10.0
 	result, err = FromEnv()
 	assert.Nil(t, err)
@@ -99,16 +99,16 @@ func TestMaximumWebhookURLTimeoutFromEnv(t *testing.T) {
 	os.Unsetenv(maximumWebhookURLTimeoutEnvVar)
 	// MAXIMUM_WEBHOOK_URL_TIMEOUT wrongly set.
 	os.Setenv(maximumWebhookURLTimeoutEnvVar, "foo")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(maximumWebhookURLTimeoutEnvVar)
 	// MAXIMUM_WEBHOOK_URL_TIMEOUT < 0.
 	os.Setenv(maximumWebhookURLTimeoutEnvVar, "-1.0")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(maximumWebhookURLTimeoutEnvVar)
 }
@@ -121,7 +121,7 @@ func TestDefaultWaitTimeoutFromEnv(t *testing.T) {
 	)
 	// DEFAULT_WAIT_TIMEOUT correctly set.
 	os.Setenv(defaultWaitTimeoutEnvVar, "10.0")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	expected.defaultWaitTimeout = 10.0
 	result, err = FromEnv()
 	assert.Nil(t, err)
@@ -129,23 +129,23 @@ func TestDefaultWaitTimeoutFromEnv(t *testing.T) {
 	os.Unsetenv(defaultWaitTimeoutEnvVar)
 	// DEFAULT_WAIT_TIMEOUT wrongly set.
 	os.Setenv(defaultWaitTimeoutEnvVar, "foo")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(defaultWaitTimeoutEnvVar)
 	// DEFAULT_WAIT_TIMEOUT < 0.
 	os.Setenv(defaultWaitTimeoutEnvVar, "-1.0")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(defaultWaitTimeoutEnvVar)
 	// DEFAULT_WAIT_TIMEOUT > MAXIMUM_WAIT_TIMEOUT.
 	os.Setenv(defaultWaitTimeoutEnvVar, "40.0")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(defaultWaitTimeoutEnvVar)
 }
@@ -158,7 +158,7 @@ func TestDefaultWebhookURLTimeoutFromEnv(t *testing.T) {
 	)
 	// DEFAULT_WEBHOOK_URL_TIMEOUT correctly set.
 	os.Setenv(defaultWebhookURLTimeoutEnvVar, "10.0")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	expected.defaultWebhookURLTimeout = 10.0
 	result, err = FromEnv()
 	assert.Nil(t, err)
@@ -166,23 +166,23 @@ func TestDefaultWebhookURLTimeoutFromEnv(t *testing.T) {
 	os.Unsetenv(defaultWebhookURLTimeoutEnvVar)
 	// DEFAULT_WEBHOOK_URL_TIMEOUT wrongly set.
 	os.Setenv(defaultWebhookURLTimeoutEnvVar, "foo")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(defaultWebhookURLTimeoutEnvVar)
 	// DEFAULT_WEBHOOK_URL_TIMEOUT < 0.
 	os.Setenv(defaultWebhookURLTimeoutEnvVar, "-1.0")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(defaultWebhookURLTimeoutEnvVar)
 	// DEFAULT_WEBHOOK_URL_TIMEOUT > MAXIMUM_WEBHOOK_URL_TIMEOUT.
 	os.Setenv(defaultWebhookURLTimeoutEnvVar, "40.0")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(defaultWebhookURLTimeoutEnvVar)
 }
@@ -195,7 +195,7 @@ func TestDefaultListenPortFromEnv(t *testing.T) {
 	)
 	// DEFAULT_LISTEN_PORT correctly set.
 	os.Setenv(defaultListenPortEnvVar, "80")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	expected.defaultListenPort = 80
 	result, err = FromEnv()
 	assert.Nil(t, err)
@@ -203,23 +203,23 @@ func TestDefaultListenPortFromEnv(t *testing.T) {
 	os.Unsetenv(defaultListenPortEnvVar)
 	// DEFAULT_LISTEN_PORT wrongly set.
 	os.Setenv(defaultListenPortEnvVar, "foo")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(defaultListenPortEnvVar)
 	// DEFAULT_LISTEN_PORT < 0.
 	os.Setenv(defaultListenPortEnvVar, "-1.0")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(defaultListenPortEnvVar)
 	// DEFAULT_LISTEN_PORT > 65535.
 	os.Setenv(defaultListenPortEnvVar, "65536")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(defaultListenPortEnvVar)
 }
@@ -232,14 +232,14 @@ func TestDisableGoogleChromeFromEnv(t *testing.T) {
 	)
 	// DISABLE_GOOGLE_CHROME correctly set.
 	os.Setenv(disableGoogleChromeEnvVar, "1")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	expected.disableGoogleChrome = true
 	result, err = FromEnv()
 	assert.Nil(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(disableGoogleChromeEnvVar)
 	os.Setenv(disableGoogleChromeEnvVar, "0")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	expected.disableGoogleChrome = false
 	result, err = FromEnv()
 	assert.Nil(t, err)
@@ -247,9 +247,9 @@ func TestDisableGoogleChromeFromEnv(t *testing.T) {
 	os.Unsetenv(disableGoogleChromeEnvVar)
 	// DISABLE_GOOGLE_CHROME wrongly set.
 	os.Setenv(disableGoogleChromeEnvVar, "foo")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(disableGoogleChromeEnvVar)
 }
@@ -262,14 +262,14 @@ func TestDisableUnoconvFromEnv(t *testing.T) {
 	)
 	// DISABLE_UNOCONV correctly set.
 	os.Setenv(disableUnoconvEnvVar, "1")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	expected.disableUnoconv = true
 	result, err = FromEnv()
 	assert.Nil(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(disableUnoconvEnvVar)
 	os.Setenv(disableUnoconvEnvVar, "0")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	expected.disableUnoconv = false
 	result, err = FromEnv()
 	assert.Nil(t, err)
@@ -277,9 +277,9 @@ func TestDisableUnoconvFromEnv(t *testing.T) {
 	os.Unsetenv(disableUnoconvEnvVar)
 	// DISABLE_UNOCONV wrongly set.
 	os.Setenv(disableUnoconvEnvVar, "foo")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(disableUnoconvEnvVar)
 }
@@ -292,20 +292,20 @@ func TestLogLevelFromEnv(t *testing.T) {
 	)
 	// LOG_LEVEL correctly set.
 	os.Setenv(logLevelEnvVar, "DEBUG")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	expected.logLevel = xlog.DebugLevel
 	result, err = FromEnv()
 	assert.Nil(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(logLevelEnvVar)
 	os.Setenv(logLevelEnvVar, "INFO")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
 	assert.Nil(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(logLevelEnvVar)
 	os.Setenv(logLevelEnvVar, "ERROR")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	expected.logLevel = xlog.ErrorLevel
 	result, err = FromEnv()
 	assert.Nil(t, err)
@@ -313,15 +313,15 @@ func TestLogLevelFromEnv(t *testing.T) {
 	os.Unsetenv(logLevelEnvVar)
 	// LOG_LEVEL wrongly set.
 	os.Setenv(logLevelEnvVar, "foo")
-	expected = defaultConfig()
+	expected = DefaultConfig()
 	result, err = FromEnv()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, expected, result)
 	os.Unsetenv(logLevelEnvVar)
 }
 
 func TestGetters(t *testing.T) {
-	result := defaultConfig()
+	result := DefaultConfig()
 	assert.Equal(t, result.maximumWaitTimeout, result.MaximumWaitTimeout())
 	assert.Equal(t, result.maximumWaitDelay, result.MaximumWaitDelay())
 	assert.Equal(t, result.maximumWebhookURLTimeout, result.MaximumWebhookURLTimeout())

internal/pkg/printer/merge_test.go

@@ -7,15 +7,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/thecodingmachine/gotenberg/internal/pkg/xerror"
 	"github.com/thecodingmachine/gotenberg/internal/pkg/xlog"
-	"github.com/thecodingmachine/gotenberg/test/internalpkg/printertest"
-	"github.com/thecodingmachine/gotenberg/test/internalpkg/xerrortest"
-	"github.com/thecodingmachine/gotenberg/test/internalpkg/xlogtest"
+	"github.com/thecodingmachine/gotenberg/test"
 )
 
 func TestMergePrinter(t *testing.T) {
 	var (
-		logger xlog.Logger = xlogtest.DebugLogger()
-		fpaths []string    = printertest.MergeFpaths(t)
+		logger xlog.Logger = test.DebugLogger()
+		fpaths []string    = test.MergeFpaths(t)
 		opts   MergePrinterOptions
 		dest   string
 		p      Printer
@@ -26,7 +24,7 @@ func TestMergePrinter(t *testing.T) {
 		WaitTimeout: 10.0,
 	}
 	p = NewMergePrinter(logger, fpaths, opts)
-	dest = printertest.GenerateDestination()
+	dest = test.GenerateDestination()
 	err = p.Print(dest)
 	assert.Nil(t, err)
 	err = os.RemoveAll(dest)
@@ -37,9 +35,9 @@ func TestMergePrinter(t *testing.T) {
 		WaitTimeout: 0.0,
 	}
 	p = NewMergePrinter(logger, fpaths, opts)
-	dest = printertest.GenerateDestination()
+	dest = test.GenerateDestination()
 	err = p.Print(dest)
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, xerror.TimeoutCode, xerror.Code(err))
 	err = os.RemoveAll(dest)
 	assert.Nil(t, err)

internal/pkg/printer/office_test.go

@@ -7,15 +7,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/thecodingmachine/gotenberg/internal/pkg/xerror"
 	"github.com/thecodingmachine/gotenberg/internal/pkg/xlog"
-	"github.com/thecodingmachine/gotenberg/test/internalpkg/printertest"
-	"github.com/thecodingmachine/gotenberg/test/internalpkg/xerrortest"
-	"github.com/thecodingmachine/gotenberg/test/internalpkg/xlogtest"
+	"github.com/thecodingmachine/gotenberg/test"
 )
 
 func TestOfficePrinter(t *testing.T) {
 	var (
-		logger xlog.Logger = xlogtest.DebugLogger()
-		fpaths []string    = printertest.OfficeFpaths(t)
+		logger xlog.Logger = test.DebugLogger()
+		fpaths []string    = test.OfficeFpaths(t)
 		opts   OfficePrinterOptions
 		dest   string
 		p      Printer
@@ -27,7 +25,7 @@ func TestOfficePrinter(t *testing.T) {
 		Landscape:   false,
 	}
 	p = NewOfficePrinter(logger, fpaths, opts)
-	dest = printertest.GenerateDestination()
+	dest = test.GenerateDestination()
 	err = p.Print(dest)
 	assert.Nil(t, err)
 	err = os.RemoveAll(dest)
@@ -38,7 +36,7 @@ func TestOfficePrinter(t *testing.T) {
 		Landscape:   false,
 	}
 	p = NewOfficePrinter(logger, []string{fpaths[0]}, opts)
-	dest = printertest.GenerateDestination()
+	dest = test.GenerateDestination()
 	err = p.Print(dest)
 	assert.Nil(t, err)
 	err = os.RemoveAll(dest)
@@ -49,7 +47,7 @@ func TestOfficePrinter(t *testing.T) {
 		Landscape:   true,
 	}
 	p = NewOfficePrinter(logger, fpaths, opts)
-	dest = printertest.GenerateDestination()
+	dest = test.GenerateDestination()
 	err = p.Print(dest)
 	assert.Nil(t, err)
 	err = os.RemoveAll(dest)
@@ -61,9 +59,9 @@ func TestOfficePrinter(t *testing.T) {
 		Landscape:   true,
 	}
 	p = NewOfficePrinter(logger, fpaths, opts)
-	dest = printertest.GenerateDestination()
+	dest = test.GenerateDestination()
 	err = p.Print(dest)
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	assert.Equal(t, xerror.TimeoutCode, xerror.Code(err))
 	err = os.RemoveAll(dest)
 	assert.Nil(t, err)

internal/pkg/xassert/float64_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/thecodingmachine/gotenberg/test/internalpkg/xerrortest"
+	"github.com/thecodingmachine/gotenberg/test"
 )
 
 func TestFloat64NotInferiorTo(t *testing.T) {
@@ -16,7 +16,7 @@ func TestFloat64NotInferiorTo(t *testing.T) {
 	// should not be OK.
 	rule.with("FOO", -10.0)
 	err = rule.validate()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 }
 
 func TestFloat64NotSuperiorTo(t *testing.T) {
@@ -28,5 +28,5 @@ func TestFloat64NotSuperiorTo(t *testing.T) {
 	// should not be OK.
 	rule.with("FOO", 10.0)
 	err = rule.validate()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 }

internal/pkg/xassert/int64_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/thecodingmachine/gotenberg/test/internalpkg/xerrortest"
+	"github.com/thecodingmachine/gotenberg/test"
 )
 
 func TestInt64NotInferiorTo(t *testing.T) {
@@ -16,7 +16,7 @@ func TestInt64NotInferiorTo(t *testing.T) {
 	// should not be OK.
 	rule.with("FOO", -10)
 	err = rule.validate()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 }
 
 func TestInt64NotSuperiorTo(t *testing.T) {
@@ -28,5 +28,5 @@ func TestInt64NotSuperiorTo(t *testing.T) {
 	// should not be OK.
 	rule.with("FOO", 10)
 	err = rule.validate()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 }

internal/pkg/xassert/string_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/thecodingmachine/gotenberg/test/internalpkg/xerrortest"
+	"github.com/thecodingmachine/gotenberg/test"
 )
 
 func TestStringOfOne(t *testing.T) {
@@ -16,5 +16,5 @@ func TestStringOfOne(t *testing.T) {
 	// should not be OK.
 	rule.with("FOO", "qux")
 	err = rule.validate()
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 }

internal/pkg/xassert/xassert_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/thecodingmachine/gotenberg/test/internalpkg/xerrortest"
+	"github.com/thecodingmachine/gotenberg/test"
 )
 
 func TestString(t *testing.T) {
@@ -31,7 +31,7 @@ func TestString(t *testing.T) {
 	v, err = String("foo", "BAZ", defaultValue, rule)
 	expected = defaultValue
 	assert.Equal(t, expected, v)
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 }
 
 func TestStringFromEnv(t *testing.T) {
@@ -61,7 +61,7 @@ func TestStringFromEnv(t *testing.T) {
 	v, err = StringFromEnv(envVar, defaultValue, rule)
 	expected = defaultValue
 	assert.Equal(t, expected, v)
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	os.Unsetenv(envVar)
 }
 
@@ -88,13 +88,13 @@ func TestInt64(t *testing.T) {
 	v, err = Int64("foo", "foo", defaultValue)
 	expected = defaultValue
 	assert.Equal(t, expected, v)
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	// should not be OK as given value does not
 	// validate the rule x >= 6.
 	v, err = Int64("foo", "5", defaultValue, rule)
 	expected = defaultValue
 	assert.Equal(t, expected, v)
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 }
 
 func TestInt64FromEnv(t *testing.T) {
@@ -124,7 +124,7 @@ func TestInt64FromEnv(t *testing.T) {
 	v, err = Int64FromEnv(envVar, defaultValue)
 	expected = defaultValue
 	assert.Equal(t, expected, v)
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	os.Unsetenv(envVar)
 	// should not be OK as environment variable
 	// value does not validate the rule x >= 6.
@@ -132,7 +132,7 @@ func TestInt64FromEnv(t *testing.T) {
 	v, err = Int64FromEnv(envVar, defaultValue, rule)
 	expected = defaultValue
 	assert.Equal(t, expected, v)
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	os.Unsetenv(envVar)
 }
 
@@ -157,13 +157,13 @@ func TestFloat64(t *testing.T) {
 	v, err = Float64("foo", "foo", defaultValue)
 	expected = defaultValue
 	assert.Equal(t, expected, v)
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	// should not be OK as given value does not
 	// validate the rule x >= 6.
 	v, err = Float64("foo", "5", defaultValue, rule)
 	expected = defaultValue
 	assert.Equal(t, expected, v)
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 }
 
 func TestFloat64FromEnv(t *testing.T) {
@@ -193,7 +193,7 @@ func TestFloat64FromEnv(t *testing.T) {
 	v, err = Float64FromEnv(envVar, defaultValue)
 	expected = defaultValue
 	assert.Equal(t, expected, v)
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	os.Unsetenv(envVar)
 	// should not be OK as environment variable
 	// value does not validate the rule x >= 6.
@@ -201,7 +201,7 @@ func TestFloat64FromEnv(t *testing.T) {
 	v, err = Float64FromEnv(envVar, defaultValue, rule)
 	expected = defaultValue
 	assert.Equal(t, expected, v)
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	os.Unsetenv(envVar)
 }
 
@@ -237,7 +237,7 @@ func TestBool(t *testing.T) {
 	v, err = Bool("foo", "foo", defaultValue)
 	expected = defaultValue
 	assert.Equal(t, expected, v)
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 }
 
 func TestBoolFromEnv(t *testing.T) {
@@ -284,6 +284,6 @@ func TestBoolFromEnv(t *testing.T) {
 	v, err = BoolFromEnv(envVar, defaultValue)
 	expected = defaultValue
 	assert.Equal(t, expected, v)
-	xerrortest.AssertError(t, err)
+	test.AssertError(t, err)
 	os.Unsetenv(envVar)
 }

internal/pkg/xcontext/xcontext_test.go

@@ -8,13 +8,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/thecodingmachine/gotenberg/internal/pkg/xerror"
 	"github.com/thecodingmachine/gotenberg/internal/pkg/xtime"
-	"github.com/thecodingmachine/gotenberg/test/internalpkg/xerrortest"
-	"github.com/thecodingmachine/gotenberg/test/internalpkg/xlogtest"
+	"github.com/thecodingmachine/gotenberg/test"
 )
 
 func TestMustHandleError(t *testing.T) {
 	previousErr := errors.New("previous error")
-	logger := xlogtest.DebugLogger()
+	logger := test.DebugLogger()
 	// context should not have an error.
 	ctx, cancel := WithTimeout(logger, 5)
 	defer cancel()
@@ -31,13 +30,13 @@ func TestMustHandleError(t *testing.T) {
 	defer cancel()
 	time.Sleep(xtime.Duration(1))
 	err = MustHandleError(ctx, previousErr)
-	xerr := xerrortest.AssertError(t, err)
+	xerr := test.AssertError(t, err)
 	assert.Equal(t, xerror.TimeoutCode, xerror.Code(xerr))
 	// context should have an error different
 	// than context.DeadlineExceeded.
 	ctx, cancel = WithTimeout(logger, 5)
 	cancel()
 	err = MustHandleError(ctx, previousErr)
-	xerr = xerrortest.AssertError(t, err)
+	xerr = test.AssertError(t, err)
 	assert.Equal(t, xerror.InternalCode, xerror.Code(xerr))
 }

internal/pkg/xexec/xexec_test.go

@@ -5,11 +5,11 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/thecodingmachine/gotenberg/test/internalpkg/xlogtest"
+	"github.com/thecodingmachine/gotenberg/test"
 )
 
 func TestCommand(t *testing.T) {
-	logger := xlogtest.DebugLogger()
+	logger := test.DebugLogger()
 	// should pipe command output as
 	// xlog.Logger has a xlog.DebugLevel.
 	cmd, err := Command(logger, "echo", "Hello", "World")
@@ -17,14 +17,14 @@ func TestCommand(t *testing.T) {
 	LogBeforeExecute(logger, cmd)
 	// should not pipe command output as
 	// xlog.Logger has a xlog.InfoLevel.
-	logger = xlogtest.InfoLogger()
+	logger = test.InfoLogger()
 	cmd, err = Command(logger, "echo", "Hello", "World")
 	LogBeforeExecute(logger, cmd)
 	assert.Nil(t, err)
 }
 
 func TestCommandContext(t *testing.T) {
-	logger := xlogtest.DebugLogger()
+	logger := test.DebugLogger()
 	// should pipe command output as
 	// xlog.Logger has a xlog.DebugLevel.
 	cmd, err := CommandContext(context.Background(), logger, "echo", "Hello", "World")
@@ -32,7 +32,7 @@ func TestCommandContext(t *testing.T) {
 	LogBeforeExecute(logger, cmd)
 	// should not pipe command output as
 	// xlog.Logger has a xlog.InfoLevel.
-	logger = xlogtest.InfoLogger()
+	logger = test.InfoLogger()
 	cmd, err = CommandContext(context.Background(), logger, "echo", "Hello", "World")
 	LogBeforeExecute(logger, cmd)
 	assert.Nil(t, err)