Skip to content

Commit

Permalink
signal → signals, item → items
Browse files Browse the repository at this point in the history
  • Loading branch information
@magnusgohn
magnusgohn committed Mar 20, 2024
1 parent d41f8cc commit f46099c
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 25 deletions.
Binary file added .DS_Store
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion test/data_frame_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestDataFrame(t *testing.T) {
prefix: prefix,
}

applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalDefault), onlyError(publishSignalDefault))
applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalsDefault), onlyError(publishSignalsDefault))

t0, t1 := getDefaultTimeRange()

Expand Down
6 changes: 3 additions & 3 deletions test/evaluate_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ func TestEvaluate(t *testing.T) {
prefix: prefix,
}

applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalDefault), onlyError(publishSignalDefault))
applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalsDefault), onlyError(publishSignalsDefault))

t0, t1 := getDefaultTimeRange()
ir, err := selectItemDefault(a)
ir, err := selectItemsDefault(a)
if err != nil {
t.Errorf("%v", err)
}
Expand Down Expand Up @@ -171,7 +171,7 @@ func getListFromResponse(sir *clarify.SelectItemsResult) []string {
//lint:ignore U1000 Ignore unused function temporarily for debugging
func evaluateDefault(a TestArgs) (*clarify.EvaluateResult, error) {
query := createAnnotationQuery(a.prefix)
ir, err := selectItemDefault(a)
ir, err := selectItemsDefault(a)
if err != nil {
panic(err)
}
Expand Down
18 changes: 8 additions & 10 deletions test/publish_signal_integration_test.go → test/publish_signals_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"golang.org/x/text/language"
)

func TestPublishSignal(t *testing.T) {
func TestPublishSignals(t *testing.T) {
ctx := context.Background()
creds := getCredentials(t)
client := creds.Client(ctx)
Expand All @@ -40,7 +40,7 @@ func TestPublishSignal(t *testing.T) {
prefix: prefix,
}

applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalDefault))
applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalsDefault))

