fixed unit tests (#85)

xmidt-org · Feb 6, 2020 · 2807fc6 · 2807fc6
1 parent f79358f
commit 2807fc6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/basculeValidators_test.go b/basculeValidators_test.go
@@ -11,27 +11,31 @@ import (
 func TestRequirePartnerIDs(t *testing.T) {
 	var tests = []struct {
 		name       string
-		attributes bascule.Attributes
+		attrMap    map[string]interface{}
 		shouldPass bool
 	}{
 		{
 			name: "partnerIDs",
-			attributes: map[string]interface{}{
+			attrMap: map[string]interface{}{
 				"allowedResources": map[string]interface{}{
 					"allowedPartners": []string{"partner0", "partner1"},
 				}},
 			shouldPass: true,
 		},
 
 		{
-			name:       "no partnerIDs",
-			attributes: nil,
+			name: "no partnerIDs",
+			attrMap: map[string]interface{}{
+				"allowedResources": map[string]interface{}{
+					"allowedPartners": []string{},
+				},
+			},
 		},
 		{
 			name: "malformed partnerIDs field",
-			attributes: map[string]interface{}{
+			attrMap: map[string]interface{}{
 				"allowedResources": map[string]interface{}{
-					"allowedPartners": "partner0",
+					"allowedPartners": []int{0, 1, 2},
 				}},
 		},
 	}
@@ -41,7 +45,8 @@ func TestRequirePartnerIDs(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			assert := assert.New(t)
-			token := bascule.NewToken("bearer", "client0", test.attributes)
+			attrs := bascule.NewAttributesFromMap(test.attrMap)
+			token := bascule.NewToken("bearer", "client0", attrs)
 
 			err := requirePartnerIDs(ctx, token)
 			if test.shouldPass {

diff --git a/primaryHandler_test.go b/primaryHandler_test.go
@@ -2,22 +2,23 @@ package main
 
 import (
 	"context"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/xmidt-org/bascule"
 	"github.com/xmidt-org/webpa-common/logging"
 	"github.com/xmidt-org/wrp-go/wrp"
-	"testing"
 )
 
 func TestPopulateMessagePartners(t *testing.T) {
 	var tests = []struct {
 		name               string
-		attributes         bascule.Attributes
+		attrMap            map[string]interface{}
 		expectedPartnerIDs []string
 	}{
 		{
 			name: "partnerIDs",
-			attributes: map[string]interface{}{
+			attrMap: map[string]interface{}{
 				"allowedResources": map[string]interface{}{
 					"allowedPartners": []string{"partner0", "partner1"},
 				}},
@@ -29,8 +30,9 @@ func TestPopulateMessagePartners(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			assert := assert.New(t)
 
+			attrs := bascule.NewAttributesFromMap(test.attrMap)
 			auth := bascule.Authentication{
-				Token: bascule.NewToken("bearer", "client0", test.attributes),
+				Token: bascule.NewToken("bearer", "client0", attrs),
 			}
 
 			ctx := bascule.WithAuthentication(context.Background(), auth)