vendor: separate test dependencies (#186)

* vendor: Move testify to testImport
* test: Move Assert/Require helpers to _test pkg

Signed-off-by: David Ackroyd <daveo.ackroyd@gmail.com>

Author: dackroyd

equalKeys.go

@@ -1,6 +1,11 @@
-package fosite
+package fosite_test
 
-import "testing"
+import (
+	"testing"
+	"github.com/oleiade/reflections"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
 
 func TestAssertObjectsAreEqualByKeys(t *testing.T) {
 	type foo struct {
@@ -15,3 +20,46 @@ func TestAssertObjectsAreEqualByKeys(t *testing.T) {
 	AssertObjectKeysNotEqual(t, a, b, "Name")
 	AssertObjectKeysNotEqual(t, a, c, "Name", "Body")
 }
+
+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

@@ -13,11 +13,6 @@ import:
   version: ~1.0.0
 - package: github.com/pkg/errors
   version: ~0.8.0
-- package: github.com/stretchr/testify
-  version: ~1.1.4
-  subpackages:
-  - assert
-  - require
 - package: golang.org/x/crypto
   subpackages:
   - bcrypt
@@ -29,3 +24,8 @@ testImport:
 - package: golang.org/x/oauth2
   subpackages:
   - clientcredentials
+- package: github.com/stretchr/testify
+  version: ~1.1.4
+  subpackages:
+  - assert
+  - require