vendor: clean up dependencies (#173)

* vendor: remove stray github.com/Sirupsen/logrus
* vendor: remove common lib

access_request_handler_test.go

@@ -8,7 +8,6 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	"github.com/ory/common/pkg"
 	. "github.com/ory/fosite"
 	"github.com/ory/fosite/internal"
 	"github.com/pkg/errors"
@@ -188,7 +187,7 @@ func TestNewAccessRequest(t *testing.T) {
 		if err != nil {
 			t.Logf("Error occured: %v", err)
 		} else {
-			pkg.AssertObjectKeysEqual(t, c.expect, ar, "GrantTypes", "Client")
+			AssertObjectKeysEqual(t, c.expect, ar, "GrantTypes", "Client")
 			assert.NotNil(t, ar.GetRequestedAt())
 		}
 		t.Logf("Passed test case %d", k)

authorize_request_handler_test.go

@@ -8,7 +8,6 @@ import (
 	"context"
 
 	"github.com/golang/mock/gomock"
-	"github.com/ory/common/pkg"
 	. "github.com/ory/fosite"
 	. "github.com/ory/fosite/internal"
 	"github.com/pkg/errors"
@@ -172,7 +171,7 @@ func TestNewAuthorizeRequest(t *testing.T) {
 		if c.expectedError != nil {
 			assert.Equal(t, errors.Cause(err), c.expectedError, "%d: %s\n%s", k, c.desc, err)
 		} else {
-			pkg.AssertObjectKeysEqual(t, c.expect, ar, "ResponseTypes", "Scopes", "Client", "RedirectURI", "State")
+			AssertObjectKeysEqual(t, c.expect, ar, "ResponseTypes", "Scopes", "Client", "RedirectURI", "State")
 			assert.NotNil(t, ar.GetRequestedAt())
 		}
 		t.Logf("Passed test case %d", k)

equalKeys.go

@@ -0,0 +1,49 @@
+package fosite
+
+import "testing"
+import "github.com/oleiade/reflections"
+import "github.com/stretchr/testify/assert"
+import "github.com/stretchr/testify/require"
+
+func AssertObjectKeysEqual(t *testing.T, a, b interface{}, keys ...string) {
+	assert.True(t, len(keys) > 0, "No keys provided.")
+	for _, k := range keys {
+		c, err := reflections.GetField(a, k)
+		assert.Nil(t, err)
+		d, err := reflections.GetField(b, k)
+		assert.Nil(t, err)
+		assert.Equal(t, c, d, "%s", k)
+	}
+}
+
+func AssertObjectKeysNotEqual(t *testing.T, a, b interface{}, keys ...string) {
+	assert.True(t, len(keys) > 0, "No keys provided.")
+	for _, k := range keys {
+		c, err := reflections.GetField(a, k)
+		assert.Nil(t, err)
+		d, err := reflections.GetField(b, k)
+		assert.Nil(t, err)
+		assert.NotEqual(t, c, d, "%s", k)
+	}
+}
+
+func RequireObjectKeysEqual(t *testing.T, a, b interface{}, keys ...string) {
+	assert.True(t, len(keys) > 0, "No keys provided.")
+	for _, k := range keys {
+		c, err := reflections.GetField(a, k)
+		assert.Nil(t, err)
+		d, err := reflections.GetField(b, k)
+		assert.Nil(t, err)
+		require.Equal(t, c, d, "%s", k)
+	}
+}
+func RequireObjectKeysNotEqual(t *testing.T, a, b interface{}, keys ...string) {
+	assert.True(t, len(keys) > 0, "No keys provided.")
+	for _, k := range keys {
+		c, err := reflections.GetField(a, k)
+		assert.Nil(t, err)
+		d, err := reflections.GetField(b, k)
+		assert.Nil(t, err)
+		require.NotEqual(t, c, d, "%s", k)
+	}
+}

equalKeys_test.go

@@ -0,0 +1,17 @@
+package fosite
+
+import "testing"
+
+func TestAssertObjectsAreEqualByKeys(t *testing.T) {
+	type foo struct {
+		Name string
+		Body int
+	}
+	a := &foo{"foo", 1}
+	b := &foo{"bar", 1}
+	c := &foo{"baz", 3}
+
+	AssertObjectKeysEqual(t, a, a, "Name", "Body")
+	AssertObjectKeysNotEqual(t, a, b, "Name")
+	AssertObjectKeysNotEqual(t, a, c, "Name", "Body")
+}

glide.yaml

@@ -21,9 +21,6 @@ import:
 - package: golang.org/x/net
   subpackages:
   - context
-- package: github.com/ory/common
-  subpackages:
-  - pkg
 testImport:
 - package: github.com/gorilla/mux
   version: ~1.1.0
@@ -35,4 +32,3 @@ testImport:
 - package: golang.org/x/oauth2
   subpackages:
   - clientcredentials
-- package: github.com/Sirupsen/logrus