diff options
61 files changed, 536 insertions, 483 deletions
diff --git a/aws/ec2info_test.go b/aws/ec2info_test.go index b2ca9336..2a9efefe 100644 --- a/aws/ec2info_test.go +++ b/aws/ec2info_test.go @@ -9,6 +9,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestTag_MissingKey(t *testing.T) { @@ -144,25 +145,25 @@ func TestGetRegion(t *testing.T) { os.Setenv("AWS_REGION", "kalamazoo") os.Unsetenv("AWS_DEFAULT_REGION") region, err := getRegion() - assert.NoError(t, err) + require.NoError(t, err) assert.Empty(t, region) os.Setenv("AWS_DEFAULT_REGION", "kalamazoo") os.Unsetenv("AWS_REGION") region, err = getRegion() - assert.NoError(t, err) + require.NoError(t, err) assert.Empty(t, region) os.Unsetenv("AWS_DEFAULT_REGION") metaClient := NewDummyEc2Meta() region, err = getRegion(metaClient) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "unknown", region) ec2meta := MockEC2Meta(nil, nil, "us-east-1") region, err = getRegion(ec2meta) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "us-east-1", region) } diff --git a/aws/kms_test.go b/aws/kms_test.go index 72eab2b4..f40c1fec 100644 --- a/aws/kms_test.go +++ b/aws/kms_test.go @@ -7,6 +7,7 @@ import ( "github.com/aws/aws-sdk-go/service/kms" b64 "github.com/hairyhenderson/gomplate/v4/base64" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) // MockKMS is a mock KMSAPI implementation @@ -34,7 +35,7 @@ func TestEncrypt(t *testing.T) { // Success resp, err := kmsClient.Encrypt("dummykey", "plaintextvalue") - assert.NoError(t, err) + require.NoError(t, err) expectedResp, _ := b64.Encode([]byte("PLAINTEXTVALUE")) assert.EqualValues(t, expectedResp, resp) } @@ -47,6 +48,6 @@ func TestDecrypt(t *testing.T) { // Success resp, err := kmsClient.Decrypt(encodedCiphertextBlob) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, "ciphervalue", resp) } diff --git a/aws/sts_test.go b/aws/sts_test.go index 85bbeccd..f3bc2e89 100644 --- a/aws/sts_test.go +++ b/aws/sts_test.go @@ -8,6 +8,7 @@ import ( "github.com/aws/aws-sdk-go/service/sts" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestNewSTS(t *testing.T) { @@ -22,7 +23,7 @@ func TestNewSTS(t *testing.T) { } out, err := s.getCallerID() - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, &sts.GetCallerIdentityOutput{ Account: aws.String("acct"), Arn: aws.String("arn"), @@ -44,7 +45,7 @@ func TestNewSTS(t *testing.T) { defer func() { identifierClient = oldIDClient }() out, err = s.getCallerID() - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, &sts.GetCallerIdentityOutput{ Account: aws.String("acct"), Arn: aws.String("arn"), @@ -68,7 +69,7 @@ func TestGetCallerIDErrors(t *testing.T) { } out, err := s.Account() - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "acct", out) s = NewSTS(ClientOptions{}) diff --git a/coll/coll_test.go b/coll/coll_test.go index fa858b55..31ad1d91 100644 --- a/coll/coll_test.go +++ b/coll/coll_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestSlice(t *testing.T) { @@ -74,7 +75,7 @@ func TestKeys(t *testing.T) { } expected := []string{"bar", "foo"} keys, err := Keys(in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, keys) in2 := map[string]interface{}{ @@ -83,7 +84,7 @@ func TestKeys(t *testing.T) { } expected = []string{"bar", "foo", "baz", "qux"} keys, err = Keys(in, in2) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, keys) in3 := map[string]interface{}{ @@ -94,7 +95,7 @@ func TestKeys(t *testing.T) { } expected = []string{"bar", "foo", "baz", "qux", "Bar", "Foo", "bar", "foo"} keys, err = Keys(in, in2, in3) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, keys) } @@ -108,7 +109,7 @@ func TestValues(t *testing.T) { } expected := []interface{}{2, 1} values, err := Values(in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, values) in2 := map[string]interface{}{ @@ -117,7 +118,7 @@ func TestValues(t *testing.T) { } expected = []interface{}{2, 1, 3, 4} values, err = Values(in, in2) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, values) in3 := map[string]interface{}{ @@ -128,73 +129,73 @@ func TestValues(t *testing.T) { } expected = []interface{}{2, 1, 3, 4, 6, 5, 8, 7} values, err = Values(in, in2, in3) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, values) } func TestAppend(t *testing.T) { out, err := Append(42, []interface{}{}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, out, []interface{}{42}) out, err = Append(42, []interface{}{4.9, false, "foo"}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, out, []interface{}{4.9, false, "foo", 42}) // a strange but valid use-cases, since we're converting to an []interface{} out, err = Append(42, []string{"foo"}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []interface{}{"foo", 42}, out) out, err = Append("baz", []string{"foo", "bar"}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, out, []interface{}{"foo", "bar", "baz"}) } func TestPrepend(t *testing.T) { out, err := Prepend(42, []interface{}{}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, out, []interface{}{42}) out, err = Prepend(42, []interface{}{4.9, false, "foo"}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, out, []interface{}{42, 4.9, false, "foo"}) // a strange but valid use-cases, since we're converting to an []interface{} out, err = Prepend(42, []string{"foo"}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []interface{}{42, "foo"}, out) out, err = Prepend("foo", []string{"bar", "baz"}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, out, []interface{}{"foo", "bar", "baz"}) } func TestUniq(t *testing.T) { out, err := Uniq([]interface{}{1, 2, 3, 1, true, false, true, "1", 2}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []interface{}{1, 2, 3, true, false, "1"}, out) out, err = Uniq([]string{"one", "two", "one", "three"}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []interface{}{"one", "two", "three"}, out) } func TestReverse(t *testing.T) { out, err := Reverse([]interface{}{}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []interface{}{}, out) out, err = Reverse([]interface{}{8}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []interface{}{8}, out) out, err = Reverse([]interface{}{1, 2, 3, 4}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []interface{}{4, 3, 2, 1}, out) out, err = Reverse([]int{1, 2, 3, 4}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []interface{}{4, 3, 2, 1}, out) } @@ -204,7 +205,7 @@ func TestMerge(t *testing.T) { expected := map[string]interface{}{} out, err := Merge(dst, src) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, out) dst = map[string]interface{}{"a": 4, "c": 5} @@ -214,7 +215,7 @@ func TestMerge(t *testing.T) { } out, err = Merge(dst, src) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, out) dst = map[string]interface{}{"a": 4, "c": 5} @@ -225,7 +226,7 @@ func TestMerge(t *testing.T) { } out, err = Merge(dst, src, src2) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, out) dst = map[string]interface{}{"a": false, "c": 5} @@ -236,7 +237,7 @@ func TestMerge(t *testing.T) { } out, err = Merge(dst, src, src2) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, out) dst = map[string]interface{}{"a": true, "c": 5} @@ -251,7 +252,7 @@ func TestMerge(t *testing.T) { } out, err = Merge(dst, src, src2) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, out) dst = map[string]interface{}{ @@ -275,7 +276,7 @@ func TestMerge(t *testing.T) { } out, err = Merge(dst, src) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, out) } @@ -462,7 +463,7 @@ func TestSort(t *testing.T) { d := d t.Run(fmt.Sprintf(`Sort("%s",<%T>)==%#v`, d.key, d.in, d.out), func(t *testing.T) { out, err := Sort(d.key, d.in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, d.out, out) }) } @@ -533,7 +534,7 @@ func TestFlatten(t *testing.T) { for _, d := range data { out, err := Flatten(d.in, d.depth) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, d.expected, out) } diff --git a/coll/index_test.go b/coll/index_test.go index 876a9cce..faff2f98 100644 --- a/coll/index_test.go +++ b/coll/index_test.go @@ -4,27 +4,28 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestIndex(t *testing.T) { out, err := Index(map[string]interface{}{ "foo": "bar", "baz": "qux", }, "foo") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "bar", out) out, err = Index(map[string]interface{}{ "foo": "bar", "baz": "qux", "quux": "corge", }, "foo", 2) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, byte('r'), out) out, err = Index([]interface{}{"foo", "bar", "baz"}, 2) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "baz", out) out, err = Index([]interface{}{"foo", "bar", "baz"}, 2, 2) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, byte('z'), out) // error cases diff --git a/coll/jq_test.go b/coll/jq_test.go index 7f71891c..9c9a39e5 100644 --- a/coll/jq_test.go +++ b/coll/jq_test.go @@ -6,6 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestJQ(t *testing.T) { @@ -47,26 +48,26 @@ func TestJQ(t *testing.T) { }, } out, err := JQ(ctx, ".store.bicycle.color", in) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "red", out) out, err = JQ(ctx, ".store.bicycle.price", in) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 19.95, out) out, err = JQ(ctx, ".store.bogus", in) - assert.NoError(t, err) + require.NoError(t, err) assert.Nil(t, out) _, err = JQ(ctx, "{.store.unclosed", in) assert.Error(t, err) out, err = JQ(ctx, ".store", in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, in["store"], out) out, err = JQ(ctx, ".store.book[].author", in) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, out, 4) assert.Contains(t, out, "Nigel Rees") assert.Contains(t, out, "Evelyn Waugh") @@ -74,7 +75,7 @@ func TestJQ(t *testing.T) { assert.Contains(t, out, "J. R. R. Tolkien") out, err = JQ(ctx, ".store.book[]|select(.price < 10.0 )", in) - assert.NoError(t, err) + require.NoError(t, err) expected := []interface{}{ map[string]interface{}{ "category": "reference", @@ -114,7 +115,7 @@ func TestJQ(t *testing.T) { }, } out, err = JQ(ctx, `tostream|select((.[0]|index("foo")) and (.[0][-1]!="foo") and (.[1])) as $s|($s[0]|index("foo")+1) as $ind|($ind|truncate_stream($s)) as $newstream|$newstream|reduce . as [$p,$v] ({};setpath($p;$v))|add`, in) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, out, 3) assert.Contains(t, out, map[string]interface{}{"aaaa": map[string]interface{}{"bar": 1234}}) assert.Contains(t, out, true) @@ -140,11 +141,11 @@ func TestJQ_typeConversions(t *testing.T) { } out, err := JQ(ctx, ".Bicycle.Color", structIn) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "red", out) out, err = JQ(ctx, ".safe", structIn) - assert.NoError(t, err) + require.NoError(t, err) assert.Nil(t, out) _, err = JQ(ctx, ".*", structIn) @@ -155,55 +156,55 @@ func TestJQ_typeConversions(t *testing.T) { type mapType map[string]interface{} out, err = JQ(ctx, ".foo", mapType{"foo": "bar"}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "bar", out) // sometimes it'll be a pointer... out, err = JQ(ctx, ".foo", &mapType{"foo": "bar"}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "bar", out) // underlying slice type type sliceType []interface{} out, err = JQ(ctx, ".[1]", sliceType{"foo", "bar"}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "bar", out) out, err = JQ(ctx, ".[2]", &sliceType{"foo", "bar", "baz"}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "baz", out) // other basic types out, err = JQ(ctx, ".", []byte("hello")) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, "hello", out) out, err = JQ(ctx, ".", "hello") - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, "hello", out) out, err = JQ(ctx, ".", 1234) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, 1234, out) out, err = JQ(ctx, ".", true) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, true, out) out, err = JQ(ctx, ".", nil) - assert.NoError(t, err) + require.NoError(t, err) assert.Nil(t, out) // underlying basic types type intType int out, err = JQ(ctx, ".", intType(1234)) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, 1234, out) type byteArrayType []byte out, err = JQ(ctx, ".", byteArrayType("hello")) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, "hello", out) } @@ -230,7 +231,7 @@ func TestJQConvertType_passthroughTypes(t *testing.T) { for _, d := range testdata { out, err := jqConvertType(d) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, d, out) } } diff --git a/coll/jsonpath_test.go b/coll/jsonpath_test.go index 663d6613..c697e4de 100644 --- a/coll/jsonpath_test.go +++ b/coll/jsonpath_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) type m = map[string]interface{} @@ -47,11 +48,11 @@ func TestJSONPath(t *testing.T) { }, } out, err := JSONPath(".store.bicycle.color", in) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "red", out) out, err = JSONPath(".store.bicycle.price", in) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 19.95, out) _, err = JSONPath(".store.bogus", in) @@ -61,11 +62,11 @@ func TestJSONPath(t *testing.T) { assert.Error(t, err) out, err = JSONPath(".store", in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, in["store"], out) out, err = JSONPath("$.store.book[*].author", in) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, out, 4) assert.Contains(t, out, "Nigel Rees") assert.Contains(t, out, "Evelyn Waugh") @@ -73,7 +74,7 @@ func TestJSONPath(t *testing.T) { assert.Contains(t, out, "J. R. R. Tolkien") out, err = JSONPath("$..book[?( @.price < 10.0 )]", in) - assert.NoError(t, err) + require.NoError(t, err) expected := ar{ m{ "category": "reference", @@ -113,7 +114,7 @@ func TestJSONPath(t *testing.T) { }, } out, err = JSONPath("..foo.*", in) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, out, 3) assert.Contains(t, out, m{"aaaa": m{"bar": 1234}}) assert.Contains(t, out, true) @@ -135,7 +136,7 @@ func TestJSONPath(t *testing.T) { } out, err = JSONPath(".Bicycle.Color", structIn) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "red", out) _, err = JSONPath(".safe", structIn) diff --git a/context_test.go b/context_test.go index 00ce6330..8fd4da71 100644 --- a/context_test.go +++ b/context_test.go @@ -9,6 +9,7 @@ import ( "github.com/hairyhenderson/gomplate/v4/data" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestEnvMapifiesEnvironment(t *testing.T) { @@ -20,14 +21,14 @@ func TestEnvMapifiesEnvironment(t *testing.T) { func TestEnvGetsUpdatedEnvironment(t *testing.T) { c := &tmplctx{} assert.Empty(t, c.Env()["FOO"]) - assert.NoError(t, os.Setenv("FOO", "foo")) + require.NoError(t, os.Setenv("FOO", "foo")) assert.Equal(t, c.Env()["FOO"], "foo") } func TestCreateContext(t *testing.T) { ctx := context.Background() c, err := createTmplContext(ctx, nil, nil) - assert.NoError(t, err) + require.NoError(t, err) assert.Empty(t, c) fooURL := "env:///foo?type=application/yaml" @@ -44,7 +45,7 @@ func TestCreateContext(t *testing.T) { os.Setenv("foo", "foo: bar") defer os.Unsetenv("foo") c, err = createTmplContext(ctx, []string{"foo"}, d) - assert.NoError(t, err) + require.NoError(t, err) assert.IsType(t, &tmplctx{}, c) tctx := c.(*tmplctx) ds := ((*tctx)["foo"]).(map[string]interface{}) @@ -53,7 +54,7 @@ func TestCreateContext(t *testing.T) { os.Setenv("bar", "bar: baz") defer os.Unsetenv("bar") c, err = createTmplContext(ctx, []string{"."}, d) - assert.NoError(t, err) + require.NoError(t, err) assert.IsType(t, map[string]interface{}{}, c) ds = c.(map[string]interface{}) assert.Equal(t, "baz", ds["bar"]) diff --git a/conv/conv_test.go b/conv/conv_test.go index 62167a49..686667bb 100644 --- a/conv/conv_test.go +++ b/conv/conv_test.go @@ -6,6 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestBool(t *testing.T) { @@ -60,7 +61,7 @@ func TestJoin(t *testing.T) { } for _, d := range testdata { out, err := Join(d.in, d.sep) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, d.out, out) } } diff --git a/crypto/aes_test.go b/crypto/aes_test.go index df00b14b..f4656a40 100644 --- a/crypto/aes_test.go +++ b/crypto/aes_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestEncryptDecryptAESCBC(t *testing.T) { @@ -24,7 +25,7 @@ func TestEncryptDecryptAESCBC(t *testing.T) { // empty content is a pass-through out, err := EncryptAESCBC(key, []byte{}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte{}, out) testdata := [][]byte{ @@ -37,31 +38,31 @@ func TestEncryptDecryptAESCBC(t *testing.T) { for _, d := range testdata { out, err = EncryptAESCBC(key, d) - assert.NoError(t, err) + require.NoError(t, err) assert.NotEqual(t, d, out) out, err = DecryptAESCBC(key, out) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, d, out) } // 128-bit key key = bytes.Repeat([]byte{'a'}, 16) out, err = EncryptAESCBC(key, []byte("foo")) - assert.NoError(t, err) + require.NoError(t, err) assert.NotEqual(t, []byte("foo"), out) out, err = DecryptAESCBC(key, out) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte("foo"), out) // 192-bit key key = bytes.Repeat([]byte{'a'}, 24) out, err = EncryptAESCBC(key, []byte("foo")) - assert.NoError(t, err) + require.NoError(t, err) assert.NotEqual(t, []byte("foo"), out) out, err = DecryptAESCBC(key, out) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte("foo"), out) } diff --git a/crypto/ecdsa_test.go b/crypto/ecdsa_test.go index 186dd7eb..eb7a5ce2 100644 --- a/crypto/ecdsa_test.go +++ b/crypto/ecdsa_test.go @@ -10,6 +10,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func genECDSAPrivKey() (*ecdsa.PrivateKey, string) { @@ -34,28 +35,28 @@ func deriveECPubkey(priv *ecdsa.PrivateKey) string { func TestECDSAGenerateKey(t *testing.T) { key, err := ECDSAGenerateKey(elliptic.P224()) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, strings.HasPrefix(string(key), "-----BEGIN EC PRIVATE KEY-----")) assert.True(t, strings.HasSuffix(string(key), "-----END EC PRIVATE KEY-----\n")) key, err = ECDSAGenerateKey(elliptic.P256()) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, strings.HasPrefix(string(key), "-----BEGIN EC PRIVATE KEY-----")) assert.True(t, strings.HasSuffix(string(key), "-----END EC PRIVATE KEY-----\n")) key, err = ECDSAGenerateKey(elliptic.P384()) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, strings.HasPrefix(string(key), "-----BEGIN EC PRIVATE KEY-----")) assert.True(t, strings.HasSuffix(string(key), "-----END EC PRIVATE KEY-----\n")) key, err = ECDSAGenerateKey(elliptic.P521()) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, strings.HasPrefix(string(key), "-----BEGIN EC PRIVATE KEY-----")) assert.True(t, strings.HasSuffix(string(key), @@ -74,6 +75,6 @@ func TestECDSADerivePublicKey(t *testing.T) { expected := deriveECPubkey(priv) actual, err := ECDSADerivePublicKey([]byte(privKey)) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, string(actual)) } diff --git a/crypto/pbkdf2_test.go b/crypto/pbkdf2_test.go index 327ee322..a905a41d 100644 --- a/crypto/pbkdf2_test.go +++ b/crypto/pbkdf2_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestPBKDF2(t *testing.T) { @@ -22,7 +23,7 @@ func TestPBKDF2(t *testing.T) { 0x2e, 0x83, 0xfe, 0x1b, 0x13, 0x5a, 0x70, 0xe2, 0x3a, 0xed, 0x76, 0x2e, 0x97, 0x10, 0xa1, 0x2e, }, dk) - assert.NoError(t, err) + require.NoError(t, err) dk, err = PBKDF2([]byte("ThisIsAPassword"), []byte("ThisIsASSID"), 4096, 32, crypto.SHA1) assert.EqualValues(t, []byte{ @@ -31,7 +32,7 @@ func TestPBKDF2(t *testing.T) { 0x20, 0x9b, 0x63, 0xdf, 0x70, 0x7d, 0xd5, 0x08, 0xd1, 0x45, 0x81, 0xf8, 0x98, 0x27, 0x21, 0xaf, }, dk) - assert.NoError(t, err) + require.NoError(t, err) dk, err = PBKDF2([]byte("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"), []byte("ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"), 4096, 32, crypto.SHA1) assert.EqualValues(t, []byte{ @@ -40,7 +41,7 @@ func TestPBKDF2(t *testing.T) { 0x8c, 0x59, 0xaf, 0xcb, 0x6e, 0xae, 0x73, 0x48, 0x85, 0x00, 0x13, 0x00, 0xa9, 0x81, 0xcc, 0x62, }, dk) - assert.NoError(t, err) + require.NoError(t, err) // some longer hash functions dk, err = PBKDF2([]byte("password"), []byte("IEEE"), 4096, 64, crypto.SHA512) @@ -54,7 +55,7 @@ func TestPBKDF2(t *testing.T) { 0x47, 0x92, 0x35, 0x2f, 0x66, 0x76, 0xd1, 0x3b, 0x20, 0xa4, 0xc0, 0x37, 0x54, 0x90, 0x3d, 0x7e, }, dk) - assert.NoError(t, err) + require.NoError(t, err) } func TestStrToHash(t *testing.T) { @@ -65,23 +66,23 @@ func TestStrToHash(t *testing.T) { assert.Error(t, err) h, err = StrToHash("SHA-1") assert.Equal(t, crypto.SHA1, h) - assert.NoError(t, err) + require.NoError(t, err) h, err = StrToHash("SHA224") assert.Equal(t, crypto.SHA224, h) - assert.NoError(t, err) + require.NoError(t, err) h, err = StrToHash("SHA-256") assert.Equal(t, crypto.SHA256, h) - assert.NoError(t, err) + require.NoError(t, err) h, err = StrToHash("SHA384") assert.Equal(t, crypto.SHA384, h) - assert.NoError(t, err) + require.NoError(t, err) h, err = StrToHash("SHA-512") assert.Equal(t, crypto.SHA512, h) - assert.NoError(t, err) + require.NoError(t, err) h, err = StrToHash("SHA-512/224") assert.Equal(t, crypto.SHA512_224, h) - assert.NoError(t, err) + require.NoError(t, err) h, err = StrToHash("SHA512/256") assert.Equal(t, crypto.SHA512_256, h) - assert.NoError(t, err) + require.NoError(t, err) } diff --git a/crypto/rsa_test.go b/crypto/rsa_test.go index 42297f2c..38c36d06 100644 --- a/crypto/rsa_test.go +++ b/crypto/rsa_test.go @@ -9,6 +9,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func genPKCS1PrivKey() (*rsa.PrivateKey, string) { @@ -69,10 +70,10 @@ func TestRSACrypt(t *testing.T) { t.Parallel() enc, err := RSAEncrypt(d.encKey, d.in) - assert.NoError(t, err) + require.NoError(t, err) dec, err := RSADecrypt(d.decKey, enc) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, d.in, dec) }) } @@ -112,7 +113,7 @@ func TestRSAGenerateKey(t *testing.T) { assert.Error(t, err) key, err := RSAGenerateKey(2048) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, strings.HasPrefix(string(key), "-----BEGIN RSA PRIVATE KEY-----")) assert.True(t, strings.HasSuffix(string(key), @@ -133,6 +134,6 @@ func TestRSADerivePublicKey(t *testing.T) { expected := derivePKIXPubKey(priv) actual, err := RSADerivePublicKey([]byte(privKey)) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, string(actual)) } diff --git a/data/data_test.go b/data/data_test.go index 2d847a99..4bfea43e 100644 --- a/data/data_test.go +++ b/data/data_test.go @@ -8,6 +8,7 @@ import ( "github.com/ugorji/go/codec" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "os" @@ -24,7 +25,7 @@ func TestUnmarshalObj(t *testing.T) { test := func(actual map[string]interface{}, err error) { t.Helper() - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected["foo"], actual["foo"], "foo") assert.Equal(t, expected["one"], actual["one"], "one") assert.Equal(t, expected["true"], actual["true"], "true") @@ -72,7 +73,7 @@ func TestUnmarshalArray(t *testing.T) { }} test := func(actual []interface{}, err error) { - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, actual) } test(JSONArray(`["foo","bar",{"baz":{"qux": true},"quux":{"42":18},"corge":{"false":"blah"}}]`)) @@ -112,7 +113,7 @@ this shouldn't be reached 42: 18 false: blah `) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []interface{}{ map[string]interface{}{ @@ -148,7 +149,7 @@ func TestMarshalObj(t *testing.T) { actual, err := marshalObj(nil, func(in interface{}) ([]byte, error) { return []byte("foo"), nil }) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, actual) _, err = marshalObj(nil, func(in interface{}) ([]byte, error) { return nil, fmt.Errorf("fail") @@ -159,7 +160,7 @@ func TestMarshalObj(t *testing.T) { func TestToJSONBytes(t *testing.T) { expected := []byte("null") actual, err := toJSONBytes(nil) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, actual) _, err = toJSONBytes(&badObject{}) @@ -192,7 +193,7 @@ func TestToJSON(t *testing.T) { }, } out, err := ToJSON(in) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, out) _, err = ToJSON(&badObject{}) @@ -225,7 +226,7 @@ func TestToJSONPretty(t *testing.T) { }, } out, err := ToJSONPretty(" ", in) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, out) _, err = ToJSONPretty(" ", &badObject{}) @@ -256,7 +257,7 @@ key`: map[string]interface{}{ "d": time.Date(2006, time.January, 2, 15, 4, 5, 999999999, mst), } out, err := ToYAML(in) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, out) } @@ -279,7 +280,7 @@ func TestCSV(t *testing.T) { } for _, d := range testdata { out, err := CSV(d.args...) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, d.out, out) } } @@ -316,7 +317,7 @@ func TestCSVByRow(t *testing.T) { } for _, d := range testdata { out, err := CSVByRow(d.args...) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, d.out, out) } } @@ -344,7 +345,7 @@ func TestCSVByColumn(t *testing.T) { } for _, d := range testdata { out, err := CSVByColumn(d.args...) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, d.out, out) } } @@ -368,13 +369,13 @@ func TestToCSV(t *testing.T) { expected := "first,second,third\r\n1,2,3\r\n4,5,6\r\n" out, err := ToCSV(in) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, out) expected = "first;second;third\r\n1;2;3\r\n4;5;6\r\n" out, err = ToCSV(";", in) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, out) _, err = ToCSV(42, [][]int{{1, 2}}) @@ -389,7 +390,7 @@ func TestToCSV(t *testing.T) { {"1", "2", "3"}, {"4", "5", "6"}, }) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, out) expected = "first|second|third\r\n1|2|3\r\n4|5|6\r\n" @@ -398,7 +399,7 @@ func TestToCSV(t *testing.T) { []interface{}{1, "2", 3}, []interface{}{"4", 5, "6"}, }) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, out) } @@ -473,7 +474,7 @@ hosts = [ } out, err := TOML(in) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, out) } @@ -500,7 +501,7 @@ true = true }, } out, err := ToTOML(in) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, out) } @@ -519,11 +520,11 @@ func TestDecryptEJSON(t *testing.T) { t.Setenv("EJSON_KEY", privateKey) actual, err := decryptEJSON(in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, actual) actual, err = JSON(in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, actual) tmpDir := fs.NewDir(t, "gomplate-ejsontest", @@ -534,14 +535,14 @@ func TestDecryptEJSON(t *testing.T) { os.Unsetenv("EJSON_KEY") t.Setenv("EJSON_KEY_FILE", tmpDir.Join(publicKey)) actual, err = decryptEJSON(in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, actual) os.Unsetenv("EJSON_KEY") os.Unsetenv("EJSON_KEY_FILE") t.Setenv("EJSON_KEYDIR", tmpDir.Path()) actual, err = decryptEJSON(in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, actual) } @@ -563,7 +564,7 @@ QUX='single quotes ignore $variables' "QUX": "single quotes ignore $variables", } out, err := dotEnv(in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, out) } @@ -612,7 +613,7 @@ func TestStringifyYAMLArrayMapKeys(t *testing.T) { for _, c := range cases { err := stringifyYAMLArrayMapKeys(c.input) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, c.want, c.input) } } @@ -654,7 +655,7 @@ func TestStringifyYAMLMapMapKeys(t *testing.T) { for _, c := range cases { err := stringifyYAMLMapMapKeys(c.input) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, c.want, c.input) } } diff --git a/data/datasource_aws_sm_test.go b/data/datasource_aws_sm_test.go index f4e28a4e..17f61603 100644 --- a/data/datasource_aws_sm_test.go +++ b/data/datasource_aws_sm_test.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/secretsmanager" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) // DummyAWSSecretsManagerSecretGetter - test double @@ -88,7 +89,7 @@ func TestAWSSecretsManager_ParseAWSSecretsManagerArgs(t *testing.T) { args = nil } params, p, err := parseDatasourceURLArgs(mustParseURL(d.u), args...) - assert.NoError(t, err) + require.NoError(t, err) if d.eParams == nil { assert.Empty(t, params) } else { @@ -154,7 +155,7 @@ func TestAWSSecretsManager_ReadSecret(t *testing.T) { output, err := readAWSSecretsManagerParam(context.Background(), s, "/foo/bar") assert.True(t, calledOk) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte("blub"), output) } @@ -171,6 +172,6 @@ func TestAWSSecretsManager_ReadSecretBinary(t *testing.T) { output, err := readAWSSecretsManagerParam(context.Background(), s, "/foo/bar") assert.True(t, calledOk) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte("supersecret"), output) } diff --git a/data/datasource_awssmp_test.go b/data/datasource_awssmp_test.go index 06d3e035..5c5e02db 100644 --- a/data/datasource_awssmp_test.go +++ b/data/datasource_awssmp_test.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/ssm" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) // DummyParamGetter - test double @@ -126,7 +127,7 @@ func TestAWSSMP_listAWSSMPParams(t *testing.T) { }, }) data, err := listAWSSMPParams(ctx, s, "/") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte(`["a","b","c"]`), data) s = simpleAWSSourceHelper(DummyParamGetter{ @@ -138,6 +139,6 @@ func TestAWSSMP_listAWSSMPParams(t *testing.T) { }, }) data, err = listAWSSMPParams(ctx, s, "/a/") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte(`["a","b","c"]`), data) } diff --git a/data/datasource_blob_test.go b/data/datasource_blob_test.go index 7763d8e9..b3e40e3e 100644 --- a/data/datasource_blob_test.go +++ b/data/datasource_blob_test.go @@ -12,6 +12,7 @@ import ( "github.com/johannesboyne/gofakes3/backend/s3mem" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func setupTestBucket(t *testing.T) (*httptest.Server, *url.URL) { @@ -20,26 +21,26 @@ func setupTestBucket(t *testing.T) (*httptest.Server, *url.URL) { ts := httptest.NewServer(faker.Server()) err := backend.CreateBucket("mybucket") - assert.NoError(t, err) + require.NoError(t, err) c := "hello" err = putFile(backend, "mybucket", "file1", "text/plain", c) - assert.NoError(t, err) + require.NoError(t, err) c = `{"value": "goodbye world"}` err = putFile(backend, "mybucket", "file2", "application/json", c) - assert.NoError(t, err) + require.NoError(t, err) c = `value: what a world` err = putFile(backend, "mybucket", "file3", "application/yaml", c) - assert.NoError(t, err) + require.NoError(t, err) c = `value: out of this world` err = putFile(backend, "mybucket", "dir1/file1", "application/yaml", c) - assert.NoError(t, err) + require.NoError(t, err) c = `value: foo` err = putFile(backend, "mybucket", "dir1/file2", "application/yaml", c) - assert.NoError(t, err) + require.NoError(t, err) u, _ := url.Parse(ts.URL) return ts, u @@ -67,12 +68,12 @@ func TestReadBlob(t *testing.T) { defer os.Unsetenv("AWS_ANON") d, err := NewData([]string{"-d", "data=s3://mybucket/file1?region=us-east-1&disableSSL=true&s3ForcePathStyle=true&type=text/plain&endpoint=" + u.Host}, nil) - assert.NoError(t, err) + require.NoError(t, err) var expected interface{} expected = "hello" out, err := d.Datasource("data") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, out) os.Unsetenv("AWS_ANON") @@ -85,27 +86,27 @@ func TestReadBlob(t *testing.T) { defer os.Unsetenv("AWS_S3_ENDPOINT") d, err = NewData([]string{"-d", "data=s3://mybucket/file2?region=us-east-1&disableSSL=true&s3ForcePathStyle=true"}, nil) - assert.NoError(t, err) + require.NoError(t, err) expected = map[string]interface{}{"value": "goodbye world"} out, err = d.Datasource("data") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, out) d, err = NewData([]string{"-d", "data=s3://mybucket/?region=us-east-1&disableSSL=true&s3ForcePathStyle=true"}, nil) - assert.NoError(t, err) + require.NoError(t, err) expected = []interface{}{"dir1/", "file1", "file2", "file3"} out, err = d.Datasource("data") - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, out) d, err = NewData([]string{"-d", "data=s3://mybucket/dir1/?region=us-east-1&disableSSL=true&s3ForcePathStyle=true"}, nil) - assert.NoError(t, err) + require.NoError(t, err) expected = []interface{}{"file1", "file2"} out, err = d.Datasource("data") - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, out) } diff --git a/data/datasource_env_test.go b/data/datasource_env_test.go index c7723b3b..7a10b347 100644 --- a/data/datasource_env_test.go +++ b/data/datasource_env_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func mustParseURL(in string) *url.URL { @@ -26,30 +27,30 @@ func TestReadEnv(t *testing.T) { source := &Source{Alias: "foo", URL: mustParseURL("env:HELLO_WORLD")} actual, err := readEnv(ctx, source) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, content, actual) source = &Source{Alias: "foo", URL: mustParseURL("env:/HELLO_WORLD")} actual, err = readEnv(ctx, source) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, content, actual) source = &Source{Alias: "foo", URL: mustParseURL("env:///HELLO_WORLD")} actual, err = readEnv(ctx, source) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, content, actual) source = &Source{Alias: "foo", URL: mustParseURL("env:HELLO_WORLD?foo=bar")} actual, err = readEnv(ctx, source) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, content, actual) source = &Source{Alias: "foo", URL: mustParseURL("env:///HELLO_WORLD?foo=bar")} actual, err = readEnv(ctx, source) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, content, actual) } diff --git a/data/datasource_file_test.go b/data/datasource_file_test.go index 8f2a7f0a..420ca380 100644 --- a/data/datasource_file_test.go +++ b/data/datasource_file_test.go @@ -7,6 +7,7 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestReadFile(t *testing.T) { @@ -30,7 +31,7 @@ func TestReadFile(t *testing.T) { source.fs = fs actual, err := readFile(ctx, source) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, content, actual) source = &Source{Alias: "bogus", URL: mustParseURL("file:///bogus")} @@ -41,30 +42,30 @@ func TestReadFile(t *testing.T) { source = &Source{Alias: "partial", URL: mustParseURL("file:///tmp/partial")} source.fs = fs actual, err = readFile(ctx, source, "foo.txt") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, content, actual) source = &Source{Alias: "dir", URL: mustParseURL("file:///tmp/partial/")} source.fs = fs actual, err = readFile(ctx, source) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte(`["bar.txt","baz.txt","foo.txt"]`), actual) source = &Source{Alias: "dir", URL: mustParseURL("file:///tmp/partial/?type=application/json")} source.fs = fs actual, err = readFile(ctx, source) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte(`["bar.txt","baz.txt","foo.txt"]`), actual) mime, err := source.mimeType("") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "application/json", mime) source = &Source{Alias: "dir", URL: mustParseURL("file:///tmp/partial/?type=application/json")} source.fs = fs actual, err = readFile(ctx, source, "foo.txt") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, content, actual) mime, err = source.mimeType("") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "application/json", mime) } diff --git a/data/datasource_http_test.go b/data/datasource_http_test.go index 5d279712..a742d9e5 100644 --- a/data/datasource_http_test.go +++ b/data/datasource_http_test.go @@ -10,6 +10,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func must(r interface{}, err error) interface{} { @@ -67,11 +68,11 @@ func TestHTTPFile(t *testing.T) { } actual, err := data.Datasource("foo") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, must(marshalObj(expected, json.Marshal)), must(marshalObj(actual, json.Marshal))) actual, err = data.Datasource(server.URL) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, must(marshalObj(expected, json.Marshal)), must(marshalObj(actual, json.Marshal))) } @@ -104,7 +105,7 @@ func TestHTTPFileWithHeaders(t *testing.T) { "Foo": {"bar", "baz"}, } actual, err := data.Datasource("foo") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, must(marshalObj(expected, json.Marshal)), must(marshalObj(actual, json.Marshal))) expected = http.Header{ @@ -118,7 +119,7 @@ func TestHTTPFileWithHeaders(t *testing.T) { ExtraHeaders: map[string]http.Header{server.URL: expected}, } actual, err = data.Datasource(server.URL) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, must(marshalObj(expected, json.Marshal)), must(marshalObj(actual, json.Marshal))) } @@ -126,24 +127,24 @@ func TestBuildURL(t *testing.T) { expected := "https://example.com/index.html" base := mustParseURL(expected) u, err := buildURL(base) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, u.String()) expected = "https://example.com/index.html" base = mustParseURL("https://example.com") u, err = buildURL(base, "index.html") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, u.String()) expected = "https://example.com/a/b/c/index.html" base = mustParseURL("https://example.com/a/") u, err = buildURL(base, "b/c/index.html") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, u.String()) expected = "https://example.com/bar/baz/index.html" base = mustParseURL("https://example.com/foo") u, err = buildURL(base, "bar/baz/index.html") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, u.String()) } diff --git a/data/datasource_merge_test.go b/data/datasource_merge_test.go index 2d81c98a..66365f36 100644 --- a/data/datasource_merge_test.go +++ b/data/datasource_merge_test.go @@ -10,6 +10,7 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestReadMerge(t *testing.T) { @@ -59,17 +60,17 @@ func TestReadMerge(t *testing.T) { } actual, err := d.readMerge(ctx, source) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, mergedContent, string(actual)) source.URL = mustParseURL("merge:bar|baz") actual, err = d.readMerge(ctx, source) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, mergedContent, string(actual)) source.URL = mustParseURL("merge:./jsonfile.json|baz") actual, err = d.readMerge(ctx, source) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, mergedContent, string(actual)) source.URL = mustParseURL("merge:file:///tmp/jsonfile.json") @@ -100,7 +101,7 @@ func TestMergeData(t *testing.T) { "z": "def", } out, err := mergeData([]map[string]interface{}{def}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "f: true\nt: false\nz: def\n", string(out)) over := map[string]interface{}{ @@ -109,7 +110,7 @@ func TestMergeData(t *testing.T) { "z": "over", } out, err = mergeData([]map[string]interface{}{over, def}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "f: false\nt: true\nz: over\n", string(out)) over = map[string]interface{}{ @@ -121,14 +122,14 @@ func TestMergeData(t *testing.T) { }, } out, err = mergeData([]map[string]interface{}{over, def}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "f: false\nm:\n a: aaa\nt: true\nz: over\n", string(out)) uber := map[string]interface{}{ "z": "über", } out, err = mergeData([]map[string]interface{}{uber, over, def}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "f: false\nm:\n a: aaa\nt: true\nz: über\n", string(out)) uber = map[string]interface{}{ @@ -138,7 +139,7 @@ func TestMergeData(t *testing.T) { }, } out, err = mergeData([]map[string]interface{}{uber, over, def}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "f: false\nm: notamap\nt: true\nz:\n b: bbb\n", string(out)) uber = map[string]interface{}{ @@ -147,6 +148,6 @@ func TestMergeData(t *testing.T) { }, } out, err = mergeData([]map[string]interface{}{uber, over, def}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "f: false\nm:\n a: aaa\n b: bbb\nt: true\nz: over\n", string(out)) } diff --git a/data/datasource_stdin_test.go b/data/datasource_stdin_test.go index 6cd34133..8cef6827 100644 --- a/data/datasource_stdin_test.go +++ b/data/datasource_stdin_test.go @@ -6,6 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestReadStdin(t *testing.T) { @@ -13,7 +14,7 @@ func TestReadStdin(t *testing.T) { ctx = ContextWithStdin(ctx, strings.NewReader("foo")) out, err := readStdin(ctx, nil) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte("foo"), out) ctx = ContextWithStdin(ctx, errorReader{}) diff --git a/data/datasource_test.go b/data/datasource_test.go index 5455699e..c0d0c70a 100644 --- a/data/datasource_test.go +++ b/data/datasource_test.go @@ -12,31 +12,32 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) const osWindows = "windows" func TestNewData(t *testing.T) { d, err := NewData(nil, nil) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, d.Sources, 0) d, err = NewData([]string{"foo=http:///foo.json"}, nil) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "/foo.json", d.Sources["foo"].URL.Path) d, err = NewData([]string{"foo=http:///foo.json"}, []string{}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "/foo.json", d.Sources["foo"].URL.Path) assert.Empty(t, d.Sources["foo"].Header) d, err = NewData([]string{"foo=http:///foo.json"}, []string{"bar=Accept: blah"}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "/foo.json", d.Sources["foo"].URL.Path) assert.Empty(t, d.Sources["foo"].Header) d, err = NewData([]string{"foo=http:///foo.json"}, []string{"foo=Accept: blah"}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "/foo.json", d.Sources["foo"].URL.Path) assert.Equal(t, "blah", d.Sources["foo"].Header["Accept"][0]) } @@ -72,7 +73,7 @@ func TestDatasource(t *testing.T) { data := setup(ext, mime, contents) actual, err := data.Datasource("foo") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, actual) } @@ -92,7 +93,7 @@ func TestDatasource(t *testing.T) { d := setup("", textMimetype, nil) actual, err := d.Datasource("foo") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "", actual) _, err = d.Datasource("bar") @@ -174,7 +175,7 @@ func TestInclude(t *testing.T) { Sources: sources, } actual, err := data.Include("foo") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, contents, actual) } @@ -201,7 +202,7 @@ func TestDefineDatasource(t *testing.T) { d = &Data{} _, err = d.DefineDatasource("data", "foo.json") s := d.Sources["data"] - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "data", s.Alias) assert.Equal(t, "file", s.URL.Scheme) assert.True(t, s.URL.IsAbs()) @@ -209,7 +210,7 @@ func TestDefineDatasource(t *testing.T) { d = &Data{} _, err = d.DefineDatasource("data", "/otherdir/foo.json") s = d.Sources["data"] - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "data", s.Alias) assert.Equal(t, "file", s.URL.Scheme) assert.True(t, s.URL.IsAbs()) @@ -218,7 +219,7 @@ func TestDefineDatasource(t *testing.T) { d = &Data{} _, err = d.DefineDatasource("data", "sftp://example.com/blahblah/foo.json") s = d.Sources["data"] - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "data", s.Alias) assert.Equal(t, "sftp", s.URL.Scheme) assert.True(t, s.URL.IsAbs()) @@ -231,17 +232,17 @@ func TestDefineDatasource(t *testing.T) { } _, err = d.DefineDatasource("data", "/otherdir/foo.json") s = d.Sources["data"] - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "data", s.Alias) assert.Nil(t, s.URL) d = &Data{} _, err = d.DefineDatasource("data", "/otherdir/foo?type=application/x-env") s = d.Sources["data"] - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "data", s.Alias) m, err := s.mimeType("") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "application/x-env", m) } @@ -280,7 +281,7 @@ func TestMimeType(t *testing.T) { t.Run(fmt.Sprintf("%d:%q,%q==%q", i, d.url, d.mediaType, d.expected), func(t *testing.T) { s := &Source{URL: mustParseURL(d.url), mediaType: d.mediaType} mt, err := s.mimeType("") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, d.expected, mt) }) } @@ -336,7 +337,7 @@ func TestMimeTypeWithArg(t *testing.T) { t.Run(fmt.Sprintf("%d:%q,%q,%q==%q", i, d.url, d.mediaType, d.arg, d.expected), func(t *testing.T) { s := &Source{URL: mustParseURL(d.url), mediaType: d.mediaType} mt, err := s.mimeType(d.arg) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, d.expected, mt) }) } diff --git a/data/datasource_vault_test.go b/data/datasource_vault_test.go index 0864fcb9..1c63d696 100644 --- a/data/datasource_vault_test.go +++ b/data/datasource_vault_test.go @@ -7,6 +7,7 @@ import ( "github.com/hairyhenderson/gomplate/v4/vault" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestReadVault(t *testing.T) { @@ -24,20 +25,20 @@ func TestReadVault(t *testing.T) { } r, err := readVault(ctx, source) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte(expected), r) r, err = readVault(ctx, source, "bar") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte(expected), r) r, err = readVault(ctx, source, "?param=value") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte(expected), r) source.URL, _ = url.Parse("vault:///secret/foo?param1=value1¶m2=value2") r, err = readVault(ctx, source) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte(expected), r) expected = "[\"one\",\"two\"]\n" @@ -45,6 +46,6 @@ func TestReadVault(t *testing.T) { defer server.Close() source.URL, _ = url.Parse("vault:///secret/foo/") r, err = readVault(ctx, source) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []byte(expected), r) } diff --git a/file/file_test.go b/file/file_test.go index 215acbfe..73821f50 100644 --- a/file/file_test.go +++ b/file/file_test.go @@ -7,6 +7,7 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" tfs "gotest.tools/v3/fs" ) @@ -19,7 +20,7 @@ func TestRead(t *testing.T) { _, _ = f.Write([]byte("foo")) actual, err := Read("/tmp/foo") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "foo", actual) _, err = Read("/tmp/bar") @@ -38,7 +39,7 @@ func TestReadDir(t *testing.T) { fs.Create("/tmp/qux/quux") actual, err := ReadDir("/tmp") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []string{"bar", "baz", "foo", "qux"}, actual) _, err = ReadDir("/tmp/foo") @@ -60,37 +61,37 @@ func TestWrite(t *testing.T) { badwd, _ = filepath.EvalSymlinks(badwd) err := os.Chdir(newwd) - assert.NoError(t, err) + require.NoError(t, err) err = Write("/foo", []byte("Hello world")) assert.Error(t, err) rel, err := filepath.Rel(newwd, badwd) - assert.NoError(t, err) + require.NoError(t, err) err = Write(rel, []byte("Hello world")) assert.Error(t, err) foopath := filepath.Join(newwd, "foo") err = Write(foopath, []byte("Hello world")) - assert.NoError(t, err) + require.NoError(t, err) out, err := os.ReadFile(foopath) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "Hello world", string(out)) err = Write(foopath, []byte("truncate")) - assert.NoError(t, err) + require.NoError(t, err) out, err = os.ReadFile(foopath) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "truncate", string(out)) foopath = filepath.Join(newwd, "nonexistant", "subdir", "foo") err = Write(foopath, []byte("Hello subdirranean world!")) - assert.NoError(t, err) + require.NoError(t, err) out, err = os.ReadFile(foopath) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "Hello subdirranean world!", string(out)) } @@ -102,13 +103,13 @@ func TestAssertPathInWD(t *testing.T) { assert.Error(t, err) err = assertPathInWD(filepath.Join(oldwd, "subpath")) - assert.NoError(t, err) + require.NoError(t, err) err = assertPathInWD("subpath") - assert.NoError(t, err) + require.NoError(t, err) err = assertPathInWD("./subpath") - assert.NoError(t, err) + require.NoError(t, err) err = assertPathInWD(filepath.Join("..", "bogus")) assert.Error(t, err) @@ -118,5 +119,5 @@ func TestAssertPathInWD(t *testing.T) { base := filepath.Base(oldwd) err = assertPathInWD(filepath.Join("..", base)) - assert.NoError(t, err) + require.NoError(t, err) } diff --git a/funcs/base64_test.go b/funcs/base64_test.go index 54cd993b..de02bdaa 100644 --- a/funcs/base64_test.go +++ b/funcs/base64_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestCreateBase64Funcs(t *testing.T) { @@ -45,7 +46,7 @@ func TestBase64DecodeBytes(t *testing.T) { bf := &Base64Funcs{} out, err := bf.DecodeBytes("Zm9vYmFy") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "foobar", string(out)) } diff --git a/funcs/coll_test.go b/funcs/coll_test.go index 96bb9248..3139f1ec 100644 --- a/funcs/coll_test.go +++ b/funcs/coll_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestCreateCollFuncs(t *testing.T) { @@ -38,11 +39,11 @@ func TestFlatten(t *testing.T) { assert.Error(t, err) out, err := c.Flatten([]interface{}{1, []interface{}{[]int{2}, 3}}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []interface{}{1, 2, 3}, out) out, err = c.Flatten(1, []interface{}{1, []interface{}{[]int{2}, 3}}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []interface{}{1, []int{2}, 3}, out) } @@ -72,7 +73,7 @@ func TestPick(t *testing.T) { "": "baz", } out, err := c.Pick("baz", in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, map[string]interface{}{}, out) expected := map[string]interface{}{ @@ -80,18 +81,18 @@ func TestPick(t *testing.T) { "bar": true, } out, err = c.Pick("foo", "bar", in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, out) expected = map[string]interface{}{ "": "baz", } out, err = c.Pick("", in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, out) out, err = c.Pick("foo", "bar", "", in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, in, out) } @@ -121,7 +122,7 @@ func TestOmit(t *testing.T) { "": "baz", } out, err := c.Omit("baz", in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, in, out) expected := map[string]interface{}{ @@ -129,18 +130,18 @@ func TestOmit(t *testing.T) { "bar": true, } out, err = c.Omit("", in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, out) expected = map[string]interface{}{ "": "baz", } out, err = c.Omit("foo", "bar", in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, out) out, err = c.Omit("foo", "bar", "", in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, map[string]interface{}{}, out) } @@ -165,14 +166,14 @@ func TestGoSlice(t *testing.T) { // valid slice, no slicing in = reflect.ValueOf([]int{1}) out, err := c.GoSlice(in) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, reflect.TypeOf([]int{}), out.Type()) assert.EqualValues(t, []int{1}, out.Interface()) // valid slice, slicing in = reflect.ValueOf([]string{"foo", "bar", "baz"}) out, err = c.GoSlice(in, reflect.ValueOf(1), reflect.ValueOf(3)) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, reflect.TypeOf([]string{}), out.Type()) assert.EqualValues(t, []string{"bar", "baz"}, out.Interface()) } diff --git a/funcs/crypto_test.go b/funcs/crypto_test.go index a2480498..163fbd55 100644 --- a/funcs/crypto_test.go +++ b/funcs/crypto_test.go @@ -8,6 +8,7 @@ import ( "github.com/hairyhenderson/gomplate/v4/internal/config" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestCreateCryptoFuncs(t *testing.T) { @@ -35,11 +36,11 @@ func TestPBKDF2(t *testing.T) { c := testCryptoNS() dk, err := c.PBKDF2("password", []byte("IEEE"), "4096", 32) assert.Equal(t, "f42c6fc52df0ebef9ebb4b90b38a5f902e83fe1b135a70e23aed762e9710a12e", dk) - assert.NoError(t, err) + require.NoError(t, err) dk, err = c.PBKDF2([]byte("password"), "IEEE", 4096, "64", "SHA-512") assert.Equal(t, "c16f4cb6d03e23614399dee5e7f676fb1da0eb9471b6a74a6c5bc934c6ec7d2ab7028fbb1000b1beb97f17646045d8144792352f6676d13b20a4c03754903d7e", dk) - assert.NoError(t, err) + require.NoError(t, err) _, err = c.PBKDF2(nil, nil, nil, nil, "bogus") assert.Error(t, err) @@ -51,7 +52,7 @@ func TestWPAPSK(t *testing.T) { c := testCryptoNS() dk, err := c.WPAPSK("password", "MySSID") assert.Equal(t, "3a98def84b11644a17ebcc9b17955d2360ce8b8a85b8a78413fc551d722a84e7", dk) - assert.NoError(t, err) + require.NoError(t, err) } func TestSHA(t *testing.T) { @@ -89,7 +90,7 @@ func TestBcrypt(t *testing.T) { t.Parallel() actual, err := c.Bcrypt(in) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, strings.HasPrefix(actual, "$2a$10$")) }) @@ -97,7 +98,7 @@ func TestBcrypt(t *testing.T) { t.Parallel() actual, err := c.Bcrypt(0, in) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, strings.HasPrefix(actual, "$2a$10$")) }) @@ -105,7 +106,7 @@ func TestBcrypt(t *testing.T) { t.Parallel() actual, err := c.Bcrypt(4, in) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, strings.HasPrefix(actual, "$2a$04$")) }) @@ -128,7 +129,7 @@ func TestRSAGenerateKey(t *testing.T) { assert.Error(t, err) key, err := c.RSAGenerateKey(2048) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, strings.HasPrefix(key, "-----BEGIN RSA PRIVATE KEY-----")) assert.True(t, strings.HasSuffix(key, @@ -144,7 +145,7 @@ func TestECDSAGenerateKey(t *testing.T) { assert.Error(t, err) key, err := c.ECDSAGenerateKey("P-256") - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, strings.HasPrefix(key, "-----BEGIN EC PRIVATE KEY-----")) assert.True(t, strings.HasSuffix(key, @@ -159,7 +160,7 @@ func TestECDSADerivePublicKey(t *testing.T) { key, _ := c.ECDSAGenerateKey("P-256") pub, err := c.ECDSADerivePublicKey(key) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, strings.HasPrefix(pub, "-----BEGIN PUBLIC KEY-----")) assert.True(t, strings.HasSuffix(pub, @@ -175,20 +176,20 @@ func TestRSACrypt(t *testing.T) { c := testCryptoNS() key, err := c.RSAGenerateKey() - assert.NoError(t, err) + require.NoError(t, err) pub, err := c.RSADerivePublicKey(key) - assert.NoError(t, err) + require.NoError(t, err) in := "hello world" enc, err := c.RSAEncrypt(pub, in) - assert.NoError(t, err) + require.NoError(t, err) dec, err := c.RSADecrypt(key, enc) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, in, dec) b, err := c.RSADecryptBytes(key, enc) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, dec, string(b)) } @@ -204,24 +205,24 @@ func TestAESCrypt(t *testing.T) { assert.Error(t, err) enc, err := c.EncryptAES(key, in) - assert.NoError(t, err) + require.NoError(t, err) dec, err := c.DecryptAES(key, enc) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, in, dec) b, err := c.DecryptAESBytes(key, enc) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, dec, string(b)) enc, err = c.EncryptAES(key, 128, in) - assert.NoError(t, err) + require.NoError(t, err) dec, err = c.DecryptAES(key, 128, enc) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, in, dec) b, err = c.DecryptAESBytes(key, 128, enc) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, dec, string(b)) } diff --git a/funcs/file_test.go b/funcs/file_test.go index 372d00d8..d36f7f65 100644 --- a/funcs/file_test.go +++ b/funcs/file_test.go @@ -8,6 +8,7 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestCreateFileFuncs(t *testing.T) { @@ -75,6 +76,6 @@ func TestFileWalk(t *testing.T) { actualPaths, err := ff.Walk(string(filepath.Separator) + "tmp") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expectedPaths, actualPaths) } diff --git a/funcs/random_test.go b/funcs/random_test.go index f32641c3..00f0042a 100644 --- a/funcs/random_test.go +++ b/funcs/random_test.go @@ -7,6 +7,7 @@ import ( "unicode/utf8" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestCreateRandomFuncs(t *testing.T) { @@ -31,11 +32,11 @@ func TestASCII(t *testing.T) { f := RandomFuncs{} s, err := f.ASCII(0) - assert.NoError(t, err) + require.NoError(t, err) assert.Empty(t, s) s, err = f.ASCII(100) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, s, 100) assert.Regexp(t, "^[[:print:]]*$", s) } @@ -49,11 +50,11 @@ func TestAlpha(t *testing.T) { f := RandomFuncs{} s, err := f.Alpha(0) - assert.NoError(t, err) + require.NoError(t, err) assert.Empty(t, s) s, err = f.Alpha(100) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, s, 100) assert.Regexp(t, "^[[:alpha:]]*$", s) } @@ -67,11 +68,11 @@ func TestAlphaNum(t *testing.T) { f := RandomFuncs{} s, err := f.AlphaNum(0) - assert.NoError(t, err) + require.NoError(t, err) assert.Empty(t, s) s, err = f.AlphaNum(100) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, s, 100) assert.Regexp(t, "^[[:alnum:]]*$", s) } @@ -80,7 +81,7 @@ func TestToCodePoints(t *testing.T) { t.Parallel() l, u, err := toCodePoints("a", "b") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 'a', l) assert.Equal(t, 'b', u) @@ -91,17 +92,17 @@ func TestToCodePoints(t *testing.T) { assert.Error(t, err) l, u, err = toCodePoints("0xD700", "0x0001FFFF") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, '\ud700', l) assert.Equal(t, '\U0001ffff', u) l, u, err = toCodePoints("0011", "0777") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, rune(0011), l) assert.Equal(t, rune(0777), u) l, u, err = toCodePoints("♬", "♟") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, rune(0x266C), l) assert.Equal(t, '♟', u) } @@ -115,38 +116,38 @@ func TestString(t *testing.T) { f := RandomFuncs{} out, err := f.String(1) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, out, 1) out, err = f.String(42) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, out, 42) _, err = f.String(0) assert.Error(t, err) out, err = f.String(8, "[a-z]") - assert.NoError(t, err) + require.NoError(t, err) assert.Regexp(t, "^[a-z]{8}$", out) out, err = f.String(10, 0x23, 0x26) - assert.NoError(t, err) + require.NoError(t, err) assert.Regexp(t, "^[#$%&]{10}$", out) out, err = f.String(8, '\U0001f062', '\U0001f093') - assert.NoError(t, err) + require.NoError(t, err) assert.Regexp(t, "^[🁢-🂓]{8}$", out) out, err = f.String(8, '\U0001f062', '\U0001f093') - assert.NoError(t, err) + require.NoError(t, err) assert.Regexp(t, "^[🁢-🂓]{8}$", out) out, err = f.String(8, "♚", "♟") - assert.NoError(t, err) + require.NoError(t, err) assert.Regexp(t, "^[♚-♟]{8}$", out) out, err = f.String(100, "♠", "♣") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 100, utf8.RuneCountInString(out)) assert.Regexp(t, "^[♠-♣]{100}$", out) } @@ -162,14 +163,14 @@ func TestItem(t *testing.T) { assert.Error(t, err) i, err := f.Item([]string{"foo"}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "foo", i) in := []string{"foo", "bar"} got := "" for j := 0; j < 10; j++ { i, err = f.Item(in) - assert.NoError(t, err) + require.NoError(t, err) got += i.(string) } assert.NotEqual(t, "foofoofoofoofoofoofoofoofoofoo", got) @@ -181,22 +182,22 @@ func TestNumber(t *testing.T) { f := RandomFuncs{} n, err := f.Number() - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, 0 <= n && n <= 100, n) _, err = f.Number(-1) assert.Error(t, err) n, err = f.Number(0) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, int64(0), n) n, err = f.Number(9, 9) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, int64(9), n) n, err = f.Number(-10, -10) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, int64(-10), n) } @@ -205,18 +206,18 @@ func TestFloat(t *testing.T) { f := RandomFuncs{} n, err := f.Float() - assert.NoError(t, err) + require.NoError(t, err) assert.InDelta(t, 0.5, n, 0.5) n, err = f.Float(0.5) - assert.NoError(t, err) + require.NoError(t, err) assert.InDelta(t, 0.25, n, 0.25) n, err = f.Float(490, 500) - assert.NoError(t, err) + require.NoError(t, err) assert.InDelta(t, 495, n, 5) n, err = f.Float(-500, 500) - assert.NoError(t, err) + require.NoError(t, err) assert.InDelta(t, 0, n, 500) } diff --git a/funcs/regexp_test.go b/funcs/regexp_test.go index cf7852d6..4e133bb3 100644 --- a/funcs/regexp_test.go +++ b/funcs/regexp_test.go @@ -6,6 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestCreateReFuncs(t *testing.T) { @@ -44,18 +45,18 @@ func TestFind(t *testing.T) { re := &ReFuncs{} f, err := re.Find(`[a-z]+`, `foo bar baz`) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "foo", f) _, err = re.Find(`[a-`, "") assert.Error(t, err) f, err = re.Find("4", 42) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "4", f) f, err = re.Find(false, 42) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "", f) } @@ -64,11 +65,11 @@ func TestFindAll(t *testing.T) { re := &ReFuncs{} f, err := re.FindAll(`[a-z]+`, `foo bar baz`) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []string{"foo", "bar", "baz"}, f) f, err = re.FindAll(`[a-z]+`, -1, `foo bar baz`) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []string{"foo", "bar", "baz"}, f) _, err = re.FindAll(`[a-`, "") @@ -81,19 +82,19 @@ func TestFindAll(t *testing.T) { assert.Error(t, err) f, err = re.FindAll(`[a-z]+`, 0, `foo bar baz`) - assert.NoError(t, err) + require.NoError(t, err) assert.Nil(t, f) f, err = re.FindAll(`[a-z]+`, 2, `foo bar baz`) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []string{"foo", "bar"}, f) f, err = re.FindAll(`[a-z]+`, 14, `foo bar baz`) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []string{"foo", "bar", "baz"}, f) f, err = re.FindAll(`qux`, `foo bar baz`) - assert.NoError(t, err) + require.NoError(t, err) assert.Nil(t, f) } @@ -102,11 +103,11 @@ func TestSplit(t *testing.T) { re := &ReFuncs{} f, err := re.Split(` `, `foo bar baz`) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []string{"foo", "bar", "baz"}, f) f, err = re.Split(`\s+`, -1, `foo bar baz`) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []string{"foo", "bar", "baz"}, f) _, err = re.Split(`[a-`, "") @@ -119,19 +120,19 @@ func TestSplit(t *testing.T) { assert.Error(t, err) f, err = re.Split(` `, 0, `foo bar baz`) - assert.NoError(t, err) + require.NoError(t, err) assert.Nil(t, f) f, err = re.Split(`\s+`, 2, `foo bar baz`) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []string{"foo", "bar baz"}, f) f, err = re.Split(`\s`, 14, `foo bar baz`) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []string{"foo", "", "bar", "baz"}, f) f, err = re.Split(`[\s,.]`, 14, `foo bar.baz,qux`) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, []string{"foo", "bar", "baz", "qux"}, f) } @@ -140,6 +141,6 @@ func TestReplaceLiteral(t *testing.T) { re := &ReFuncs{} r, err := re.ReplaceLiteral("i", "ello$1", "hi world") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "hello$1 world", r) } diff --git a/funcs/strings_test.go b/funcs/strings_test.go index 9da5299e..e3ce4edb 100644 --- a/funcs/strings_test.go +++ b/funcs/strings_test.go @@ -6,6 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestCreateStringFuncs(t *testing.T) { @@ -53,7 +54,7 @@ func TestIndent(t *testing.T) { for _, d := range testdata { out, err := sf.Indent(d.args...) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, d.out, out) } } @@ -108,15 +109,15 @@ func TestAbbrev(t *testing.T) { assert.Error(t, err) s, err := sf.Abbrev(3, "foo") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "foo", s) s, err = sf.Abbrev(2, 6, "foobar") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "foobar", s) s, err = sf.Abbrev(6, 9, "foobarbazquxquux") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "...baz...", s) } @@ -230,26 +231,26 @@ func TestRuneCount(t *testing.T) { sf := &StringFuncs{} n, err := sf.RuneCount("") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 0, n) n, err = sf.RuneCount("foo") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 3, n) n, err = sf.RuneCount("foo", "bar") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 6, n) n, err = sf.RuneCount(42, true) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 6, n) n, err = sf.RuneCount("😂\U0001F602") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 2, n) n, err = sf.RuneCount("\U0001F600", 3.14) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 5, n) } diff --git a/funcs/test_test.go b/funcs/test_test.go index 2bcd7039..91cb5c95 100644 --- a/funcs/test_test.go +++ b/funcs/test_test.go @@ -6,6 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestCreateTestFuncs(t *testing.T) { @@ -33,10 +34,10 @@ func TestAssert(t *testing.T) { assert.Error(t, err) _, err = f.Assert(true) - assert.NoError(t, err) + require.NoError(t, err) _, err = f.Assert("foo", true) - assert.NoError(t, err) + require.NoError(t, err) _, err = f.Assert("foo", "false") assert.EqualError(t, err, "assertion failed: foo") @@ -79,11 +80,11 @@ func TestRequired(t *testing.T) { assert.Nil(t, v) v, err = f.Required(0) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, v, 0) v, err = f.Required("foo") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, v, "foo") } diff --git a/funcs/time_test.go b/funcs/time_test.go index 08a9d195..f77de1f3 100644 --- a/funcs/time_test.go +++ b/funcs/time_test.go @@ -8,6 +8,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestCreateTimeFuncs(t *testing.T) { @@ -77,5 +78,5 @@ func TestParseNum(t *testing.T) { i, f, err = parseNum(nil) assert.Zero(t, i) assert.Zero(t, f) - assert.NoError(t, err) + require.NoError(t, err) } diff --git a/funcs/uuid_test.go b/funcs/uuid_test.go index 88ef52b5..42e497c7 100644 --- a/funcs/uuid_test.go +++ b/funcs/uuid_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestCreateUUIDFuncs(t *testing.T) { @@ -36,7 +37,7 @@ func TestV1(t *testing.T) { u := UUIDNS() i, err := u.V1() - assert.NoError(t, err) + require.NoError(t, err) assert.Regexp(t, uuidV1Pattern, i) } @@ -45,7 +46,7 @@ func TestV4(t *testing.T) { u := UUIDNS() i, err := u.V4() - assert.NoError(t, err) + require.NoError(t, err) assert.Regexp(t, uuidV4Pattern, i) } @@ -54,7 +55,7 @@ func TestNil(t *testing.T) { u := UUIDNS() i, err := u.Nil() - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "00000000-0000-0000-0000-000000000000", i) } @@ -64,12 +65,12 @@ func TestIsValid(t *testing.T) { u := UUIDNS() in := interface{}(false) i, err := u.IsValid(in) - assert.NoError(t, err) + require.NoError(t, err) assert.False(t, i) in = 12345 i, err = u.IsValid(in) - assert.NoError(t, err) + require.NoError(t, err) assert.False(t, i) testdata := []interface{}{ @@ -81,7 +82,7 @@ func TestIsValid(t *testing.T) { for _, d := range testdata { i, err = u.IsValid(d) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, i) } } @@ -109,7 +110,7 @@ func TestParse(t *testing.T) { for _, d := range testdata { uid, err := u.Parse(d) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, in, uid.String()) } } diff --git a/gomplate_test.go b/gomplate_test.go index 90d75ff2..f3f6f158 100644 --- a/gomplate_test.go +++ b/gomplate_test.go @@ -15,6 +15,7 @@ import ( "github.com/hairyhenderson/gomplate/v4/env" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func testTemplate(t *testing.T, tr *Renderer, tmpl string) string { @@ -22,7 +23,7 @@ func testTemplate(t *testing.T, tr *Renderer, tmpl string) string { var out bytes.Buffer err := tr.Render(context.Background(), "testtemplate", tmpl, &out) - assert.NoError(t, err) + require.NoError(t, err) return out.String() } @@ -141,7 +142,7 @@ func TestRunTemplates(t *testing.T) { buf := &bytes.Buffer{} config := &Config{Input: "foo", OutputFiles: []string{"-"}, Out: buf} err := RunTemplates(config) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "foo", buf.String()) assert.Equal(t, 1, Metrics.TemplatesGathered) assert.Equal(t, 1, Metrics.TemplatesProcessed) @@ -151,7 +152,7 @@ func TestRunTemplates(t *testing.T) { func TestSimpleNamer(t *testing.T) { n := simpleNamer("out/") out, err := n(context.Background(), "file") - assert.NoError(t, err) + require.NoError(t, err) expected := filepath.FromSlash("out/file") assert.Equal(t, expected, out) } @@ -167,13 +168,13 @@ func TestMappingNamer(t *testing.T) { } n := mappingNamer("out/{{ .in }}", tr) out, err := n(ctx, "file") - assert.NoError(t, err) + require.NoError(t, err) expected := filepath.FromSlash("out/file") assert.Equal(t, expected, out) n = mappingNamer("out/{{ foo }}{{ .in }}", tr) out, err = n(ctx, "file") - assert.NoError(t, err) + require.NoError(t, err) expected = filepath.FromSlash("out/foofile") assert.Equal(t, expected, out) } diff --git a/internal/cidr/cidr_test.go b/internal/cidr/cidr_test.go index 1b8cc90a..5e430459 100644 --- a/internal/cidr/cidr_test.go +++ b/internal/cidr/cidr_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestSubnetBig(t *testing.T) { @@ -87,7 +88,7 @@ func TestSubnetBig(t *testing.T) { if testCase.err { assert.Error(t, err) } else { - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, testCase.out, subnet.String()) } }) @@ -156,7 +157,7 @@ func TestHostBig(t *testing.T) { if testCase.err { assert.Error(t, err) } else { - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, testCase.out, gotIP.String()) } }) diff --git a/internal/cmd/config_test.go b/internal/cmd/config_test.go index 8a309da6..5203952e 100644 --- a/internal/cmd/config_test.go +++ b/internal/cmd/config_test.go @@ -13,6 +13,7 @@ import ( "github.com/spf13/afero" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestReadConfigFile(t *testing.T) { @@ -21,12 +22,12 @@ func TestReadConfigFile(t *testing.T) { cmd := &cobra.Command{} _, err := readConfigFile(cmd) - assert.NoError(t, err) + require.NoError(t, err) cmd.Flags().String("config", defaultConfigFile, "foo") _, err = readConfigFile(cmd) - assert.NoError(t, err) + require.NoError(t, err) cmd.ParseFlags([]string{"--config", "config.file"}) @@ -37,21 +38,21 @@ func TestReadConfigFile(t *testing.T) { cmd.Flags().String("config", defaultConfigFile, "foo") f, err := fs.Create(defaultConfigFile) - assert.NoError(t, err) + require.NoError(t, err) f.WriteString("") cfg, err := readConfigFile(cmd) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, &config.Config{}, cfg) cmd.ParseFlags([]string{"--config", "config.yaml"}) f, err = fs.Create("config.yaml") - assert.NoError(t, err) + require.NoError(t, err) f.WriteString("in: hello world\n") cfg, err = readConfigFile(cmd) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, &config.Config{Input: "hello world"}, cfg) f.WriteString("in: ") @@ -86,7 +87,7 @@ func TestLoadConfig(t *testing.T) { Stdout: stdout, Stderr: stderr, } - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, out) cmd.ParseFlags([]string{"--in", "foo"}) @@ -97,7 +98,7 @@ func TestLoadConfig(t *testing.T) { Stdout: out.Stdout, Stderr: stderr, } - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, out) cmd.ParseFlags([]string{"--in", "foo", "--exec-pipe", "--", "tr", "[a-z]", "[A-Z]"}) @@ -111,7 +112,7 @@ func TestLoadConfig(t *testing.T) { Stdout: out.Stdout, Stderr: stderr, } - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, out) } @@ -126,13 +127,13 @@ func TestCobraConfig(t *testing.T) { cmd.ParseFlags(nil) cfg, err := cobraConfig(cmd, cmd.Flags().Args()) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, &config.Config{}, cfg) cmd.ParseFlags([]string{"--file", "in", "--", "echo", "foo"}) cfg, err = cobraConfig(cmd, cmd.Flags().Args()) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, &config.Config{ InputFiles: []string{"in"}, PostExec: []string{"echo", "foo"}, @@ -271,7 +272,7 @@ func TestApplyEnvVars(t *testing.T) { actual, err := applyEnvVars(context.Background(), d.input) os.Unsetenv(d.env) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, d.expected, actual) }) } diff --git a/internal/cmd/main_test.go b/internal/cmd/main_test.go index 8d4f6da9..3eed8ccf 100644 --- a/internal/cmd/main_test.go +++ b/internal/cmd/main_test.go @@ -8,6 +8,7 @@ import ( "github.com/spf13/cobra" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestOptionalExecArgs(t *testing.T) { @@ -16,7 +17,7 @@ func TestOptionalExecArgs(t *testing.T) { cmd.ParseFlags(nil) err := optionalExecArgs(cmd, nil) - assert.NoError(t, err) + require.NoError(t, err) cmd = &cobra.Command{} cmd.SetArgs(nil) @@ -30,14 +31,14 @@ func TestOptionalExecArgs(t *testing.T) { cmd.ParseFlags([]string{"--", "foo"}) err = optionalExecArgs(cmd, []string{}) - assert.NoError(t, err) + require.NoError(t, err) cmd = &cobra.Command{} cmd.SetArgs(nil) cmd.ParseFlags([]string{"--"}) err = optionalExecArgs(cmd, []string{"foo"}) - assert.NoError(t, err) + require.NoError(t, err) } func TestRunMain(t *testing.T) { @@ -45,7 +46,7 @@ func TestRunMain(t *testing.T) { defer cancel() err := Main(ctx, []string{"-h"}, nil, nil, nil) - assert.NoError(t, err) + require.NoError(t, err) err = Main(ctx, []string{"--bogus"}, nil, nil, nil) assert.Error(t, err) @@ -54,7 +55,7 @@ func TestRunMain(t *testing.T) { stdout := &bytes.Buffer{} stderr := &bytes.Buffer{} err = Main(ctx, []string{"-i", "hello"}, stdin, stdout, stderr) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "hello", stdout.String()) } @@ -64,6 +65,6 @@ func TestPostRunExec(t *testing.T) { out := &bytes.Buffer{} err := postRunExec(ctx, []string{"cat"}, strings.NewReader("hello world"), out, out) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "hello world", out.String()) } diff --git a/internal/config/configfile_test.go b/internal/config/configfile_test.go index cacbed4b..46aaf89c 100644 --- a/internal/config/configfile_test.go +++ b/internal/config/configfile_test.go @@ -14,6 +14,7 @@ import ( "github.com/hairyhenderson/gomplate/v4/internal/iohelpers" "github.com/hairyhenderson/yaml" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestParseConfigFile(t *testing.T) { @@ -23,7 +24,7 @@ func TestParseConfigFile(t *testing.T) { Input: "hello world", } cf, err := Parse(strings.NewReader(in)) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, cf) in = `in: hello world @@ -81,7 +82,7 @@ pluginTimeout: 2s } cf, err = Parse(strings.NewReader(in)) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, cf) } @@ -102,7 +103,7 @@ func mustURL(s string) *url.URL { func TestValidate(t *testing.T) { t.Parallel() - assert.NoError(t, validateConfig("")) + require.NoError(t, validateConfig("")) assert.Error(t, validateConfig(`in: foo inputFiles: [bar] @@ -151,7 +152,7 @@ outputMap: bar postExec: "" `)) - assert.NoError(t, validateConfig(`execPipe: true + require.NoError(t, validateConfig(`execPipe: true postExec: [echo, foo] `)) @@ -160,7 +161,7 @@ outputFiles: [foo] postExec: [echo] `)) - assert.NoError(t, validateConfig(`execPipe: true + require.NoError(t, validateConfig(`execPipe: true inputFiles: ['-'] postExec: [echo] `)) @@ -438,7 +439,7 @@ func TestParseDataSourceFlags(t *testing.T) { t.Parallel() cfg := &Config{} err := cfg.ParseDataSourceFlags(nil, nil, nil, nil) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, &Config{}, cfg) cfg = &Config{} @@ -447,7 +448,7 @@ func TestParseDataSourceFlags(t *testing.T) { cfg = &Config{} err = cfg.ParseDataSourceFlags([]string{"baz=foo/bar/baz.json"}, nil, nil, nil) - assert.NoError(t, err) + require.NoError(t, err) expected := &Config{ DataSources: map[string]DataSource{ "baz": {URL: mustURL("foo/bar/baz.json")}, @@ -461,7 +462,7 @@ func TestParseDataSourceFlags(t *testing.T) { nil, nil, []string{"baz=Accept: application/json"}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, &Config{ DataSources: map[string]DataSource{ "baz": { @@ -480,7 +481,7 @@ func TestParseDataSourceFlags(t *testing.T) { nil, []string{"foo=Accept: application/json", "bar=Authorization: Basic xxxxx"}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, &Config{ DataSources: map[string]DataSource{ "baz": {URL: mustURL("foo/bar/baz.json")}, @@ -505,7 +506,7 @@ func TestParseDataSourceFlags(t *testing.T) { []string{"foo=http://example.com", "file.tmpl", "tmpldir/"}, []string{"foo=Accept: application/json", "bar=Authorization: Basic xxxxx"}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, &Config{ Templates: Templates{ "foo": { @@ -525,11 +526,11 @@ func TestParsePluginFlags(t *testing.T) { t.Parallel() cfg := &Config{} err := cfg.ParsePluginFlags(nil) - assert.NoError(t, err) + require.NoError(t, err) cfg = &Config{} err = cfg.ParsePluginFlags([]string{"foo=bar"}) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, &Config{Plugins: map[string]PluginConfig{"foo": {Cmd: "bar"}}}, cfg) } @@ -706,19 +707,19 @@ func TestApplyDefaults(t *testing.T) { func TestGetMode(t *testing.T) { c := &Config{} m, o, err := c.GetMode() - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, iohelpers.NormalizeFileMode(0), m) assert.False(t, o) c = &Config{OutMode: "755"} m, o, err = c.GetMode() - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, iohelpers.NormalizeFileMode(0o755), m) assert.True(t, o) c = &Config{OutMode: "0755"} m, o, err = c.GetMode() - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, iohelpers.NormalizeFileMode(0o755), m) assert.True(t, o) @@ -741,7 +742,7 @@ func TestParseHeaderArgs(t *testing.T) { }, } parsed, err := parseHeaderArgs(args) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, parsed) _, err = parseHeaderArgs([]string{"foo"}) @@ -767,7 +768,7 @@ func TestParseHeaderArgs(t *testing.T) { }, } parsed, err = parseHeaderArgs(args) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, parsed) } @@ -779,22 +780,22 @@ func TestParseSourceURL(t *testing.T) { RawQuery: "bar", } u, err := ParseSourceURL("http://example.com/foo.json?bar") - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, u) expected = &url.URL{Scheme: "stdin"} u, err = ParseSourceURL("-") - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, u) wd, err := os.Getwd() - assert.NoError(t, err) + require.NoError(t, err) expected = &url.URL{ Scheme: "file", Path: path.Join(filepath.ToSlash(wd), "foo/bar.json"), } u, err = ParseSourceURL("./foo/bar.json") - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, u) } @@ -808,7 +809,7 @@ func TestAbsFileURL(t *testing.T) { Path: "/tmp/foo", } u, err := absFileURL("/tmp/foo") - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, u) expected = &url.URL{ @@ -817,7 +818,7 @@ func TestAbsFileURL(t *testing.T) { Path: cwd + "/tmp/foo", } u, err = absFileURL("tmp/foo") - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, u) expected = &url.URL{ @@ -827,13 +828,13 @@ func TestAbsFileURL(t *testing.T) { RawQuery: "q=p", } u, err = absFileURL("tmp/foo?q=p") - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, expected, u) } func TestParseDatasourceArgNoAlias(t *testing.T) { alias, ds, err := parseDatasourceArg("foo.json") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "foo", alias) assert.Equal(t, "file", ds.URL.Scheme) @@ -846,13 +847,13 @@ func TestParseDatasourceArgNoAlias(t *testing.T) { func TestParseDatasourceArgWithAlias(t *testing.T) { alias, ds, err := parseDatasourceArg("data=foo.json") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "data", alias) assert.Equal(t, "file", ds.URL.Scheme) assert.True(t, ds.URL.IsAbs()) alias, ds, err = parseDatasourceArg("data=/otherdir/foo.json") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "data", alias) assert.Equal(t, "file", ds.URL.Scheme) assert.True(t, ds.URL.IsAbs()) @@ -860,28 +861,28 @@ func TestParseDatasourceArgWithAlias(t *testing.T) { if runtime.GOOS == "windows" { alias, ds, err = parseDatasourceArg("data=foo.json") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "data", alias) assert.Equal(t, "file", ds.URL.Scheme) assert.True(t, ds.URL.IsAbs()) assert.Equalf(t, byte(':'), ds.URL.Path[1], "Path was %s", ds.URL.Path) alias, ds, err = parseDatasourceArg(`data=\otherdir\foo.json`) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "data", alias) assert.Equal(t, "file", ds.URL.Scheme) assert.True(t, ds.URL.IsAbs()) assert.Equal(t, `/otherdir/foo.json`, ds.URL.Path) alias, ds, err = parseDatasourceArg("data=C:\\windowsdir\\foo.json") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "data", alias) assert.Equal(t, "file", ds.URL.Scheme) assert.True(t, ds.URL.IsAbs()) assert.Equal(t, "C:/windowsdir/foo.json", ds.URL.Path) alias, ds, err = parseDatasourceArg("data=\\\\somehost\\share\\foo.json") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "data", alias) assert.Equal(t, "file", ds.URL.Scheme) assert.Equal(t, "somehost", ds.URL.Host) @@ -890,14 +891,14 @@ func TestParseDatasourceArgWithAlias(t *testing.T) { } alias, ds, err = parseDatasourceArg("data=sftp://example.com/blahblah/foo.json") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "data", alias) assert.Equal(t, "sftp", ds.URL.Scheme) assert.True(t, ds.URL.IsAbs()) assert.Equal(t, "/blahblah/foo.json", ds.URL.Path) alias, ds, err = parseDatasourceArg("merged=merge:./foo.yaml|http://example.com/bar.json%3Ffoo=bar") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "merged", alias) assert.Equal(t, "merge", ds.URL.Scheme) assert.Equal(t, "./foo.yaml|http://example.com/bar.json%3Ffoo=bar", ds.URL.Opaque) @@ -907,7 +908,7 @@ func TestPluginConfig_UnmarshalYAML(t *testing.T) { in := `foo` out := PluginConfig{} err := yaml.Unmarshal([]byte(in), &out) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, PluginConfig{Cmd: "foo"}, out) in = `[foo, bar]` @@ -918,7 +919,7 @@ func TestPluginConfig_UnmarshalYAML(t *testing.T) { in = `cmd: foo` out = PluginConfig{} err = yaml.Unmarshal([]byte(in), &out) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, PluginConfig{Cmd: "foo"}, out) in = `cmd: foo @@ -927,7 +928,7 @@ pipe: true ` out = PluginConfig{} err = yaml.Unmarshal([]byte(in), &out) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, PluginConfig{ Cmd: "foo", Timeout: time.Duration(10) * time.Millisecond, diff --git a/internal/config/types_test.go b/internal/config/types_test.go index 49225afb..b7241200 100644 --- a/internal/config/types_test.go +++ b/internal/config/types_test.go @@ -6,6 +6,7 @@ import ( "github.com/hairyhenderson/yaml" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestTemplates_UnmarshalYAML(t *testing.T) { @@ -23,7 +24,7 @@ remote: Accept: [text/plain, text/template]` out := Templates{} err := yaml.Unmarshal([]byte(in), &out) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, Templates{ "t": {URL: mustURL("foo/bar/helloworld.tmpl")}, "templatedir": {URL: mustURL("templatedir/")}, @@ -43,7 +44,7 @@ remote: - remote=https://example.com/foo/bar/helloworld.tmpl` out = Templates{} err = yaml.Unmarshal([]byte(in), &out) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, Templates{ "t": {URL: mustURL("foo/bar/helloworld.tmpl")}, "templatedir/": {URL: mustURL("templatedir/")}, @@ -81,7 +82,7 @@ func TestParseTemplateArg(t *testing.T) { for _, d := range data { alias, ds, err := parseTemplateArg(d.in) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, d.alias, alias) assert.EqualValues(t, d.ds, ds) } diff --git a/internal/iohelpers/readers_test.go b/internal/iohelpers/readers_test.go index ef300ef8..c07d25d4 100644 --- a/internal/iohelpers/readers_test.go +++ b/internal/iohelpers/readers_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestLazyReadCloser(t *testing.T) { @@ -24,13 +25,13 @@ func TestLazyReadCloser(t *testing.T) { p := make([]byte, 5) n, err := l.Read(p) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, opened) assert.Equal(t, r, l.r) assert.Equal(t, 5, n) err = l.Close() - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, r.closed) // test error propagation diff --git a/internal/iohelpers/writers_test.go b/internal/iohelpers/writers_test.go index 696cad3c..f2451737 100644 --- a/internal/iohelpers/writers_test.go +++ b/internal/iohelpers/writers_test.go @@ -8,6 +8,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestAllWhitespace(t *testing.T) { @@ -47,10 +48,10 @@ func TestEmptySkipper(t *testing.T) { assert.True(t, ok) n, err := f.Write(d.in) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, len(d.in), n) err = f.Close() - assert.NoError(t, err) + require.NoError(t, err) if d.empty { assert.Nil(t, f.w) assert.False(t, opened) @@ -104,10 +105,10 @@ func TestSameSkipper(t *testing.T) { assert.True(t, ok) n, err := f.Write(d.in) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, len(d.in), n) err = f.Close() - assert.NoError(t, err) + require.NoError(t, err) if d.same { assert.Nil(t, f.w) assert.False(t, opened) @@ -136,12 +137,12 @@ func TestLazyWriteCloser(t *testing.T) { p := []byte("hello world") n, err := l.Write(p) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, opened) assert.Equal(t, 11, n) err = l.Close() - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, w.closed) // test error propagation diff --git a/internal/tests/integration/datasources_consul_test.go b/internal/tests/integration/datasources_consul_test.go index 23bf1981..cbf154d6 100644 --- a/internal/tests/integration/datasources_consul_test.go +++ b/internal/tests/integration/datasources_consul_test.go @@ -8,7 +8,6 @@ import ( "testing" vaultapi "github.com/hashicorp/vault/api" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gotest.tools/v3/fs" "gotest.tools/v3/icmd" @@ -62,7 +61,7 @@ func setupDatasourcesConsulTest(t *testing.T) (string, *vaultClient) { consulResult := icmd.StartCmd(consul) t.Cleanup(func() { err := consulResult.Cmd.Process.Kill() - assert.NoError(t, err) + require.NoError(t, err) consulResult.Cmd.Wait() diff --git a/internal/tests/integration/gomplateignore_test.go b/internal/tests/integration/gomplateignore_test.go index e664ab6a..17a6c817 100644 --- a/internal/tests/integration/gomplateignore_test.go +++ b/internal/tests/integration/gomplateignore_test.go @@ -8,6 +8,7 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "gotest.tools/v3/fs" ) @@ -71,7 +72,7 @@ func TestGomplateignore_Simple(t *testing.T) { fs.WithFile("empty.log", ""), fs.WithFile("rain.txt", "")) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []string{"rain.txt"}, files) } @@ -99,7 +100,7 @@ f[o]o/bar ), ) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, fromSlashes( "foo/bar/tool/lex.txt", "foo/tar/2.txt"), files) } @@ -114,7 +115,7 @@ func TestGomplateignore_Root(t *testing.T) { fs.WithFile("1.txt", ""), ) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, fromSlashes( "sub/1.txt", "sub/2.txt"), files) } @@ -136,7 +137,7 @@ en/e3.txt ), ) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, fromSlashes( "!", "e2.txt", "en/e1.txt", "en/e2.txt"), files) } @@ -155,7 +156,7 @@ func TestGomplateignore_Nested(t *testing.T) { fs.WithFile("1.txt", ""), ) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, fromSlashes(".gomplateignore", "1.txt", "inner/.gomplateignore", "inner/inner2/.gomplateignore", @@ -181,7 +182,7 @@ world.txt`, fs.WithFile("world.txt", ""), ) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, fromSlashes( "aa/a1/a2/hello.txt", "aa/a1/hello.txt", "aa/hello.txt", "bb/hello.txt", "hello.txt"), files) @@ -200,7 +201,7 @@ loss.txt fs.WithFile("bare.txt", "")), ) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, fromSlashes( "foo/bare.txt", "loss.txt/2.log"), files) } @@ -220,7 +221,7 @@ func TestGomplateignore_LeadingSpace(t *testing.T) { fs.WithFile(" what.txt", ""), ) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, fromSlashes( "inner/ dart.log", "inner/ what.txt"), files) } @@ -249,7 +250,7 @@ func TestGomplateignore_WithExcludes(t *testing.T) { fs.WithFile("crash.bin", ""), ) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, fromSlashes( "logs/archive.zip", "manifest.json", "rules/index.csv", "sprites/demon.xml", "sprites/human.csv"), files) @@ -274,6 +275,6 @@ func TestGomplateignore_WithIncludes(t *testing.T) { fs.WithFile("crash.bin", ""), ) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, fromSlashes("rules/index.csv"), files) } diff --git a/internal/tests/integration/integration_test.go b/internal/tests/integration/integration_test.go index 8960e27a..95479407 100644 --- a/internal/tests/integration/integration_test.go +++ b/internal/tests/integration/integration_test.go @@ -18,6 +18,7 @@ import ( gcmd "github.com/hairyhenderson/gomplate/v4/internal/cmd" vaultapi "github.com/hashicorp/vault/api" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "gotest.tools/v3/icmd" ) @@ -28,35 +29,31 @@ func inOutTest(t *testing.T, i, o string) { t.Helper() stdout, stderr, err := cmd(t, "-i", i).run() - assert.NoError(t, err) - assert.Equal(t, "", stderr) - assert.Equal(t, o, stdout) + assertSuccess(t, stdout, stderr, err, o) } func inOutTestExperimental(t *testing.T, i, o string) { t.Helper() stdout, stderr, err := cmd(t, "--experimental", "-i", i).run() - assert.NoError(t, err) - assert.Equal(t, "", stderr) - assert.Equal(t, o, stdout) + assertSuccess(t, stdout, stderr, err, o) } func inOutContains(t *testing.T, i, o string) { t.Helper() stdout, stderr, err := cmd(t, "-i", i).run() - assert.NoError(t, err) assert.Equal(t, "", stderr) assert.Contains(t, stdout, o) + require.NoError(t, err) } func assertSuccess(t *testing.T, o, e string, err error, expected string) { t.Helper() - assert.NoError(t, err) assert.Equal(t, "", e) assert.Equal(t, expected, o) + require.NoError(t, err) } // mirrorHandler - reflects back the HTTP headers from the request diff --git a/libkv/consul_test.go b/libkv/consul_test.go index c0258229..74d78d01 100644 --- a/libkv/consul_test.go +++ b/libkv/consul_test.go @@ -10,6 +10,7 @@ import ( "github.com/docker/libkv/store" consulapi "github.com/hashicorp/consul/api" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestConsulURL(t *testing.T) { @@ -19,34 +20,34 @@ func TestConsulURL(t *testing.T) { u, _ := url.Parse("consul://") expected := &url.URL{Host: "localhost:8500", Scheme: "https"} actual, err := consulURL(u) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, actual) u, _ = url.Parse("consul+http://myconsul.server") expected = &url.URL{Host: "myconsul.server", Scheme: "http"} actual, err = consulURL(u) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, actual) os.Setenv("CONSUL_HTTP_SSL", "false") u, _ = url.Parse("consul+https://myconsul.server:1234") expected = &url.URL{Host: "myconsul.server:1234", Scheme: "https"} actual, err = consulURL(u) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, actual) os.Unsetenv("CONSUL_HTTP_SSL") u, _ = url.Parse("consul://myconsul.server:2345") expected = &url.URL{Host: "myconsul.server:2345", Scheme: "http"} actual, err = consulURL(u) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, actual) u, _ = url.Parse("consul://myconsul.server:3456/foo/bar/baz") expected = &url.URL{Host: "myconsul.server:3456", Scheme: "http"} actual, err = consulURL(u) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, actual) defer os.Unsetenv("CONSUL_HTTP_ADDR") @@ -55,7 +56,7 @@ func TestConsulURL(t *testing.T) { // given URL takes precedence over env var expected = &url.URL{Host: "myconsul.server:3456", Scheme: "http"} actual, err = consulURL(u) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, actual) u, _ = url.Parse("consul://") @@ -66,14 +67,14 @@ func TestConsulURL(t *testing.T) { // TLS enabled, HTTP_ADDR is set, URL has no host and ambiguous scheme expected = &url.URL{Host: "foo:8500", Scheme: "https"} actual, err = consulURL(u) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, actual) defer os.Unsetenv("CONSUL_HTTP_ADDR") os.Setenv("CONSUL_HTTP_ADDR", "localhost:8501") expected = &url.URL{Host: "localhost:8501", Scheme: "https"} actual, err = consulURL(u) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expected, actual) } @@ -84,15 +85,15 @@ func TestConsulAddrFromEnv(t *testing.T) { assert.Error(t, err) addr, err := consulAddrFromEnv(in) - assert.NoError(t, err) + require.NoError(t, err) assert.Empty(t, addr) addr, err = consulAddrFromEnv("https://foo:8500") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, &url.URL{Scheme: "https", Host: "foo:8500"}, addr) addr, err = consulAddrFromEnv("foo:8500") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, &url.URL{Host: "foo:8500"}, addr) } @@ -132,7 +133,7 @@ func TestConsulConfig(t *testing.T) { expectedConfig := &store.Config{} actualConfig, err := consulConfig(false) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expectedConfig, actualConfig) @@ -143,7 +144,7 @@ func TestConsulConfig(t *testing.T) { } actualConfig, err = consulConfig(false) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, expectedConfig, actualConfig) os.Unsetenv("CONSUL_TIMEOUT") @@ -152,7 +153,7 @@ func TestConsulConfig(t *testing.T) { } actualConfig, err = consulConfig(true) - assert.NoError(t, err) + require.NoError(t, err) assert.NotNil(t, actualConfig.TLS) actualConfig.TLS = &tls.Config{MinVersion: tls.VersionTLS13} assert.Equal(t, expectedConfig, actualConfig) diff --git a/libkv/libkv_test.go b/libkv/libkv_test.go index da0fafeb..a0f9da68 100644 --- a/libkv/libkv_test.go +++ b/libkv/libkv_test.go @@ -6,6 +6,7 @@ import ( "github.com/docker/libkv/store" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestRead(t *testing.T) { @@ -15,7 +16,7 @@ func TestRead(t *testing.T) { kv := &LibKV{s} _, err := kv.Read("foo") - assert.NoError(t, err) + require.NoError(t, err) s = &FakeStore{err: errors.New("fail")} kv = &LibKV{s} diff --git a/net/net_test.go b/net/net_test.go index 4e569a44..4a8250be 100644 --- a/net/net_test.go +++ b/net/net_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func must(r interface{}, err error) interface{} { @@ -32,6 +33,6 @@ func TestLookupCNAME(t *testing.T) { func TestLookupSRV(t *testing.T) { srv, err := LookupSRV("_sip._udp.sip.voice.google.com") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, uint16(5060), srv.Port) } diff --git a/plugins_test.go b/plugins_test.go index 8a8eb18a..b3257859 100644 --- a/plugins_test.go +++ b/plugins_test.go @@ -22,12 +22,12 @@ func TestBindPlugins(t *testing.T) { Plugins: map[string]config.PluginConfig{}, } err := bindPlugins(ctx, cfg, fm) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, template.FuncMap{}, fm) cfg.Plugins = map[string]config.PluginConfig{"foo": {Cmd: "bar"}} err = bindPlugins(ctx, cfg, fm) - assert.NoError(t, err) + require.NoError(t, err) assert.Contains(t, fm, "foo") err = bindPlugins(ctx, cfg, fm) diff --git a/random/random_test.go b/random/random_test.go index e7e87377..3f8d3735 100644 --- a/random/random_test.go +++ b/random/random_test.go @@ -7,6 +7,7 @@ import ( "unicode/utf8" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestMatchChars(t *testing.T) { @@ -31,7 +32,7 @@ func TestMatchChars(t *testing.T) { t.Parallel() out, err := matchChars(d.in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, d.expected, out) }) } @@ -41,7 +42,7 @@ func TestStringRE(t *testing.T) { t.Parallel() r, err := StringRE(15, "[\\p{Yi}[:alnum:]]") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 15, utf8.RuneCountInString(r)) _, err = StringRE(1, "[bogus") @@ -59,20 +60,20 @@ func TestStringBounds(t *testing.T) { assert.Error(t, err) r, err := StringBounds(1, 'a', 'a') - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "a", r) r, err = StringBounds(99, 'a', 'b') - assert.NoError(t, err) + require.NoError(t, err) assert.Regexp(t, "^[a-b]+$", r) r, err = StringBounds(100, 0x0020, 0x007f) - assert.NoError(t, err) + require.NoError(t, err) assert.Regexp(t, "^[\u0020-\u007f]*$", r) // only 🂱 (\U0001F0B1) in this range is "graphic" r, err = StringBounds(8, 0x0001f0af, 0x0001f0b1) - assert.NoError(t, err) + require.NoError(t, err) assert.Regexp(t, "^🂱🂱🂱🂱🂱🂱🂱🂱$", r) } @@ -83,14 +84,14 @@ func TestItem(t *testing.T) { assert.Error(t, err) i, err := Item([]interface{}{"foo"}) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "foo", i) in := []interface{}{"foo", "bar"} got := "" for j := 0; j < 10; j++ { i, err = Item(in) - assert.NoError(t, err) + require.NoError(t, err) got += i.(string) } assert.NotEqual(t, "foofoofoofoofoofoofoofoofoofoo", got) @@ -119,7 +120,7 @@ func TestNumber(t *testing.T) { } for _, d := range testdata { n, err := Number(d.min, d.max) - assert.NoError(t, err) + require.NoError(t, err) assert.InDelta(t, d.expected, n, d.delta) } } @@ -140,7 +141,7 @@ func TestFloat(t *testing.T) { for _, d := range testdata { n, err := Float(d.min, d.max) - assert.NoError(t, err) + require.NoError(t, err) assert.InDelta(t, d.expected, n, d.delta) } } diff --git a/regexp/regexp_test.go b/regexp/regexp_test.go index b8322156..f1d1132f 100644 --- a/regexp/regexp_test.go +++ b/regexp/regexp_test.go @@ -4,11 +4,12 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestFind(t *testing.T) { f, err := Find(`[a-z]+`, `foo bar baz`) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "foo", f) _, err = Find(`[a-`, "") @@ -33,7 +34,7 @@ func TestFindAll(t *testing.T) { for _, d := range testdata { f, err := FindAll(d.re, d.n, d.in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, d.expected, f) } } @@ -80,7 +81,7 @@ func TestReplaceLiteral(t *testing.T) { } for _, d := range testdata { r, err := ReplaceLiteral(d.expression, d.replacement, d.input) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, d.expected, r) } } @@ -103,7 +104,7 @@ func TestSplit(t *testing.T) { for _, d := range testdata { f, err := Split(d.re, d.n, d.in) - assert.NoError(t, err) + require.NoError(t, err) assert.EqualValues(t, d.expected, f) } } diff --git a/render_test.go b/render_test.go index a4bd3320..e7f03ac0 100644 --- a/render_test.go +++ b/render_test.go @@ -13,6 +13,7 @@ import ( "github.com/hairyhenderson/go-fsimpl" "github.com/hairyhenderson/gomplate/v4/data" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestRenderTemplate(t *testing.T) { @@ -24,7 +25,7 @@ func TestRenderTemplate(t *testing.T) { tr := NewRenderer(Options{}) out := &bytes.Buffer{} err := tr.Render(ctx, "test", "{{ `hello world` | toUpper }}", out) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "HELLO WORLD", out.String()) // with datasource and context @@ -45,7 +46,7 @@ func TestRenderTemplate(t *testing.T) { ctx = data.ContextWithStdin(ctx, strings.NewReader("hello")) out = &bytes.Buffer{} err = tr.Render(ctx, "test", `{{ .hi | toUpper }} {{ (ds "world") | toUpper }}`, out) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "HELLO WORLD", out.String()) // with a nested template @@ -62,7 +63,7 @@ func TestRenderTemplate(t *testing.T) { }) out = &bytes.Buffer{} err = tr.Render(ctx, "test", `<< template "nested" "hello" >>`, out) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "HELLO", out.String()) // errors contain the template name diff --git a/strings/strings_test.go b/strings/strings_test.go index 46ca6d86..66e09694 100644 --- a/strings/strings_test.go +++ b/strings/strings_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestIndent(t *testing.T) { @@ -138,6 +139,6 @@ func TestSkipLines(t *testing.T) { assert.Error(t, err) out, err = SkipLines(4, "foo\nbar\n\nbaz") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "", out) } diff --git a/template_test.go b/template_test.go index a990881e..85a8ae90 100644 --- a/template_test.go +++ b/template_test.go @@ -27,21 +27,21 @@ func TestOpenOutFile(t *testing.T) { cfg := &config.Config{Stdout: &bytes.Buffer{}} f, err := openOutFile("/tmp/foo", 0755, 0644, false, nil, false) - assert.NoError(t, err) + require.NoError(t, err) wc, ok := f.(io.WriteCloser) assert.True(t, ok) err = wc.Close() - assert.NoError(t, err) + require.NoError(t, err) i, err := aferoFS.Stat("/tmp/foo") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, iohelpers.NormalizeFileMode(0644), i.Mode()) out := &bytes.Buffer{} f, err = openOutFile("-", 0755, 0644, false, out, false) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, cfg.Stdout, f) } @@ -63,7 +63,7 @@ func TestGatherTemplates(t *testing.T) { } cfg.ApplyDefaults() templates, err := gatherTemplates(ctx, cfg, nil) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, templates, 1) cfg = &config.Config{ @@ -72,7 +72,7 @@ func TestGatherTemplates(t *testing.T) { } cfg.ApplyDefaults() templates, err = gatherTemplates(ctx, cfg, nil) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, templates, 1) assert.Equal(t, "foo", templates[0].Text) assert.Equal(t, cfg.Stdout, templates[0].Writer) @@ -81,7 +81,7 @@ func TestGatherTemplates(t *testing.T) { Input: "foo", OutputFiles: []string{"out"}, }, nil) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, templates, 1) // assert.Equal(t, iohelpers.NormalizeFileMode(0644), templates[0].mode) @@ -91,7 +91,7 @@ func TestGatherTemplates(t *testing.T) { assert.True(t, os.IsNotExist(err)) _, err = templates[0].Writer.Write([]byte("hello world")) - assert.NoError(t, err) + require.NoError(t, err) info, err := aferoFS.Stat("out") require.NoError(t, err) @@ -104,17 +104,17 @@ func TestGatherTemplates(t *testing.T) { Stdout: &bytes.Buffer{}, } templates, err = gatherTemplates(ctx, cfg, nil) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, templates, 1) assert.Equal(t, "bar", templates[0].Text) assert.NotEqual(t, cfg.Stdout, templates[0].Writer) // assert.Equal(t, os.FileMode(0600), templates[0].mode) _, err = templates[0].Writer.Write([]byte("hello world")) - assert.NoError(t, err) + require.NoError(t, err) info, err = aferoFS.Stat("out") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, iohelpers.NormalizeFileMode(0600), info.Mode()) aferoFS.Remove("out") @@ -125,17 +125,17 @@ func TestGatherTemplates(t *testing.T) { Stdout: &bytes.Buffer{}, } templates, err = gatherTemplates(ctx, cfg, nil) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, templates, 1) assert.Equal(t, "bar", templates[0].Text) assert.NotEqual(t, cfg.Stdout, templates[0].Writer) // assert.Equal(t, iohelpers.NormalizeFileMode(0755), templates[0].mode) _, err = templates[0].Writer.Write([]byte("hello world")) - assert.NoError(t, err) + require.NoError(t, err) info, err = aferoFS.Stat("out") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, iohelpers.NormalizeFileMode(0755), info.Mode()) aferoFS.Remove("out") @@ -143,7 +143,7 @@ func TestGatherTemplates(t *testing.T) { InputDir: "in", OutputDir: "out", }, simpleNamer("out")) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, templates, 3) assert.Equal(t, "foo", templates[0].Text) aferoFS.Remove("out") @@ -177,11 +177,11 @@ func TestParseNestedTemplates(t *testing.T) { tmpl, _ := template.New("root").Parse(`{{ template "foo" }}`) err := parseNestedTemplates(ctx, nested, tmpl) - assert.NoError(t, err) + require.NoError(t, err) out := bytes.Buffer{} err = tmpl.Execute(&out, nil) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "hello world", out.String()) // test with directory of templates @@ -194,10 +194,10 @@ func TestParseNestedTemplates(t *testing.T) { tmpl, _ = template.New("root").Parse(`{{ template "dir/foo.t" }} {{ template "dir/bar.t" }}`) err = parseNestedTemplates(ctx, nested, tmpl) - assert.NoError(t, err) + require.NoError(t, err) out = bytes.Buffer{} err = tmpl.Execute(&out, nil) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "foo bar", out.String()) } diff --git a/template_unix_test.go b/template_unix_test.go index 4a1a4ccb..fb7f6fef 100644 --- a/template_unix_test.go +++ b/template_unix_test.go @@ -10,6 +10,7 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestWalkDir(t *testing.T) { @@ -31,7 +32,7 @@ func TestWalkDir(t *testing.T) { templates, err := walkDir(ctx, cfg, "/indir", simpleNamer("/outdir"), []string{"*/two"}, 0, false) - assert.NoError(t, err) + require.NoError(t, err) expected := []Template{ { Name: "/indir/one/bar", diff --git a/template_windows_test.go b/template_windows_test.go index a8df2d9c..587b8b1c 100644 --- a/template_windows_test.go +++ b/template_windows_test.go @@ -10,6 +10,7 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestWalkDir(t *testing.T) { @@ -31,7 +32,7 @@ func TestWalkDir(t *testing.T) { templates, err := walkDir(ctx, cfg, `C:\indir`, simpleNamer(`C:\outdir`), []string{`*\two`}, 0, false) - assert.NoError(t, err) + require.NoError(t, err) expected := []Template{ { Name: `C:\indir\one\bar`, diff --git a/test/test_test.go b/test/test_test.go index f048a961..a5bcabdb 100644 --- a/test/test_test.go +++ b/test/test_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestAssert(t *testing.T) { @@ -13,7 +14,7 @@ func TestAssert(t *testing.T) { assert.EqualError(t, err, "assertion failed: a message") _, err = Assert(true, "") - assert.NoError(t, err) + require.NoError(t, err) } func TestFail(t *testing.T) { @@ -38,14 +39,14 @@ func TestRequired(t *testing.T) { assert.Nil(t, v) v, err = Required("", 0) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, v, 0) v, err = Required("", false) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, v, false) v, err = Required("", map[string]string{}) - assert.NoError(t, err) + require.NoError(t, err) assert.NotNil(t, v) } diff --git a/tmpl/tmpl_test.go b/tmpl/tmpl_test.go index 7109a660..c1dc15ab 100644 --- a/tmpl/tmpl_test.go +++ b/tmpl/tmpl_test.go @@ -5,6 +5,7 @@ import ( "text/template" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestInline(t *testing.T) { @@ -22,7 +23,7 @@ func TestInline(t *testing.T) { }) for _, d := range testdata { out, err := tmpl.Inline(d) - assert.NoError(t, err, d) + require.NoError(t, err, d) assert.Equal(t, "hello world", out) } } @@ -31,7 +32,7 @@ func TestParseArgs(t *testing.T) { defaultCtx := map[string]string{"hello": "world"} tmpl := New(nil, defaultCtx, "") name, in, ctx, err := tmpl.parseArgs("foo") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "<inline>", name) assert.Equal(t, "foo", in) assert.Equal(t, defaultCtx, ctx) @@ -49,20 +50,20 @@ func TestParseArgs(t *testing.T) { assert.Error(t, err) name, in, ctx, err = tmpl.parseArgs("foo", "bar") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "foo", name) assert.Equal(t, "bar", in) assert.Equal(t, defaultCtx, ctx) c := map[string]string{"one": "two"} name, in, ctx, err = tmpl.parseArgs("foo", c) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "<inline>", name) assert.Equal(t, "foo", in) assert.Equal(t, c, ctx) name, in, ctx, err = tmpl.parseArgs("foo", "bar", c) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "foo", name) assert.Equal(t, "bar", in) assert.Equal(t, c, ctx) @@ -78,11 +79,11 @@ func TestExec(t *testing.T) { } out, err := tmpl.Exec("T1") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "hello, map[foo:bar]", out) out, err = tmpl.Exec("T1", "world") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "hello, world", out) _, err = tmpl.Exec("bogus") @@ -93,12 +94,12 @@ func TestPath(t *testing.T) { tmpl := New(nil, nil, "") p, err := tmpl.Path() - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "", p) tmpl = New(nil, nil, "foo") p, err = tmpl.Path() - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "foo", p) } @@ -106,16 +107,16 @@ func TestPathDir(t *testing.T) { tmpl := New(nil, nil, "") p, err := tmpl.PathDir() - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "", p) tmpl = New(nil, nil, "foo") p, err = tmpl.PathDir() - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, ".", p) tmpl = New(nil, nil, "foo/bar") p, err = tmpl.PathDir() - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "foo", p) } diff --git a/vault/auth_test.go b/vault/auth_test.go index 5188145d..552db572 100644 --- a/vault/auth_test.go +++ b/vault/auth_test.go @@ -5,6 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestLogin(t *testing.T) { @@ -23,6 +24,6 @@ func TestTokenLogin(t *testing.T) { defer os.Unsetenv("VAULT_TOKEN") token, err := v.TokenLogin() - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "foo", token) } diff --git a/vault/vault_test.go b/vault/vault_test.go index f61f9b7a..754e2d4c 100644 --- a/vault/vault_test.go +++ b/vault/vault_test.go @@ -6,34 +6,35 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestNew(t *testing.T) { os.Unsetenv("VAULT_ADDR") v, err := New(nil) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "https://127.0.0.1:8200", v.client.Address()) os.Setenv("VAULT_ADDR", "http://example.com:1234") defer os.Unsetenv("VAULT_ADDR") v, err = New(nil) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "http://example.com:1234", v.client.Address()) os.Unsetenv("VAULT_ADDR") u, _ := url.Parse("vault://vault.rocks:8200/secret/foo/bar") v, err = New(u) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "https://vault.rocks:8200", v.client.Address()) u, _ = url.Parse("vault+https://vault.rocks:8200/secret/foo/bar") v, err = New(u) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "https://vault.rocks:8200", v.client.Address()) u, _ = url.Parse("vault+http://vault.rocks:8200/secret/foo/bar") v, err = New(u) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "http://vault.rocks:8200", v.client.Address()) } @@ -42,14 +43,14 @@ func TestRead(t *testing.T) { defer server.Close() val, err := v.Read("secret/bogus") assert.Empty(t, val) - assert.NoError(t, err) + require.NoError(t, err) expected := "{\"value\":\"foo\"}\n" server, v = MockServer(200, `{"data":`+expected+`}`) defer server.Close() val, err = v.Read("s") assert.Equal(t, expected, string(val)) - assert.NoError(t, err) + require.NoError(t, err) } func TestWrite(t *testing.T) { @@ -64,5 +65,5 @@ func TestWrite(t *testing.T) { defer server.Close() val, err = v.Write("s", nil) assert.Equal(t, expected, string(val)) - assert.NoError(t, err) + require.NoError(t, err) } |