type testCase struct {
testArgs TestArgs
Expand All @@ -52,7 +52,7 @@ func TestPublishSignal(t *testing.T) {
return func(t *testing.T) {
t.Helper()

result, err := publishSignal(tc.testArgs.ctx, tc.testArgs.integration, tc.testArgs.prefix, tc.config)
result, err := publishSignals(tc.testArgs.ctx, tc.testArgs.integration, tc.testArgs.prefix, tc.config)
if err != nil {
t.Errorf("Unexpected error: %v", err)
} else if !tc.expectedFields(result) {
Expand All @@ -73,7 +73,7 @@ func TestPublishSignal(t *testing.T) {
}))
}

func publishSignal(ctx context.Context, integration string, prefix string, cfg *automation.Config) (*clarify.PublishSignalsResult, error) {
func publishSignals(ctx context.Context, integration string, prefix string, cfg *automation.Config) (*clarify.PublishSignalsResult, error) {
keyExamplePublish := "clarify/clarify-go/example/publish"
annotationTrue := "true"
transformVersion := "v2"
Expand All @@ -85,7 +85,7 @@ func publishSignal(ctx context.Context, integration string, prefix string, cfg *
},
TransformVersion: transformVersion,
Transforms: []func(item *views.ItemSave){
transformEnumValuesToFireEmoji,
transformEnumValuesToEmoji,
transformLabelValuesToTitle,
createTransform(prefix),
},
Expand All @@ -95,9 +95,7 @@ func publishSignal(ctx context.Context, integration string, prefix string, cfg *
return nil, err
}

// transformEnumValuesToFireEmoji is an example transform that replaces the enum
// values "on fire" and "not on fire" with appropriate emoji.
func transformEnumValuesToFireEmoji(item *views.ItemSave) {
func transformEnumValuesToEmoji(item *views.ItemSave) {
for i := range item.EnumValues {
item.EnumValues[i] = getRandom(emojiList)
}
Expand Down Expand Up @@ -135,6 +133,6 @@ func defaultCfg(client *clarify.Client) *automation.Config {
return cfg
}

func publishSignalDefault(a TestArgs) (*clarify.PublishSignalsResult, error) {
return publishSignal(a.ctx, a.integration, a.prefix, defaultCfg(a.client))
func publishSignalsDefault(a TestArgs) (*clarify.PublishSignalsResult, error) {
return publishSignals(a.ctx, a.integration, a.prefix, defaultCfg(a.client))
}
2 changes: 1 addition & 1 deletion test/save_signal_integration_test.go → test/save_signals_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,6 @@ func createEnumValues() fields.EnumValues {
return ev
}

func saveSignalDefault(a TestArgs) (*clarify.SaveSignalsResult, error) {
func saveSignalsDefault(a TestArgs) (*clarify.SaveSignalsResult, error) {
return saveSignal(a.ctx, a.client, a.prefix)
}
10 changes: 5 additions & 5 deletions test/select_items_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestSelectItems(t *testing.T) {
prefix: prefix,
}

applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalDefault), onlyError(publishSignalDefault))
applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalsDefault), onlyError(publishSignalsDefault))

type testCase struct {
testArgs TestArgs
Expand All @@ -47,7 +47,7 @@ func TestSelectItems(t *testing.T) {
return func(t *testing.T) {
t.Helper()

result, err := selectItem(tc.testArgs.ctx, tc.testArgs.client, tc.items)
result, err := selectItems(tc.testArgs.ctx, tc.testArgs.client, tc.items)
if err != nil {
t.Errorf("Unexpected error: %v", err)
} else if !tc.expectedFields(result) {
Expand All @@ -67,14 +67,14 @@ func TestSelectItems(t *testing.T) {
}))
}

func selectItem(ctx context.Context, client *clarify.Client, items fields.ResourceQuery) (*clarify.SelectItemsResult, error) {
func selectItems(ctx context.Context, client *clarify.Client, items fields.ResourceQuery) (*clarify.SelectItemsResult, error) {
result, err := client.Clarify().SelectItems(items).Do(ctx)

return result, err
}

func selectItemDefault(a TestArgs) (*clarify.SelectItemsResult, error) {
func selectItemsDefault(a TestArgs) (*clarify.SelectItemsResult, error) {
items := createAnnotationQuery(a.prefix)

return selectItem(a.ctx, a.client, items)
return selectItems(a.ctx, a.client, items)
}
10 changes: 5 additions & 5 deletions test/select_signal_integration_test.go → test/select_signals_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestSelectSignal(t *testing.T) {
prefix: prefix,
}

applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalDefault))
applyTestArgs(a, onlyError(insertDefault), onlyError(saveSignalsDefault))

type testCase struct {
testArgs TestArgs
Expand All @@ -46,7 +46,7 @@ func TestSelectSignal(t *testing.T) {
return func(t *testing.T) {
t.Helper()

result, err := selectSignal(tc.testArgs.ctx, tc.testArgs.client, tc.testArgs.integration, tc.signals)
result, err := selectSignals(tc.testArgs.ctx, tc.testArgs.client, tc.testArgs.integration, tc.signals)
if err != nil {
t.Errorf("Unexpected error: %v", err)
} else if !tc.expectedFields(result) {
Expand All @@ -66,15 +66,15 @@ func TestSelectSignal(t *testing.T) {
}))
}

func selectSignal(ctx context.Context, client *clarify.Client, integration string, signals fields.ResourceQuery) (*clarify.SelectSignalsResult, error) {
func selectSignals(ctx context.Context, client *clarify.Client, integration string, signals fields.ResourceQuery) (*clarify.SelectSignalsResult, error) {
result, err := client.Admin().SelectSignals(integration, signals).Do(ctx)

return result, err
}

//lint:ignore U1000 Ignore unused function temporarily for debugging
func selectSignalDefault(a TestArgs) (*clarify.SelectSignalsResult, error) {
func selectSignalsDefault(a TestArgs) (*clarify.SelectSignalsResult, error) {
signals := createAnnotationQuery(a.prefix)

return selectSignal(a.ctx, a.client, a.integration, signals)
return selectSignals(a.ctx, a.client, a.integration, signals)
}

0 comments on commit f46099c

Please sign in to comment.