jacob-mathison/query-orchestration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merged in bugfix/tests (pull request #107)

Browse Source 
Fix Fullsuite

* save

* foundthefix..

* codeandrequire
This commit is contained in:
Michael McGuinness
2025-03-19 11:54:14 +00:00
parent 3dd0c718cd
commit 1587da9d11
101 changed files with 977 additions and 910 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/document/clean/clean_test.go
+4 -4
View File
@@ -103,7 +103,7 @@ func TestClean(t *testing.T) {
}, nil)
err = svc.clean(ctx, doc.ID)
assert.NoError(t, err)
require.NoError(t, err)
}
func TestExecuteCleanTasks(t *testing.T) {
@@ -154,7 +154,7 @@ func TestExecuteCleanTasks(t *testing.T) {
Hash: hash,
Location: inloc,
})
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualExportedValues(t, ExecuteCleanResponse{
location: &inloc,
}, *outloc)
@@ -208,7 +208,7 @@ func TestStoreClean(t *testing.T) {
pool.ExpectCommit()
err = svc.storeClean(ctx, doc.ID, params)
assert.NoError(t, err)
require.NoError(t, err)
})
t.Run("diff prev entry", func(t *testing.T) {
mimeType := "application/pdf"
@@ -239,7 +239,7 @@ func TestStoreClean(t *testing.T) {
pool.ExpectCommit()
err = svc.storeClean(ctx, doc.ID, params)
assert.NoError(t, err)
require.NoError(t, err)
})
t.Run("same fail", func(t *testing.T) {
reason := InvalidDocumentMimeType
internal/document/clean/contentType_test.go
+10 -9
View File
@@ -13,6 +13,7 @@ import (
"github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
)
func TestGetBodyMimeType(t *testing.T) {
@@ -48,7 +49,7 @@ func TestGetBodyMimeType(t *testing.T) {
}, nil)
contentType, err := svc.getBodyMimeType(ctx, params, int64(len(bodyStr)))
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, MimeTypeInvalid, contentType)
})
t.Run("pdf", func(t *testing.T) {
@@ -94,7 +95,7 @@ func TestGetBodyMimeType(t *testing.T) {
}, nil)
contentType, err := svc.getBodyMimeType(ctx, params, int64(len(bodyStr)))
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, MimeTypePDF, contentType)
})
t.Run("pdf start", func(t *testing.T) {
@@ -140,7 +141,7 @@ func TestGetBodyMimeType(t *testing.T) {
}, nil)
contentType, err := svc.getBodyMimeType(ctx, params, int64(len(bodyStr)))
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, MimeTypeInvalid, contentType)
})
t.Run("pdf end", func(t *testing.T) {
@@ -186,7 +187,7 @@ func TestGetBodyMimeType(t *testing.T) {
}, nil)
contentType, err := svc.getBodyMimeType(ctx, params, int64(len(bodyStr)))
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, MimeTypeInvalid, contentType)
})
t.Run("short", func(t *testing.T) {
@@ -281,7 +282,7 @@ func TestGetAcceptedMimeType(t *testing.T) {
inType := "invalid_type"
contentType, err := svc.getAcceptedMimeType(ctx, params, &inType, int64(len(bodyStr)))
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, MimeTypeInvalid, contentType)
})
t.Run("pdf mimetype", func(t *testing.T) {
@@ -294,7 +295,7 @@ func TestGetAcceptedMimeType(t *testing.T) {
}
inType := "application/pdf"
contentType, err := svc.getAcceptedMimeType(ctx, &CleanParams{}, &inType, 0)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, MimeTypePDF, contentType)
})
t.Run("pdf format", func(t *testing.T) {
@@ -340,7 +341,7 @@ func TestGetAcceptedMimeType(t *testing.T) {
inType := "invalid_type"
contentType, err := svc.getAcceptedMimeType(ctx, params, &inType, int64(len(bodyStr)))
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, MimeTypePDF, contentType)
})
}
@@ -380,7 +381,7 @@ func TestGetBytesBuffer(t *testing.T) {
}, nil)
buffer, err := svc.getBytesBuffer(ctx, params, start, length)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotNil(t, buffer)
})
t.Run("negative start", func(t *testing.T) {
@@ -417,7 +418,7 @@ func TestGetBytesBuffer(t *testing.T) {
}, nil)
buffer, err := svc.getBytesBuffer(ctx, params, start, length)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotNil(t, buffer)
})
t.Run("zero length", func(t *testing.T) {
internal/document/clean/content_test.go
+2 -1
View File
@@ -12,6 +12,7 @@ import (
"github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
)
func TestGetContent(t *testing.T) {
@@ -50,7 +51,7 @@ func TestGetContent(t *testing.T) {
}, nil)
content, err := svc.getContent(ctx, params, mimeType)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotNil(t, content)
})
}
internal/document/clean/create_test.go
+2 -3
View File
@@ -20,7 +20,6 @@ import (
"github.com/aws/aws-sdk-go-v2/service/sqs"
"github.com/google/uuid"
"github.com/pashagolub/pgxmock/v3"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
)
@@ -130,7 +129,7 @@ func TestCreate(t *testing.T) {
}, nil)
err = svc.Clean(ctx, doc.ID)
assert.NoError(t, err)
require.NoError(t, err)
}
func TestInformClean(t *testing.T) {
@@ -156,5 +155,5 @@ func TestInformClean(t *testing.T) {
Return(&sqs.SendMessageOutput{}, nil)
err := svc.informClean(ctx, id)
assert.NoError(t, err)
require.NoError(t, err)
}
internal/document/clean/pdf_test.go
+24 -23
View File
@@ -9,6 +9,7 @@ import (
"github.com/pdfcpu/pdfcpu/pkg/pdfcpu"
"github.com/pdfcpu/pdfcpu/pkg/pdfcpu/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestIsValidDPI(t *testing.T) {
@@ -17,9 +18,9 @@ func TestIsValidDPI(t *testing.T) {
pdf := NewPDF(strings.NewReader(pdfHelloWorld))
pdfCtx, err := pdfcpu.ReadWithContext(ctx, pdf.pdf, pdf.config)
assert.NoError(t, err)
require.NoError(t, err)
err = pdfCtx.EnsurePageCount()
assert.NoError(t, err)
require.NoError(t, err)
dims := types.Dim{
Width: TEXTRACT_MIN_DIMENSION,
Height: TEXTRACT_MIN_DIMENSION,
@@ -27,7 +28,7 @@ func TestIsValidDPI(t *testing.T) {
boxes, err := pdfCtx.PageBoundaries(types.IntSet{
1: true,
})
assert.NoError(t, err)
require.NoError(t, err)
reason := pdf.isValidDPI(boxes[0].MediaBox(), dims)
assert.Nil(t, reason)
@@ -37,9 +38,9 @@ func TestIsValidDPI(t *testing.T) {
pdf := NewPDF(strings.NewReader(pdfWithImg))
pdfCtx, err := pdfcpu.ReadWithContext(ctx, pdf.pdf, pdf.config)
assert.NoError(t, err)
require.NoError(t, err)
err = pdfCtx.EnsurePageCount()
assert.NoError(t, err)
require.NoError(t, err)
dims := types.Dim{
Width: TEXTRACT_MIN_DIMENSION,
Height: TEXTRACT_MIN_DIMENSION,
@@ -47,7 +48,7 @@ func TestIsValidDPI(t *testing.T) {
boxes, err := pdfCtx.PageBoundaries(types.IntSet{
1: true,
})
assert.NoError(t, err)
require.NoError(t, err)
reason := pdf.isValidDPI(boxes[0].MediaBox(), dims)
assert.Nil(t, reason)
@@ -57,9 +58,9 @@ func TestIsValidDPI(t *testing.T) {
pdf := NewPDF(strings.NewReader(pdfWithImg))
pdfCtx, err := pdfcpu.ReadWithContext(ctx, pdf.pdf, pdf.config)
assert.NoError(t, err)
require.NoError(t, err)
err = pdfCtx.EnsurePageCount()
assert.NoError(t, err)
require.NoError(t, err)
dims := types.Dim{
Width: math.MaxFloat64,
Height: math.MaxFloat64,
@@ -67,7 +68,7 @@ func TestIsValidDPI(t *testing.T) {
boxes, err := pdfCtx.PageBoundaries(types.IntSet{
1: true,
})
assert.NoError(t, err)
require.NoError(t, err)
reason := pdf.isValidDPI(boxes[0].MediaBox(), dims)
assert.Equal(t, InvalidDocumentSmallDPI, *reason)
@@ -77,9 +78,9 @@ func TestIsValidDPI(t *testing.T) {
pdf := NewPDF(strings.NewReader(pdfWithImg))
pdfCtx, err := pdfcpu.ReadWithContext(ctx, pdf.pdf, pdf.config)
assert.NoError(t, err)
require.NoError(t, err)
err = pdfCtx.EnsurePageCount()
assert.NoError(t, err)
require.NoError(t, err)
dims := types.Dim{
Width: math.MaxFloat64,
Height: 1,
@@ -87,7 +88,7 @@ func TestIsValidDPI(t *testing.T) {
boxes, err := pdfCtx.PageBoundaries(types.IntSet{
1: true,
})
assert.NoError(t, err)
require.NoError(t, err)
reason := pdf.isValidDPI(boxes[0].MediaBox(), dims)
assert.Equal(t, InvalidDocumentSmallDPI, *reason)
@@ -97,9 +98,9 @@ func TestIsValidDPI(t *testing.T) {
pdf := NewPDF(strings.NewReader(pdfWithImg))
pdfCtx, err := pdfcpu.ReadWithContext(ctx, pdf.pdf, pdf.config)
assert.NoError(t, err)
require.NoError(t, err)
err = pdfCtx.EnsurePageCount()
assert.NoError(t, err)
require.NoError(t, err)
dims := types.Dim{
Width: 1,
Height: math.MaxFloat64,
@@ -107,7 +108,7 @@ func TestIsValidDPI(t *testing.T) {
boxes, err := pdfCtx.PageBoundaries(types.IntSet{
1: true,
})
assert.NoError(t, err)
require.NoError(t, err)
reason := pdf.isValidDPI(boxes[0].MediaBox(), dims)
assert.Equal(t, InvalidDocumentSmallDPI, *reason)
@@ -117,9 +118,9 @@ func TestIsValidDPI(t *testing.T) {
pdf := NewPDF(strings.NewReader(pdfWithImg))
pdfCtx, err := pdfcpu.ReadWithContext(ctx, pdf.pdf, pdf.config)
assert.NoError(t, err)
require.NoError(t, err)
err = pdfCtx.EnsurePageCount()
assert.NoError(t, err)
require.NoError(t, err)
dims := types.Dim{
Width: 1,
Height: 1,
@@ -127,7 +128,7 @@ func TestIsValidDPI(t *testing.T) {
boxes, err := pdfCtx.PageBoundaries(types.IntSet{
1: true,
})
assert.NoError(t, err)
require.NoError(t, err)
reason := pdf.isValidDPI(boxes[0].MediaBox(), dims)
assert.Nil(t, reason)
@@ -140,7 +141,7 @@ func TestIsValidDimensions(t *testing.T) {
pdf := NewPDF(strings.NewReader(pdfHelloWorld))
pdfCtx, err := pdfcpu.ReadWithContext(ctx, pdf.pdf, pdf.config)
assert.NoError(t, err)
require.NoError(t, err)
reason := pdf.isValidDimensions(pdfCtx)
assert.Nil(t, reason)
@@ -150,7 +151,7 @@ func TestIsValidDimensions(t *testing.T) {
pdf := NewPDF(strings.NewReader(pdfHelloWorld))
pdfCtx, err := pdfcpu.ReadWithContext(ctx, pdf.pdf, pdf.config)
assert.NoError(t, err)
require.NoError(t, err)
pdf.maxDimension = 1
@@ -162,7 +163,7 @@ func TestIsValidDimensions(t *testing.T) {
pdf := NewPDF(strings.NewReader(pdfHelloWorld))
pdfCtx, err := pdfcpu.ReadWithContext(ctx, pdf.pdf, pdf.config)
assert.NoError(t, err)
require.NoError(t, err)
pdf.minDimension = TEXTRACT_MAX_DIMENSION
@@ -177,7 +178,7 @@ func TestIsValidPageCount(t *testing.T) {
pdf := NewPDF(strings.NewReader(pdfHelloWorld))
pdfCtx, err := pdfcpu.ReadWithContext(ctx, pdf.pdf, pdf.config)
assert.NoError(t, err)
require.NoError(t, err)
reason := pdf.isValidPageCount(pdfCtx)
assert.Nil(t, reason)
@@ -187,7 +188,7 @@ func TestIsValidPageCount(t *testing.T) {
pdf := NewPDF(strings.NewReader(pdfTwoPages))
pdfCtx, err := pdfcpu.ReadWithContext(ctx, pdf.pdf, pdf.config)
assert.NoError(t, err)
require.NoError(t, err)
pdf.maxPages = 1
internal/document/get_test.go
+2 -2
View File
@@ -40,7 +40,7 @@ func TestGetSummary(t *testing.T) {
)
adoc, err := svc.GetSummary(ctx, doc.ID)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, &doc, adoc)
}
@@ -71,6 +71,6 @@ func TestGetExternal(t *testing.T) {
)
adoc, err := svc.GetExternal(ctx, doc.Id)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, &doc, adoc)
}
internal/document/init/create_test.go
+7 -7
View File
@@ -86,7 +86,7 @@ func TestCreate(t *testing.T) {
Location: location,
Hash: doc.Hash,
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, doc.ID, id)
}
@@ -119,7 +119,7 @@ func TestGetCreateParams(t *testing.T) {
Location: location,
Hash: doc.Hash,
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, &createDocumentParams{
ClientID: database.MustToDBUUID(doc.ClientID),
Hash: doc.Hash,
@@ -158,7 +158,7 @@ func TestGetCreateParamsExisting(t *testing.T) {
Location: location,
Hash: doc.Hash,
})
assert.NoError(t, err)
require.NoError(t, err)
dbid := database.MustToDBUUID(doc.ID)
assert.Equal(t, &createDocumentParams{
ID: &dbid,
@@ -234,7 +234,7 @@ func TestSubmitCreate(t *testing.T) {
Location: location,
Hash: doc.Hash,
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, doc.ID, id)
}
@@ -271,7 +271,7 @@ func TestSubmitCreateExists(t *testing.T) {
Location: location,
Hash: doc.Hash,
})
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, doc.ID, id)
}
@@ -292,10 +292,10 @@ func TestGetClientIDFromKey(t *testing.T) {
assert.Error(t, err)
aid, err := svc.GetClientIDFromKey(fmt.Sprintf("%s/%s/bbb", id.String(), uuid.NewString()))
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, id, aid)
aid, err = svc.GetClientIDFromKey(fmt.Sprintf("%s/bbb", id.String()))
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, id, aid)
}
internal/document/list_test.go
+1 -1
View File
@@ -41,6 +41,6 @@ func TestListByClientId(t *testing.T) {
)
adoc, err := svc.ListByClientExternalId(ctx, clientId)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, doc, adoc)
}
internal/document/sync/sync_test.go
+1 -2
View File
@@ -17,7 +17,6 @@ import (
"github.com/aws/aws-sdk-go-v2/service/sqs"
"github.com/google/uuid"
"github.com/pashagolub/pgxmock/v3"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
@@ -69,5 +68,5 @@ func TestSync(t *testing.T) {
Return(&sqs.SendMessageOutput{}, nil)
err = svc.Sync(ctx, doc.ID)
assert.NoError(t, err)
require.NoError(t, err)
}
internal/document/text/create_test.go
+3 -4
View File
@@ -17,7 +17,6 @@ import (
"github.com/aws/aws-sdk-go-v2/service/sqs"
"github.com/google/uuid"
"github.com/pashagolub/pgxmock/v3"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
@@ -85,7 +84,7 @@ func TestCreate(t *testing.T) {
Return(&sqs.SendMessageOutput{}, nil)
err = svc.Extract(ctx, id)
assert.NoError(t, err)
require.NoError(t, err)
})
t.Run("invalid clean", func(t *testing.T) {
id := uuid.New()
@@ -103,7 +102,7 @@ func TestCreate(t *testing.T) {
)
err = svc.Extract(ctx, id)
assert.NoError(t, err)
require.NoError(t, err)
})
}
@@ -130,5 +129,5 @@ func TestInformClean(t *testing.T) {
Return(&sqs.SendMessageOutput{}, nil)
err := svc.informExtraction(ctx, id)
assert.NoError(t, err)
require.NoError(t, err)
}
internal/document/text/extract_test.go
+2 -2
View File
@@ -53,7 +53,7 @@ func TestExtract(t *testing.T) {
)
err = svc.extract(ctx, cleanId)
assert.NoError(t, err)
require.NoError(t, err)
})
t.Run("fail clean", func(t *testing.T) {
id := uuid.New()
@@ -102,6 +102,6 @@ func TestExecuteExtraction(t *testing.T) {
)
outloc, err := svc.executeExtraction(ctx, id)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualExportedValues(t, location, *outloc)
}