better

clarify · Mar 21, 2024 · be36a9f · be36a9f
1 parent f46099c
commit be36a9f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 37 deletions.
diff --git a/test/common.go b/test/common.go
@@ -62,18 +62,23 @@ func getCredentials(t *testing.T) *clarify.Credentials {
 	username := os.Getenv("CLARIFY_USERNAME")
 	password := os.Getenv("CLARIFY_PASSWORD")
 	endpoint := os.Getenv("CLARIFY_ENDPOINT")
+	credentials := os.Getenv("CLARIFY_CREDENTIALS")
 
-	creds = clarify.BasicAuthCredentials(username, password)
+	switch {
+	case username != "" && password != "":
+		creds = clarify.BasicAuthCredentials(username, password)
 
-	if endpoint != "" {
-		creds.APIURL = endpoint
+		if endpoint != "" {
+			creds.APIURL = endpoint
+		}
+	case credentials != "":
+		creds, err = clarify.CredentialsFromFile(credentials)
+	default:
+		t.Skip("no credentials found, skipping integration tests")
 	}
 
-	if creds.Validate() != nil {
-		creds, err = clarify.CredentialsFromFile("clarify-credentials.json")
-		if err != nil {
-			t.Skip("no credentials found, skipping integration tests")
-		}
+	if err != nil || creds.Validate() != nil {
+		t.Errorf("invalid credentials")
 	}
 
 	return creds

diff --git a/test/evaluate_integration_test.go b/test/evaluate_integration_test.go
@@ -167,21 +167,3 @@ func getListFromResponse(sir *clarify.SelectItemsResult) []string {
 
 	return itemIDs
 }
-
-//lint:ignore U1000 Ignore unused function temporarily for debugging
-func evaluateDefault(a TestArgs) (*clarify.EvaluateResult, error) {
-	query := createAnnotationQuery(a.prefix)
-	ir, err := selectItemsDefault(a)
-	if err != nil {
-		panic(err)
-	}
-
-	itemIDs := getListFromResponse(ir)
-	data := fields.Data().Where(fields.TimeRange(getDefaultTimeRange())).RollupDuration(time.Hour, time.Monday)
-
-	return evaluate(a.ctx, a.client, itemIDs, query, data, fields.TimeAggregationAvg, fields.GroupAggregationAvg)
-}
-
-// func datavask(er clarify.EvaluateResult) clarify.EvaluateResult {
-//     er.Data := er.Data
-// }
diff --git a/test/save_signals_integration_test.go b/test/save_signals_integration_test.go
@@ -25,7 +25,7 @@ import (
 	"github.com/clarify/clarify-go/views"
 )
 
-func TestSaveSignal(t *testing.T) {
+func TestSaveSignals(t *testing.T) {
 	ctx := context.Background()
 	creds := getCredentials(t)
 	client := creds.Client(ctx)
@@ -49,7 +49,7 @@ func TestSaveSignal(t *testing.T) {
 		return func(t *testing.T) {
 			t.Helper()
 
-			result, err := saveSignal(tc.testArgs.ctx, tc.testArgs.client, tc.testArgs.prefix)
+			result, err := saveSignals(tc.testArgs.ctx, tc.testArgs.client, tc.testArgs.prefix)
 			if err != nil {
 				t.Errorf("Unexpected error: %v", err)
 			} else if !tc.expectedFields(result) {
@@ -68,7 +68,7 @@ func TestSaveSignal(t *testing.T) {
 	}))
 }
 
-func saveSignal(ctx context.Context, client *clarify.Client, prefix string) (*clarify.SaveSignalsResult, error) {
+func saveSignals(ctx context.Context, client *clarify.Client, prefix string) (*clarify.SaveSignalsResult, error) {
 	inputs := map[string]views.SignalSave{
 		prefix + "banana-stand/amount": {
 			MetaSave: views.MetaSave{
@@ -125,5 +125,5 @@ func createEnumValues() fields.EnumValues {
 }
 
 func saveSignalsDefault(a TestArgs) (*clarify.SaveSignalsResult, error) {
-	return saveSignal(a.ctx, a.client, a.prefix)
+	return saveSignals(a.ctx, a.client, a.prefix)
 }
diff --git a/test/select_signals_integration_test.go b/test/select_signals_integration_test.go
@@ -71,10 +71,3 @@ func selectSignals(ctx context.Context, client *clarify.Client, integration stri
 
 	return result, err
 }
-
-//lint:ignore U1000 Ignore unused function temporarily for debugging
-func selectSignalsDefault(a TestArgs) (*clarify.SelectSignalsResult, error) {
-	signals := createAnnotationQuery(a.prefix)
-
-	return selectSignals(a.ctx, a.client, a.integration, signals)
-}