Merged in feature/splittests (pull request #140)

Split Tests

* split
This commit is contained in:
Michael McGuinness
2025-05-12 20:54:16 +00:00
parent f5061f53db
commit 9dfd867906
6 changed files with 614 additions and 215 deletions
+300 -119
View File
@@ -13,153 +13,334 @@ import (
)
func TestDocument(t *testing.T) {
t.Parallel()
if testing.Short() {
t.SkipNow()
}
ctx := context.Background()
t.Run("List docs for a client", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
queries := cfg.GetDBQueries()
queries := cfg.GetDBQueries()
clientId := "EXAMPLE"
err := queries.CreateClient(ctx, &repository.CreateClientParams{
Name: "example_client",
Clientid: clientId,
clientId := "EXAMPLE"
err := queries.CreateClient(ctx, &repository.CreateClientParams{
Name: "example_client",
Clientid: clientId,
})
require.NoError(t, err)
docs, err := queries.ListDocumentsByClient(ctx, clientId)
require.NoError(t, err)
assert.Len(t, docs, 0)
})
require.NoError(t, err)
t.Run("Create document", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
docs, err := queries.ListDocumentsByClient(ctx, clientId)
require.NoError(t, err)
assert.Len(t, docs, 0)
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
hash := "example_hash"
id, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Clientid: clientId,
Hash: hash,
queries := cfg.GetDBQueries()
clientId := "EXAMPLE"
err := queries.CreateClient(ctx, &repository.CreateClientParams{
Name: "example_client",
Clientid: clientId,
})
require.NoError(t, err)
hash := "example_hash"
id, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Clientid: clientId,
Hash: hash,
})
require.NoError(t, err)
assert.NotEmpty(t, id)
docs, err := queries.ListDocumentsByClient(ctx, clientId)
require.NoError(t, err)
assert.Len(t, docs, 1)
assert.Equal(t, hash, docs[0].Hash)
})
require.NoError(t, err)
assert.NotEmpty(t, id)
bucketone := "bucketone"
keyone := "keyone"
err = queries.AddDocumentEntry(ctx, &repository.AddDocumentEntryParams{
Documentid: id,
Bucket: bucketone,
Key: keyone,
t.Run("Create two documents", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
queries := cfg.GetDBQueries()
clientId := "EXAMPLE"
err := queries.CreateClient(ctx, &repository.CreateClientParams{
Name: "example_client",
Clientid: clientId,
})
require.NoError(t, err)
hash := "example_hash"
id, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Clientid: clientId,
Hash: hash,
})
require.NoError(t, err)
assert.NotEmpty(t, id)
documentTwoID, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Clientid: clientId,
Hash: "example_hash_two",
})
require.NoError(t, err)
assert.NotEmpty(t, documentTwoID)
docs, err := queries.ListDocumentsByClient(ctx, clientId)
require.NoError(t, err)
assert.Len(t, docs, 2)
})
require.NoError(t, err)
t.Run("Two clients", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
docs, err = queries.ListDocumentsByClient(ctx, clientId)
require.NoError(t, err)
assert.Len(t, docs, 1)
assert.Equal(t, hash, docs[0].Hash)
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
documentTwoID, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Clientid: clientId,
Hash: "example_hash_two",
queries := cfg.GetDBQueries()
clientId := "EXAMPLE"
err := queries.CreateClient(ctx, &repository.CreateClientParams{
Name: "example_client",
Clientid: clientId,
})
require.NoError(t, err)
hash := "example_hash"
id, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Clientid: clientId,
Hash: hash,
})
require.NoError(t, err)
assert.NotEmpty(t, id)
clientTwoId := "EXAMPLE TWO"
err = queries.CreateClient(ctx, &repository.CreateClientParams{
Name: "example_name_two",
Clientid: clientTwoId,
})
require.NoError(t, err)
hashTwo := "example_hash_two"
idTwo, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Clientid: clientTwoId,
Hash: hashTwo,
})
require.NoError(t, err)
assert.NotEmpty(t, idTwo)
docs, err := queries.ListDocumentsByClient(ctx, clientId)
require.NoError(t, err)
assert.Len(t, docs, 1)
docs, err = queries.ListDocumentsByClient(ctx, clientTwoId)
require.NoError(t, err)
assert.Len(t, docs, 1)
})
require.NoError(t, err)
assert.NotEmpty(t, documentTwoID)
t.Run("document summary", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
buckettwo := "buckettwo"
keytwo := "keytwo"
err = queries.AddDocumentEntry(ctx, &repository.AddDocumentEntryParams{
Documentid: documentTwoID,
Bucket: buckettwo,
Key: keytwo,
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
queries := cfg.GetDBQueries()
clientId := "EXAMPLE"
err := queries.CreateClient(ctx, &repository.CreateClientParams{
Name: "example_client",
Clientid: clientId,
})
require.NoError(t, err)
hash := "example_hash"
id, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Clientid: clientId,
Hash: hash,
})
require.NoError(t, err)
assert.NotEmpty(t, id)
doc, err := queries.GetDocumentSummary(ctx, id)
require.NoError(t, err)
assert.EqualExportedValues(t, &repository.Document{
ID: id,
Clientid: clientId,
Hash: hash,
}, doc)
})
require.NoError(t, err)
t.Run("document external", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
docs, err = queries.ListDocumentsByClient(ctx, clientId)
require.NoError(t, err)
assert.Len(t, docs, 2)
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
clientTwoId := "EXAMPLE TWO"
err = queries.CreateClient(ctx, &repository.CreateClientParams{
Name: "example_name_two",
Clientid: clientTwoId,
queries := cfg.GetDBQueries()
clientId := "EXAMPLE"
err := queries.CreateClient(ctx, &repository.CreateClientParams{
Name: "example_client",
Clientid: clientId,
})
require.NoError(t, err)
hash := "example_hash"
id, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Clientid: clientId,
Hash: hash,
})
require.NoError(t, err)
assert.NotEmpty(t, id)
docext, err := queries.GetDocumentExternal(ctx, id)
require.NoError(t, err)
assert.EqualExportedValues(t, &repository.GetDocumentExternalRow{
ID: id,
Clientid: clientId,
Hash: hash,
Fields: []byte("{}"),
}, docext)
})
require.NoError(t, err)
t.Run("doc id by hash", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
docs, err = queries.ListDocumentsByClient(ctx, clientId)
require.NoError(t, err)
assert.Len(t, docs, 2)
docs, err = queries.ListDocumentsByClient(ctx, clientTwoId)
require.NoError(t, err)
assert.Len(t, docs, 0)
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
documentThreeId, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Clientid: clientTwoId,
Hash: hash,
queries := cfg.GetDBQueries()
clientId := "EXAMPLE"
err := queries.CreateClient(ctx, &repository.CreateClientParams{
Name: "example_client",
Clientid: clientId,
})
require.NoError(t, err)
hash := "example_hash"
id, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Clientid: clientId,
Hash: hash,
})
require.NoError(t, err)
assert.NotEmpty(t, id)
docid, err := queries.GetDocumentIDByHash(ctx, &repository.GetDocumentIDByHashParams{
Hash: hash,
Clientid: clientId,
})
require.NoError(t, err)
assert.EqualExportedValues(t, id, docid)
})
require.NoError(t, err)
t.Run("doc entry", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
bucketthree := "buckettwo"
keythree := "keytwo"
err = queries.AddDocumentEntry(ctx, &repository.AddDocumentEntryParams{
Documentid: documentThreeId,
Bucket: bucketthree,
Key: keythree,
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
queries := cfg.GetDBQueries()
clientId := "EXAMPLE"
err := queries.CreateClient(ctx, &repository.CreateClientParams{
Name: "example_client",
Clientid: clientId,
})
require.NoError(t, err)
hash := "example_hash"
id, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Clientid: clientId,
Hash: hash,
})
require.NoError(t, err)
assert.NotEmpty(t, id)
bucketone := "bucketone"
keyone := "keyone"
err = queries.AddDocumentEntry(ctx, &repository.AddDocumentEntryParams{
Documentid: id,
Bucket: bucketone,
Key: keyone,
})
require.NoError(t, err)
entry, err := queries.GetDocumentEntry(ctx, id)
require.NoError(t, err)
assert.EqualExportedValues(t, &repository.GetDocumentEntryRow{
Documentid: id,
Bucket: bucketone,
Key: keyone,
}, entry)
})
require.NoError(t, err)
t.Run("doc latest entry", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
docs, err = queries.ListDocumentsByClient(ctx, clientId)
require.NoError(t, err)
assert.Len(t, docs, 2)
docs, err = queries.ListDocumentsByClient(ctx, clientTwoId)
require.NoError(t, err)
assert.Len(t, docs, 1)
assert.Equal(t, hash, docs[0].Hash)
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
doc, err := queries.GetDocumentSummary(ctx, id)
require.NoError(t, err)
assert.EqualExportedValues(t, &repository.Document{
ID: id,
Clientid: clientId,
Hash: hash,
}, doc)
queries := cfg.GetDBQueries()
docext, err := queries.GetDocumentExternal(ctx, id)
require.NoError(t, err)
assert.EqualExportedValues(t, &repository.GetDocumentExternalRow{
ID: id,
Clientid: clientId,
Hash: hash,
Fields: []byte("{}"),
}, docext)
clientId := "EXAMPLE"
err := queries.CreateClient(ctx, &repository.CreateClientParams{
Name: "example_client",
Clientid: clientId,
})
require.NoError(t, err)
docid, err := queries.GetDocumentIDByHash(ctx, &repository.GetDocumentIDByHashParams{
Hash: hash,
Clientid: clientId,
hash := "example_hash"
id, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Clientid: clientId,
Hash: hash,
})
require.NoError(t, err)
assert.NotEmpty(t, id)
bucketone := "bucketone"
keyone := "keyone"
err = queries.AddDocumentEntry(ctx, &repository.AddDocumentEntryParams{
Documentid: id,
Bucket: bucketone,
Key: keyone,
})
require.NoError(t, err)
buckettwo := "buckettwo"
keytwo := "keytwo"
err = queries.AddDocumentEntry(ctx, &repository.AddDocumentEntryParams{
Documentid: id,
Bucket: buckettwo,
Key: keytwo,
})
require.NoError(t, err)
entry, err := queries.GetDocumentEntry(ctx, id)
require.NoError(t, err)
assert.EqualExportedValues(t, &repository.GetDocumentEntryRow{
Documentid: id,
Bucket: buckettwo,
Key: keytwo,
}, entry)
})
require.NoError(t, err)
assert.EqualExportedValues(t, id, docid)
entry, err := queries.GetDocumentEntry(ctx, id)
require.NoError(t, err)
assert.EqualExportedValues(t, &repository.GetDocumentEntryRow{
Documentid: id,
Bucket: bucketone,
Key: keyone,
}, entry)
entry, err = queries.GetDocumentEntry(ctx, documentTwoID)
require.NoError(t, err)
assert.EqualExportedValues(t, &repository.GetDocumentEntryRow{
Documentid: documentTwoID,
Bucket: buckettwo,
Key: keytwo,
}, entry)
entry, err = queries.GetDocumentEntry(ctx, documentThreeId)
require.NoError(t, err)
assert.EqualExportedValues(t, &repository.GetDocumentEntryRow{
Documentid: documentThreeId,
Bucket: bucketthree,
Key: keythree,
}, entry)
}
+145 -12
View File
@@ -436,7 +436,38 @@ func TestClientSync(t *testing.T) {
})
})
t.Run("multiple queries", func(t *testing.T) {
t.Run("change super query", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
queries := cfg.GetDBQueries()
contextQueryID, jsonQueryID := createDependentQueries(t, ctx, queries)
clientId := createClientWithCollector(t, queries)
documentID, _, textId := createDocumentWithCollectorAndText(t, queries, clientId, jsonQueryID)
_, err := queries.AddResult(ctx, &repository.AddResultParams{
Queryid: contextQueryID,
Value: "example_context",
Textentryid: textId,
Queryversion: 1,
})
require.NoError(t, err)
getDocumentSyncState(t, ctx, queries, docSyncStateParams{
clientId: clientId,
documentId: documentID,
hash: "example_hash",
isSynced: false,
fields: `{"first_key": null}`,
})
})
t.Run("upstream query update result", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
@@ -466,14 +497,6 @@ func TestClientSync(t *testing.T) {
})
require.NoError(t, err)
getDocumentSyncState(t, ctx, queries, docSyncStateParams{
clientId: clientId,
documentId: documentID,
hash: "example_hash",
isSynced: false,
fields: `{"first_key": null}`,
})
err = queries.AddResultDependency(ctx, &repository.AddResultDependencyParams{
Resultid: jsonResultId,
Requiredresultid: contextResultId,
@@ -550,7 +573,7 @@ func TestClientSync(t *testing.T) {
})
})
t.Run("update text extry", func(t *testing.T) {
t.Run("update text entry", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
@@ -588,6 +611,37 @@ func TestClientSync(t *testing.T) {
isSynced: false,
fields: `{"first_key": null}`,
})
})
t.Run("update text entry result", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
queries := cfg.GetDBQueries()
queryId := createQuery(t, queries, repository.QuerytypeContextFull)
clientId := createClientWithCollector(t, queries)
documentID, cleanId, _ := createDocumentWithCollectorAndResult(t, queries, clientId, queryId)
textId, err := queries.AddDocumentText(ctx, &repository.AddDocumentTextParams{
Bucket: "hi",
Key: "hello",
Part: 0,
Createdat: pgtype.Timestamp{
Time: time.Now().UTC(),
Valid: true,
},
Cleanid: cleanId,
})
require.NoError(t, err)
err = queries.AddDocumentTextEntry(ctx, &repository.AddDocumentTextEntryParams{
Version: 1,
Textid: textId,
})
require.NoError(t, err)
_, err = queries.AddResult(ctx, &repository.AddResultParams{
Queryid: queryId,
@@ -605,7 +659,6 @@ func TestClientSync(t *testing.T) {
fields: `{"first_key": "updated_text_json"}`,
})
})
t.Run("update clean entry", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
@@ -647,6 +700,40 @@ func TestClientSync(t *testing.T) {
isSynced: false,
fields: `{"first_key": null}`,
})
})
t.Run("update clean entry with result", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
queries := cfg.GetDBQueries()
queryId := createQuery(t, queries, repository.QuerytypeContextFull)
clientId := createClientWithCollector(t, queries)
documentID, _, _ := createDocumentWithCollectorAndResult(t, queries, clientId, queryId)
bucket := "cu"
key := "kk"
hash := "hash"
cleanthreeid, err := queries.AddDocumentClean(ctx, &repository.AddDocumentCleanParams{
Documentid: documentID,
Bucket: &bucket,
Key: &key,
Hash: &hash,
Mimetype: repository.NullCleanmimetype{
Valid: true,
Cleanmimetype: repository.CleanmimetypeApplicationPdf,
},
})
require.NoError(t, err)
err = queries.AddDocumentCleanEntry(ctx, &repository.AddDocumentCleanEntryParams{
Cleanid: cleanthreeid,
Version: 1,
})
require.NoError(t, err)
textThreeId, err := queries.AddDocumentText(ctx, &repository.AddDocumentTextParams{
Bucket: "hi",
@@ -771,6 +858,30 @@ func TestClientSync(t *testing.T) {
isSynced: true,
fields: `{"first_key": "json_value"}`,
})
})
t.Run("remove query and update collector version", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
queries := cfg.GetDBQueries()
queryId := createQuery(t, queries, repository.QuerytypeContextFull)
clientId := createClientWithCollector(t, queries)
documentID, _, _ := createDocumentWithCollectorAndResult(t, queries, clientId, queryId)
latestCollectorVersion, err := queries.AddLatestCollectorVersion(ctx, clientId)
require.NoError(t, err)
err = queries.RemoveCollectorQuery(ctx, &repository.RemoveCollectorQueryParams{
Clientid: clientId,
Queryid: queryId,
Removedversion: &latestCollectorVersion,
})
require.NoError(t, err)
err = queries.SetActiveCollectorVersion(ctx, &repository.SetActiveCollectorVersionParams{
Versionid: latestCollectorVersion,
@@ -830,7 +941,7 @@ func TestClientSync(t *testing.T) {
queryId := createQuery(t, queries, repository.QuerytypeContextFull)
clientId := createClientWithCollector(t, queries)
documentID, _, textId := createDocumentWithCollectorAndResult(t, queries, clientId, queryId)
documentID, _, _ := createDocumentWithCollectorAndResult(t, queries, clientId, queryId)
superQueryID := createQuery(t, queries, repository.QuerytypeJsonExtractor)
err := queries.AddRequiredQuery(ctx, &repository.AddRequiredQueryParams{
@@ -847,6 +958,28 @@ func TestClientSync(t *testing.T) {
isSynced: false,
fields: `{"first_key": null}`,
})
})
t.Run("add super query with result", func(t *testing.T) {
t.Parallel()
ctx := context.Background()
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
queries := cfg.GetDBQueries()
queryId := createQuery(t, queries, repository.QuerytypeContextFull)
clientId := createClientWithCollector(t, queries)
documentID, _, textId := createDocumentWithCollectorAndResult(t, queries, clientId, queryId)
superQueryID := createQuery(t, queries, repository.QuerytypeJsonExtractor)
err := queries.AddRequiredQuery(ctx, &repository.AddRequiredQueryParams{
Queryid: queryId,
Requiredqueryid: superQueryID,
Addedversion: 1,
})
require.NoError(t, err)
superResultId, err := queries.AddResult(ctx, &repository.AddResultParams{
Queryid: superQueryID,