somecleanup

This commit is contained in:
Michael McGuinness
2025-01-06 15:31:39 +00:00
parent f2e71ab533
commit 8b3f103cac
25 changed files with 159 additions and 136 deletions
+5 -5
View File
@@ -84,14 +84,14 @@ func TestQueue(t *testing.T) {
pool.ExpectQuery("name: GetCollectorQueries :many").WithArgs(dbCollectorID).WillReturnRows(rows)
contextResultID := uuid.New()
results := []result.Result{
results := []*result.Result{
{ID: contextResultID, QueryID: contextID, QueryVersion: contextVersion},
{ID: uuid.New(), QueryID: queryFourID, QueryVersion: queryFourVersion},
{ID: uuid.New(), QueryID: querySixID, QueryVersion: querySixVersion - 1},
{ID: uuid.New(), QueryID: queryOneID, QueryVersion: queryOneVersion - 1},
}
expectedQueries := []queryprocessor.Query{
expectedQueries := []*queryprocessor.Query{
{ID: querySixID, Type: queryprocessor.TypeJsonExtractor, RequiredQueryIDs: []uuid.UUID{contextID}, Version: querySixVersion},
{ID: queryFiveID, Type: queryprocessor.TypeJsonExtractor, RequiredQueryIDs: []uuid.UUID{querySixID}, Version: queryFiveVersion},
{ID: queryOneID, Type: queryprocessor.TypeJsonExtractor, RequiredQueryIDs: []uuid.UUID{contextID}, Version: queryOneVersion},
@@ -103,7 +103,7 @@ func TestQueue(t *testing.T) {
cleanVersion := int32(1)
textVersion := int32(1)
q, err := queryQueue.New(ctx, db, coll, &results, docID, cleanVersion, textVersion)
q, err := queryQueue.New(ctx, db, coll, results, docID, cleanVersion, textVersion)
assert.Nil(t, err)
assert.Equal(t, expectedQueries, q.GetQueue())
@@ -212,12 +212,12 @@ func TestQueueFail(t *testing.T) {
pool.ExpectQuery("name: GetCollectorQueries :many").WithArgs(dbCollectorID).
WillReturnError(errors.New(errr))
results := []result.Result{}
results := []*result.Result{}
docID := uuid.New()
cleanVersion := int32(1)
textVersion := int32(1)
_, err = queryQueue.New(ctx, db, coll, &results, docID, cleanVersion, textVersion)
_, err = queryQueue.New(ctx, db, coll, results, docID, cleanVersion, textVersion)
assert.EqualError(t, err, errr)
}