refactoring tests util methods + adding context tests

This commit is contained in:
Julien Neuhart
2019-07-24 14:56:12 +02:00
parent 2be9ae7868
commit 554474776c
23 changed files with 295 additions and 234 deletions

View File

@@ -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)

View File

@@ -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)