Merged in feature/textextraction (pull request #110)

Text Extraction

* bases

* go

* splitting

* structure

* movetoasync

* movetoasync

* settinguptrigger

* reorder

* storevent

* standardisepollingvalidation

* unittests

* fixlint

* fixlint

* awscfg

* generatesample

* followthrough

* tests

* clena

* store

* externalidcleanup

* clientid

* local

* baseunittests

* putobjecttests

* tests

test/queryAPI/queryservice_test.go

@@ -5,8 +5,6 @@ import (
 	"regexp"
 	"testing"
 
-	"queryorchestration/internal/serviceconfig"
-	"queryorchestration/internal/serviceconfig/queue"
 	"queryorchestration/internal/test"
 	queryapi "queryorchestration/pkg/queryAPI"
 
@@ -16,33 +14,17 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-type QueryConfig struct {
-	serviceconfig.BaseConfig
-	queue.QueueConfig
-}
-
 func TestQueryAPI(t *testing.T) {
 	ctx := context.Background()
 
-	cfg := &QueryConfig{}
+	cfg := &Config{}
 	test.SetCfgProvider(t, cfg)
 
-	network, ncleanup := test.CreateNetwork(t, ctx)
-	defer ncleanup()
-
-	_, clean := test.CreateAWSContainer(t, ctx, &test.CreateAWSConfig{
-		Cfg:     cfg,
-		Network: network,
-	})
+	deps, clean := test.CreateFullDependencies(t, ctx, cfg)
 	defer clean()
 
-	err := cfg.SetQueueClient(ctx)
-	require.NoError(t, err)
-	queryversionsyncurl := test.CreateQueue(t, ctx, cfg, test.QueryVersionSyncRunnerName)
-
-	c, cleanup := test.CreateAPINetwork(t, ctx, &test.ServiceNetworkConfig{
-		Cfg:     cfg,
-		Network: network,
+	c, cleanup := test.CreateAPINetwork(t, ctx, cfg, &test.ServiceNetworkConfig{
+		Network: deps.Network,
 		API:     test.QueryAPI,
 	})
 	defer cleanup()
@@ -92,7 +74,7 @@ func TestQueryAPI(t *testing.T) {
 	require.NoError(t, err)
 	assert.NotNil(t, res)
 
-	test.AssertMessageBody(t, ctx, cfg, queryversionsyncurl, regexp.MustCompile(`{"id":".+"}`))
+	test.AssertMessageBody(t, ctx, cfg, deps.QueueURLs[test.QueryVersionSyncRunnerName], regexp.MustCompile(`{"id":".+"}`))
 
 	queryRes, err = client.GetQueryWithResponse(ctx, jsonID)
 	require.NoError(t, err)