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/query/create_test.go
+5 -5
View File
@@ -45,7 +45,7 @@ func TestCreate(t *testing.T) {
}
dbType, err := resultprocessor.ToDBQueryType(create.Type)
assert.NoError(t, err)
require.NoError(t, err)
pool.ExpectQuery("name: AllQueriesExist :one").WithArgs(database.MustToDBUUIDArray(*create.RequiredQueryIDs)).WillReturnRows(
pgxmock.NewRows([]string{"all_exist"}).AddRow(true),
@@ -71,7 +71,7 @@ func TestCreate(t *testing.T) {
pool.ExpectCommit()
id, err := svc.Create(ctx, create)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, q.ID, id)
}
@@ -94,7 +94,7 @@ func TestCreateMinimal(t *testing.T) {
}
dbType, err := resultprocessor.ToDBQueryType(create.Type)
assert.NoError(t, err)
require.NoError(t, err)
pool.ExpectBeginTx(pgx.TxOptions{})
pool.ExpectQuery("name: CreateQuery :one").WithArgs(dbType).WillReturnRows(
@@ -110,7 +110,7 @@ func TestCreateMinimal(t *testing.T) {
pool.ExpectCommit()
id, err := svc.Create(ctx, create)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, q.ID, id)
}
@@ -131,7 +131,7 @@ func TestCreateRollback(t *testing.T) {
}
dbType, err := resultprocessor.ToDBQueryType(create.Type)
assert.NoError(t, err)
require.NoError(t, err)
pool.ExpectBeginTx(pgx.TxOptions{})
msg := "database failure"
internal/query/createprivate_test.go
+8 -8
View File
@@ -26,12 +26,12 @@ func TestGetCreator(t *testing.T) {
queryType := resultprocessor.Type(resultprocessor.TypeContextFull)
creator, err := svc.getCreator(queryType)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotNil(t, creator)
queryType = resultprocessor.Type(resultprocessor.TypeJsonExtractor)
creator, err = svc.getCreator(queryType)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotNil(t, creator)
queryType = resultprocessor.Type(-1)
@@ -50,7 +50,7 @@ func TestParseCreateQuery(t *testing.T) {
}
resultQuery, err := parseCreateQuery(cQuery)
assert.NoError(t, err)
require.NoError(t, err)
rQIDs := database.MustToDBUUIDArray(*cQuery.RequiredQueryIDs)
qcfg := []byte(*cQuery.Config)
assert.EqualExportedValues(t, createQuery{
@@ -100,7 +100,7 @@ func TestSubmitCreate(t *testing.T) {
}
dbType, err := resultprocessor.ToDBQueryType(create.Type)
assert.NoError(t, err)
require.NoError(t, err)
pool.ExpectBeginTx(pgx.TxOptions{})
pool.ExpectQuery("name: CreateQuery :one").WithArgs(dbType).WillReturnRows(
@@ -122,7 +122,7 @@ func TestSubmitCreate(t *testing.T) {
pool.ExpectCommit()
id, err := svc.submitCreate(ctx, create)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, q.ID, id)
}
@@ -145,7 +145,7 @@ func TestSubmitCreateNoReqsOrConfig(t *testing.T) {
}
dbType, err := resultprocessor.ToDBQueryType(create.Type)
assert.NoError(t, err)
require.NoError(t, err)
pool.ExpectBeginTx(pgx.TxOptions{})
pool.ExpectQuery("name: CreateQuery :one").WithArgs(dbType).WillReturnRows(
@@ -161,7 +161,7 @@ func TestSubmitCreateNoReqsOrConfig(t *testing.T) {
pool.ExpectCommit()
id, err := svc.submitCreate(ctx, create)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, q.ID, id)
}
@@ -189,7 +189,7 @@ func TestNormalizeCreate(t *testing.T) {
)
err = svc.normalizeCreate(ctx, create)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualExportedValues(t, resultprocessor.Create{
Type: resultprocessor.TypeContextFull,
Config: nil,
internal/query/get_test.go
+2 -2
View File
@@ -46,7 +46,7 @@ func TestGet(t *testing.T) {
)
returnQuery, err := svc.Get(ctx, query.ID)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualExportedValues(t, query, *returnQuery)
}
@@ -83,7 +83,7 @@ func TestGetWithVersion(t *testing.T) {
)
returnQuery, err := svc.GetWithVersion(ctx, query.ID, version)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualExportedValues(t, query, *returnQuery)
}
internal/query/list_test.go
+2 -2
View File
@@ -48,7 +48,7 @@ func TestList(t *testing.T) {
)
resList, err := svc.List(ctx)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualExportedValues(t, []*query.Query{q}, resList)
}
@@ -83,7 +83,7 @@ func TestListById(t *testing.T) {
)
resList, err := svc.ListById(ctx, []uuid.UUID{q.ID})
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualExportedValues(t, []*query.Query{q}, resList)
}
internal/query/normalize_test.go
+17 -17
View File
@@ -20,43 +20,43 @@ func TestNormalizeConfig(t *testing.T) {
s := Service{}
err := s.NormalizeConfig(nil)
assert.NoError(t, err)
require.NoError(t, err)
entity := resultprocessor.Create{}
entity.Config = nil
err = s.NormalizeConfig(&entity)
assert.NoError(t, err)
require.NoError(t, err)
assert.Nil(t, entity.Config)
cfg := ""
entity.Config = &cfg
err = s.NormalizeConfig(&entity)
assert.NoError(t, err)
require.NoError(t, err)
assert.Nil(t, entity.Config)
cfg = " "
entity.Config = &cfg
err = s.NormalizeConfig(&entity)
assert.NoError(t, err)
require.NoError(t, err)
assert.Nil(t, entity.Config)
cfg = "{}"
entity.Config = &cfg
err = s.NormalizeConfig(&entity)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "{}", *(entity.Config))
cfg = "{\"hello\":\"bye\"}"
entity.Config = &cfg
err = s.NormalizeConfig(&entity)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "{\"hello\":\"bye\"}", *(entity.Config))
cfg = " { \"hello\" : \"bye\" } "
entity.Config = &cfg
err = s.NormalizeConfig(&entity)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "{\"hello\":\"bye\"}", *(entity.Config))
cfg = "{'hello':'bye'}"
@@ -81,18 +81,18 @@ func TestNormalizeQueryIDs(t *testing.T) {
s := Service{cfg: cfg}
err = s.NormalizeQueryIDs(ctx, nil)
assert.NoError(t, err)
require.NoError(t, err)
entity := resultprocessor.Create{}
entity.RequiredQueryIDs = nil
err = s.NormalizeQueryIDs(ctx, &entity)
assert.NoError(t, err)
require.NoError(t, err)
assert.Nil(t, entity.RequiredQueryIDs)
entity.RequiredQueryIDs = &[]uuid.UUID{}
err = s.NormalizeQueryIDs(ctx, &entity)
assert.NoError(t, err)
require.NoError(t, err)
assert.Nil(t, entity.RequiredQueryIDs)
ids := []uuid.UUID{uuid.New()}
@@ -105,7 +105,7 @@ func TestNormalizeQueryIDs(t *testing.T) {
)
err = s.NormalizeQueryIDs(ctx, &entity)
assert.NoError(t, err)
require.NoError(t, err)
assert.ElementsMatch(t, ids, *entity.RequiredQueryIDs)
pool.ExpectQuery("name: AllQueriesExist :one").WithArgs(dbids).WillReturnRows(
@@ -135,7 +135,7 @@ func TestNormalizeQueryIDs(t *testing.T) {
)
err = s.NormalizeQueryIDs(ctx, &entity)
assert.NoError(t, err)
require.NoError(t, err)
assert.ElementsMatch(t, outids, *entity.RequiredQueryIDs)
}
@@ -160,7 +160,7 @@ func TestNormalizeActiveVersion(t *testing.T) {
LatestVersion: 4,
}
err := s.NormalizeActiveVersion(&current, nil)
assert.NoError(t, err)
require.NoError(t, err)
})
t.Run("no update", func(t *testing.T) {
@@ -170,7 +170,7 @@ func TestNormalizeActiveVersion(t *testing.T) {
}
entity := resultprocessor.Update{}
err := s.NormalizeActiveVersion(&current, &entity)
assert.NoError(t, err)
require.NoError(t, err)
assert.Nil(t, entity.ActiveVersion)
})
@@ -184,7 +184,7 @@ func TestNormalizeActiveVersion(t *testing.T) {
ActiveVersion: &version,
}
err := s.NormalizeActiveVersion(&current, &entity)
assert.NoError(t, err)
require.NoError(t, err)
assert.Nil(t, entity.ActiveVersion)
})
@@ -198,7 +198,7 @@ func TestNormalizeActiveVersion(t *testing.T) {
ActiveVersion: &version,
}
err := s.NormalizeActiveVersion(&current, &entity)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, version, *entity.ActiveVersion)
})
@@ -212,7 +212,7 @@ func TestNormalizeActiveVersion(t *testing.T) {
ActiveVersion: &version,
}
err := s.NormalizeActiveVersion(&current, &entity)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, version, *entity.ActiveVersion)
})
internal/query/parse_test.go
+5 -4
View File
@@ -11,6 +11,7 @@ import (
"github.com/google/uuid"
"github.com/jackc/pgx/v5/pgtype"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestParseQuery(t *testing.T) {
@@ -49,7 +50,7 @@ func TestParseFullActiveQuery(t *testing.T) {
}
out, err := query.ParseFullActiveQuery(q)
assert.NoError(t, err)
require.NoError(t, err)
bcfg := string(q.Config)
assert.EqualExportedValues(t, query.Query{
ID: database.MustToUUID(q.ID),
@@ -72,7 +73,7 @@ func TestFullActiveQueryEmpty(t *testing.T) {
}
out, err := query.ParseFullActiveQuery(dbQuery)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualExportedValues(t, query.Query{
ID: database.MustToUUID(dbQuery.ID),
Type: resultprocessor.TypeContextFull,
@@ -90,7 +91,7 @@ func TestFullActiveQueryWithNullUUID(t *testing.T) {
}
out, err := query.ParseFullActiveQuery(dbQuery)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualExportedValues(t, query.Query{
ID: database.MustToUUID(dbQuery.ID),
Type: resultprocessor.TypeContextFull,
@@ -110,7 +111,7 @@ func TestFullActiveQueryArray(t *testing.T) {
}
out, err := query.ParseFullActiveQueryArray(dbQueries)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualExportedValues(t, []*query.Query{
{
ID: database.MustToUUID(dbQueries[0].ID),
internal/query/result/get_test.go
+3 -3
View File
@@ -21,11 +21,11 @@ func TestGetValueByType(t *testing.T) {
_, err := getValueByType(resultprocessor.Type(-1), "example_val")
assert.Error(t, err)
pro, err := getValueByType(resultprocessor.TypeContextFull, "example_context")
assert.NoError(t, err)
require.NoError(t, err)
assert.NotNil(t, pro)
assert.Equal(t, "example_context", pro.GetStoreValue())
pro, err = getValueByType(resultprocessor.TypeJsonExtractor, "example_json")
assert.NoError(t, err)
require.NoError(t, err)
assert.NotNil(t, pro)
assert.Equal(t, "example_json", pro.GetStoreValue())
}
@@ -56,7 +56,7 @@ func TestGetValueWithVersion(t *testing.T) {
)
val, err := svc.GetValueWithVersion(ctx, params)
assert.NoError(t, err)
require.NoError(t, err)
v := jsonextractor.NewResult(value)
assert.Equal(t, v, val)
assert.Equal(t, value, v.GetStoreValue())
internal/query/result/process_test.go
+8 -8
View File
@@ -62,7 +62,7 @@ func TestProcess(t *testing.T) {
)
val, err := svc.Process(ctx, &params)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotNil(t, val)
assert.Equal(t, "example_value", val.GetStoreValue())
}
@@ -81,11 +81,11 @@ func TestListRequiredValue(t *testing.T) {
}
pr, err := svc.listRequiredValues(ctx, nil, nil)
assert.NoError(t, err)
require.NoError(t, err)
assert.Nil(t, pr)
pr, err = svc.listRequiredValues(ctx, &Process{}, &resultprocessor.Query{})
assert.NoError(t, err)
require.NoError(t, err)
assert.Nil(t, pr)
pr, err = svc.listRequiredValues(ctx, &Process{},
@@ -93,7 +93,7 @@ func TestListRequiredValue(t *testing.T) {
RequiredQueryIDs: &[]uuid.UUID{},
},
)
assert.NoError(t, err)
require.NoError(t, err)
assert.Nil(t, pr)
query := &resultprocessor.Query{
@@ -116,7 +116,7 @@ func TestListRequiredValue(t *testing.T) {
)
pr, err = svc.listRequiredValues(ctx, &params, query)
assert.NoError(t, err)
require.NoError(t, err)
assert.ElementsMatch(t, []resultprocessor.Value{
jsonextractor.NewResult(strVal),
}, pr)
@@ -126,11 +126,11 @@ func TestGetProcessor(t *testing.T) {
svc := Service{}
pr, err := svc.getProcessor(resultprocessor.TypeJsonExtractor)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotNil(t, pr)
pr, err = svc.getProcessor(resultprocessor.TypeContextFull)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotNil(t, pr)
_, err = svc.getProcessor(resultprocessor.Type(-1))
@@ -148,7 +148,7 @@ func TestParseQueryRequirementValueArray(t *testing.T) {
}
out, err := parseQueryRequirementValueArray(in)
assert.NoError(t, err)
require.NoError(t, err)
assert.ElementsMatch(t, []resultprocessor.Value{
jsonextractor.NewResult(exval),
}, out)
internal/query/result/processor/parse_test.go
+16 -15
View File
@@ -10,6 +10,7 @@ import (
"github.com/google/uuid"
"github.com/jackc/pgx/v5/pgtype"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestParseDBCollectorQuery(t *testing.T) {
@@ -21,7 +22,7 @@ func TestParseDBCollectorQuery(t *testing.T) {
Queryversion: 1,
}
value, err := resultprocessor.ParseDBCollectorQuery(&dbResult)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, uuid.Nil, value.ID)
assert.Nil(t, value.RequiredQueryIDs)
assert.Equal(t, int32(1), value.Version)
@@ -35,7 +36,7 @@ func TestParseDBCollectorQuery(t *testing.T) {
func TestParseDBNullType(t *testing.T) {
qType := repository.NullQuerytype{Valid: true, Querytype: repository.QuerytypeJsonExtractor}
value, err := resultprocessor.ParseDBNullType(qType)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, resultprocessor.Type(resultprocessor.TypeJsonExtractor), value)
qType = repository.NullQuerytype{}
@@ -50,19 +51,19 @@ func TestParseDBNullType(t *testing.T) {
func TestParseDBType(t *testing.T) {
qType := repository.QuerytypeJsonExtractor
value, err := resultprocessor.ParseDBType(qType)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, resultprocessor.Type(resultprocessor.TypeJsonExtractor), value)
qType = repository.QuerytypeContextFull
value, err = resultprocessor.ParseDBType(qType)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, resultprocessor.Type(resultprocessor.TypeContextFull), value)
}
func TestToDBQueryType(t *testing.T) {
dbQueryType := resultprocessor.Type(resultprocessor.TypeJsonExtractor)
value, err := resultprocessor.ToDBQueryType(dbQueryType)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, repository.Querytype(repository.QuerytypeJsonExtractor), value)
dbQueryType = resultprocessor.Type(-1)
@@ -71,7 +72,7 @@ func TestToDBQueryType(t *testing.T) {
dbQueryType = resultprocessor.Type(resultprocessor.TypeContextFull)
value, err = resultprocessor.ToDBQueryType(dbQueryType)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, repository.Querytype(repository.QuerytypeContextFull), value)
}
@@ -81,7 +82,7 @@ func TestToDBQueryTypeArray(t *testing.T) {
resultprocessor.TypeContextFull,
}
value, err := resultprocessor.ToDBQueryTypeArray(inArr)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, []repository.Querytype{
repository.QuerytypeJsonExtractor,
repository.QuerytypeContextFull,
@@ -97,7 +98,7 @@ func TestToDBQueryTypeArray(t *testing.T) {
func TestToDBNullQueryType(t *testing.T) {
dbQueryType := resultprocessor.Type(resultprocessor.TypeJsonExtractor)
value, err := resultprocessor.ToDBNullQueryType(dbQueryType)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, repository.NullQuerytype{Valid: true, Querytype: repository.QuerytypeJsonExtractor}, value)
dbQueryType = resultprocessor.Type(-1)
@@ -106,14 +107,14 @@ func TestToDBNullQueryType(t *testing.T) {
dbQueryType = resultprocessor.Type(resultprocessor.TypeContextFull)
value, err = resultprocessor.ToDBNullQueryType(dbQueryType)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, repository.NullQuerytype{Valid: true, Querytype: repository.QuerytypeContextFull}, value)
}
func TestParseFullQuery(t *testing.T) {
var q *repository.Fullactivequery
out, err := resultprocessor.ParseFullQuery(q)
assert.NoError(t, err)
require.NoError(t, err)
assert.Nil(t, out)
q = &repository.Fullactivequery{
@@ -124,7 +125,7 @@ func TestParseFullQuery(t *testing.T) {
}
out, err = resultprocessor.ParseFullQuery(q)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualExportedValues(t, &resultprocessor.Query{
ID: database.MustToUUID(q.ID),
Type: resultprocessor.TypeContextFull,
@@ -140,7 +141,7 @@ func TestParseFullQuery(t *testing.T) {
}
out, err = resultprocessor.ParseFullQuery(q)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualExportedValues(t, &resultprocessor.Query{
ID: database.MustToUUID(q.ID),
Type: resultprocessor.TypeContextFull,
@@ -159,7 +160,7 @@ func TestParseFullQuery(t *testing.T) {
}
out, err = resultprocessor.ParseFullQuery(q)
assert.NoError(t, err)
require.NoError(t, err)
cfg := "hello"
assert.EqualExportedValues(t, &resultprocessor.Query{
ID: database.MustToUUID(q.ID),
@@ -173,7 +174,7 @@ func TestParseFullQuery(t *testing.T) {
func TestParseFullQueryArray(t *testing.T) {
var q []*repository.Fullactivequery
out, err := resultprocessor.ParseFullQueryArray(q)
assert.NoError(t, err)
require.NoError(t, err)
assert.ElementsMatch(t, []*resultprocessor.Query{}, out)
q = []*repository.Fullactivequery{
@@ -186,7 +187,7 @@ func TestParseFullQueryArray(t *testing.T) {
}
out, err = resultprocessor.ParseFullQueryArray(q)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualExportedValues(t, []*resultprocessor.Query{
{
ID: database.MustToUUID(q[0].ID),
internal/query/result/set/set_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"
)
@@ -122,7 +121,7 @@ func TestSet(t *testing.T) {
Return(&sqs.SendMessageOutput{}, nil)
err = svc.Set(ctx, &params)
assert.NoError(t, err)
require.NoError(t, err)
}
func TestInformQueryDependents(t *testing.T) {
@@ -186,5 +185,5 @@ func TestInformQueryDependents(t *testing.T) {
Return(&sqs.SendMessageOutput{}, nil)
err = svc.informQueryDependents(ctx, params)
assert.NoError(t, err)
require.NoError(t, err)
}
internal/query/result/sync/trigger_test.go
+2 -3
View File
@@ -15,7 +15,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"
)
@@ -56,7 +55,7 @@ func TestTriggerSync(t *testing.T) {
Return(&sqs.SendMessageOutput{}, nil)
err = svc.TriggerSync(ctx, params)
assert.NoError(t, err)
require.NoError(t, err)
}
func TestTriggerMultiSync(t *testing.T) {
@@ -102,5 +101,5 @@ func TestTriggerMultiSync(t *testing.T) {
Return(&sqs.SendMessageOutput{}, nil)
err = svc.TriggerMultiSync(ctx, docId, qIds)
assert.NoError(t, err)
require.NoError(t, err)
}
internal/query/test/test_test.go
+1 -1
View File
@@ -65,6 +65,6 @@ func TestTest(t *testing.T) {
)
result, err := svc.Test(ctx, *params)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, "old_value", result)
}
internal/query/types/contextFull/creator_test.go
+1 -1
View File
@@ -31,5 +31,5 @@ func TestCreatorValidate(t *testing.T) {
}
err = svc.Validate(ctx, entity)
assert.NoError(t, err)
require.NoError(t, err)
}
internal/query/types/contextFull/process_test.go
+2 -1
View File
@@ -9,6 +9,7 @@ import (
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestContextFull(t *testing.T) {
@@ -25,7 +26,7 @@ func TestContextFull(t *testing.T) {
values := []resultprocessor.Value{}
value, err := extractor.Process(ctx, query, values)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, `{"keyone":"valueone","keytwo":"valuetwo"}`, value)
values = []resultprocessor.Value{
internal/query/types/contextFull/updator_test.go
+1 -1
View File
@@ -39,5 +39,5 @@ func TestUpdatorValidate(t *testing.T) {
}
err = svc.Validate(ctx, current, entity)
assert.NoError(t, err)
require.NoError(t, err)
}
internal/query/types/jsonExtractor/creator_test.go
+1 -1
View File
@@ -34,5 +34,5 @@ func TestCreatorValidate(t *testing.T) {
}
err = svc.Validate(ctx, entity)
assert.NoError(t, err)
require.NoError(t, err)
}
internal/query/types/jsonExtractor/process_test.go
+3 -3
View File
@@ -51,7 +51,7 @@ func TestJSONProcess(t *testing.T) {
)
value, err := extractor.Process(ctx, query, values)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, entryValue, value)
entryValue = ""
@@ -66,7 +66,7 @@ func TestJSONProcess(t *testing.T) {
)
value, err = extractor.Process(ctx, query, values)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, entryValue, value)
entryValue = "1"
@@ -81,7 +81,7 @@ func TestJSONProcess(t *testing.T) {
)
value, err = extractor.Process(ctx, query, values)
assert.NoError(t, err)
require.NoError(t, err)
assert.Equal(t, entryValue, value)
}
internal/query/types/jsonExtractor/updator_test.go
+1 -1
View File
@@ -38,5 +38,5 @@ func TestUpdatorValidate(t *testing.T) {
}
err = svc.Validate(ctx, current, entity)
assert.NoError(t, err)
require.NoError(t, err)
}
internal/query/update/update_test.go
+1 -2
View File
@@ -21,7 +21,6 @@ import (
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgtype"
"github.com/pashagolub/pgxmock/v3"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
@@ -85,5 +84,5 @@ func TestUpdate(t *testing.T) {
Return(&sqs.SendMessageOutput{}, nil)
err = svc.Update(ctx, update)
assert.NoError(t, err)
require.NoError(t, err)
}
internal/query/update/updateprivate_test.go
+11 -11
View File
@@ -41,12 +41,12 @@ func TestGetUpdator(t *testing.T) {
queryType := resultprocessor.Type(resultprocessor.TypeContextFull)
updator, err := svc.getUpdator(queryType)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotNil(t, updator)
queryType = resultprocessor.Type(resultprocessor.TypeJsonExtractor)
updator, err = svc.getUpdator(queryType)
assert.NoError(t, err)
require.NoError(t, err)
assert.NotNil(t, updator)
queryType = resultprocessor.Type(-1)
@@ -102,7 +102,7 @@ func TestSubmitUpdate(t *testing.T) {
pool.ExpectCommit()
err = svc.submitUpdate(ctx, &q, update)
assert.NoError(t, err)
require.NoError(t, err)
}
func TestSubmitUpdateRollback(t *testing.T) {
@@ -189,7 +189,7 @@ func TestSubmitUpdateRequiredQueries(t *testing.T) {
pool.ExpectCommit()
err = svc.submitUpdate(ctx, &q, update)
assert.NoError(t, err)
require.NoError(t, err)
})
t.Run("all nil", func(t *testing.T) {
@@ -228,7 +228,7 @@ func TestSubmitUpdateRequiredQueries(t *testing.T) {
pool.ExpectCommit()
err = svc.submitUpdate(ctx, &q, update)
assert.NoError(t, err)
require.NoError(t, err)
})
}
@@ -261,7 +261,7 @@ func TestSubmitUpdateActiveVersion(t *testing.T) {
pool.ExpectCommit()
err = svc.submitUpdate(ctx, &q, update)
assert.NoError(t, err)
require.NoError(t, err)
}
func TestGetSetDifference(t *testing.T) {
@@ -306,7 +306,7 @@ func TestNormalizeUpdate(t *testing.T) {
}
err = svc.normalizeUpdate(ctx, current, update)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualExportedValues(t, resultprocessor.Update{
ID: current.ID,
ActiveVersion: &aV,
@@ -418,7 +418,7 @@ func TestNormalizeUpdateRequiredQueryIDs(t *testing.T) {
}
err = svc.normalizeUpdateRequiredQueryIDs(ctx, current, update)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualExportedValues(t, resultprocessor.Update{
ID: current.ID,
}, *update)
@@ -521,7 +521,7 @@ func TestNormalizeUpdateRequiredQueryIDs(t *testing.T) {
)
err = svc.normalizeUpdateRequiredQueryIDs(ctx, current, update)
assert.NoError(t, err)
require.NoError(t, err)
assert.EqualExportedValues(t, resultprocessor.Update{
ID: current.ID,
}, *update)
@@ -546,7 +546,7 @@ func TestInformUpdate(t *testing.T) {
}
err := svc.informUpdate(ctx, entity)
assert.NoError(t, err)
require.NoError(t, err)
})
t.Run("update active version", func(t *testing.T) {
ctx := context.Background()
@@ -576,6 +576,6 @@ func TestInformUpdate(t *testing.T) {
Return(&sqs.SendMessageOutput{}, nil)
err := svc.informUpdate(ctx, entity)
assert.NoError(t, err)
require.NoError(t, err)
})
}