Merged in feature/splittests (pull request #140)

Split Tests * split
2025-05-12 20:54:16 +00:00
parent f5061f53db
commit 9dfd867906
6 changed files with 614 additions and 215 deletions
@@ -15,67 +15,134 @@ import (
 )

 func TestQueryAPI(t *testing.T) {
-	t.Parallel()
-	ctx := context.Background()
+	t.Run("create and get query", func(t *testing.T) {
+		t.Parallel()
+		ctx := context.Background()

-	cfg := &Config{}
+		cfg := &Config{}

-	c, cleanup := test.CreateAPINetwork(t, ctx, cfg, test.QueryAPI)
-	defer cleanup()
+		c, cleanup := test.CreateAPINetworkWithParams(t, cfg, test.QueryAPI, &test.FullDependenciesParams{
+			NoObjectStore: true,
+			Runners:       &[]test.RunnerName{},
+		})
+		defer cleanup()

-	client, err := queryapi.NewClientWithResponses(c.API.URI)
-	require.NoError(t, err)
+		client, err := queryapi.NewClientWithResponses(c.API.URI)
+		require.NoError(t, err)

-	idRes, err := client.CreateQueryWithResponse(ctx, queryapi.QueryCreate{
-		Type: queryapi.CONTEXTFULL,
+		jcfg := `{"path": "createkey"}`
+		idRes, err := client.CreateQueryWithResponse(ctx, queryapi.QueryCreate{
+			Type:   queryapi.JSONEXTRACTOR,
+			Config: &jcfg,
+		})
+		require.NoError(t, err)
+		assert.NotNil(t, idRes)
+		assert.NotNil(t, idRes.JSON201)
+		jsonID := idRes.JSON201.Id
+
+		queryRes, err := client.GetQueryWithResponse(ctx, jsonID)
+		require.NoError(t, err)
+		assert.Equal(t, jsonID, queryRes.JSON200.Id)
+		assert.Equal(t, queryapi.JSONEXTRACTOR, queryRes.JSON200.Type)
+		assert.Equal(t, int32(1), queryRes.JSON200.ActiveVersion)
+		assert.Equal(t, int32(1), queryRes.JSON200.LatestVersion)
+		assert.Equal(t, jcfg, *queryRes.JSON200.Config)
+		assert.Nil(t, queryRes.JSON200.RequiredQueries)
+
+		queriesRes, err := client.ListQueriesWithResponse(ctx)
+		require.NoError(t, err)
+		assert.Len(t, queriesRes.JSON200.Queries, 1)
+		assert.Equal(t, jcfg, *queriesRes.JSON200.Queries[0].Config)
 	})
-	require.NoError(t, err)
-	assert.NotNil(t, idRes)
-	assert.NotNil(t, idRes.JSON201)
-	contextID := idRes.JSON201.Id
-	assert.NotEmpty(t, contextID)
+	t.Run("update query", func(t *testing.T) {
+		t.Parallel()
+		ctx := context.Background()

-	jcfg := "{}"
-	idRes, err = client.CreateQueryWithResponse(ctx, queryapi.QueryCreate{
-		Type:   queryapi.JSONEXTRACTOR,
-		Config: &jcfg,
+		cfg := &Config{}
+
+		c, cleanup := test.CreateAPINetworkWithParams(t, cfg, test.QueryAPI, &test.FullDependenciesParams{
+			NoObjectStore: true,
+			Runners:       &[]test.RunnerName{test.QueryVersionSyncRunnerName},
+		})
+		defer cleanup()
+
+		client, err := queryapi.NewClientWithResponses(c.API.URI)
+		require.NoError(t, err)
+
+		jcfg := "{}"
+		idRes, err := client.CreateQueryWithResponse(ctx, queryapi.QueryCreate{
+			Type:   queryapi.JSONEXTRACTOR,
+			Config: &jcfg,
+		})
+		require.NoError(t, err)
+		assert.NotNil(t, idRes)
+		assert.NotNil(t, idRes.JSON201)
+		jsonID := idRes.JSON201.Id
+
+		aV := int32(2)
+		newJcfg := `{"path": "keyone"}`
+		res, err := client.UpdateQueryWithResponse(ctx, jsonID, queryapi.QueryUpdate{
+			ActiveVersion: &aV,
+			Config:        &newJcfg,
+		})
+		require.NoError(t, err)
+		assert.NotNil(t, res)
+
+		test.AssertMessageBody(t, ctx, cfg, c.Dependencies.QueueURLs[test.QueryVersionSyncRunnerName], regexp.MustCompile(`{"id":".+"}`))
+
+		queryRes, err := client.GetQueryWithResponse(ctx, jsonID)
+		require.NoError(t, err)
+		assert.Equal(t, jsonID, queryRes.JSON200.Id)
+		assert.Equal(t, queryapi.JSONEXTRACTOR, queryRes.JSON200.Type)
+		assert.Equal(t, int32(2), queryRes.JSON200.ActiveVersion)
+		assert.Equal(t, int32(2), queryRes.JSON200.LatestVersion)
+		assert.Equal(t, newJcfg, *queryRes.JSON200.Config)
+		assert.Nil(t, queryRes.JSON200.RequiredQueries)
 	})
-	require.NoError(t, err)
-	assert.NotNil(t, idRes)
-	assert.NotNil(t, idRes.JSON201)
-	jsonID := idRes.JSON201.Id
+	t.Run("multiple dependent queries", func(t *testing.T) {
+		t.Parallel()
+		ctx := context.Background()

-	queryRes, err := client.GetQueryWithResponse(ctx, jsonID)
-	require.NoError(t, err)
-	assert.Equal(t, jsonID, queryRes.JSON200.Id)
-	assert.Equal(t, queryapi.JSONEXTRACTOR, queryRes.JSON200.Type)
-	assert.Equal(t, int32(1), queryRes.JSON200.ActiveVersion)
-	assert.Equal(t, int32(1), queryRes.JSON200.LatestVersion)
-	assert.Equal(t, jcfg, *queryRes.JSON200.Config)
-	assert.Nil(t, queryRes.JSON200.RequiredQueries)
+		cfg := &Config{}

-	queriesRes, err := client.ListQueriesWithResponse(ctx)
-	require.NoError(t, err)
-	assert.Len(t, queriesRes.JSON200.Queries, 2)
+		c, cleanup := test.CreateAPINetworkWithParams(t, cfg, test.QueryAPI, &test.FullDependenciesParams{
+			NoObjectStore: true,
+			Runners:       &[]test.RunnerName{},
+		})
+		defer cleanup()

-	aV := int32(2)
-	res, err := client.UpdateQueryWithResponse(ctx, jsonID, queryapi.QueryUpdate{
-		ActiveVersion: &aV,
-		RequiredQueries: &[]types.UUID{
-			contextID,
-		},
+		client, err := queryapi.NewClientWithResponses(c.API.URI)
+		require.NoError(t, err)
+
+		idRes, err := client.CreateQueryWithResponse(ctx, queryapi.QueryCreate{
+			Type: queryapi.CONTEXTFULL,
+		})
+		require.NoError(t, err)
+		assert.NotNil(t, idRes)
+		assert.NotNil(t, idRes.JSON201)
+		contextID := idRes.JSON201.Id
+		assert.NotEmpty(t, contextID)
+
+		jcfg := "{}"
+		idRes, err = client.CreateQueryWithResponse(ctx, queryapi.QueryCreate{
+			Type:   queryapi.JSONEXTRACTOR,
+			Config: &jcfg,
+			RequiredQueries: &[]types.UUID{
+				contextID,
+			},
+		})
+		require.NoError(t, err)
+		assert.NotNil(t, idRes)
+		assert.NotNil(t, idRes.JSON201)
+		jsonID := idRes.JSON201.Id
+
+		queryRes, err := client.GetQueryWithResponse(ctx, jsonID)
+		require.NoError(t, err)
+		assert.Equal(t, jsonID, queryRes.JSON200.Id)
+		assert.Equal(t, queryapi.JSONEXTRACTOR, queryRes.JSON200.Type)
+		assert.Equal(t, int32(1), queryRes.JSON200.ActiveVersion)
+		assert.Equal(t, int32(1), queryRes.JSON200.LatestVersion)
+		assert.Equal(t, jcfg, *queryRes.JSON200.Config)
+		assert.ElementsMatch(t, []types.UUID{contextID}, *queryRes.JSON200.RequiredQueries)
 	})
-	require.NoError(t, err)
-	assert.NotNil(t, res)
-
-	test.AssertMessageBody(t, ctx, cfg, c.Dependencies.QueueURLs[test.QueryVersionSyncRunnerName], regexp.MustCompile(`{"id":".+"}`))
-
-	queryRes, err = client.GetQueryWithResponse(ctx, jsonID)
-	require.NoError(t, err)
-	assert.Equal(t, jsonID, queryRes.JSON200.Id)
-	assert.Equal(t, queryapi.JSONEXTRACTOR, queryRes.JSON200.Type)
-	assert.Equal(t, int32(2), queryRes.JSON200.ActiveVersion)
-	assert.Equal(t, int32(2), queryRes.JSON200.LatestVersion)
-	assert.Equal(t, jcfg, *queryRes.JSON200.Config)
-	assert.ElementsMatch(t, []types.UUID{contextID}, *queryRes.JSON200.RequiredQueries)
 }