Skip to content

Commit 78147bd

Browse files
authored
chore: purge github.com/alecthomas/assert (#4513)
1 parent b28c839 commit 78147bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+138
-142
lines changed

core/alias_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package core_test
33
import (
44
"testing"
55

6-
"github.com/alecthomas/assert"
76
"github.com/scaleway/scaleway-cli/v2/core"
87
"github.com/scaleway/scaleway-cli/v2/internal/alias"
8+
"github.com/stretchr/testify/assert"
99
)
1010

1111
func TestCommandMatchAlias(t *testing.T) {

core/arg_specs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package core_test
33
import (
44
"testing"
55

6-
"github.com/alecthomas/assert"
76
"github.com/scaleway/scaleway-cli/v2/core"
7+
"github.com/stretchr/testify/assert"
88
)
99

1010
func TestOneOf(t *testing.T) {

core/bootstrap_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"reflect"
66
"testing"
77

8-
"github.com/alecthomas/assert"
98
"github.com/scaleway/scaleway-cli/v2/core"
109
"github.com/scaleway/scaleway-cli/v2/internal/args"
1110
"github.com/scaleway/scaleway-cli/v2/internal/interactive"
11+
"github.com/stretchr/testify/assert"
1212
)
1313

1414
func TestInterruptError(t *testing.T) {

core/build_info_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/alecthomas/assert"
1110
"github.com/hashicorp/go-version"
1211
"github.com/scaleway/scaleway-cli/v2/core"
1312
"github.com/scaleway/scaleway-cli/v2/internal/args"
1413
"github.com/scaleway/scaleway-sdk-go/scw"
14+
"github.com/stretchr/testify/assert"
1515
"github.com/stretchr/testify/require"
1616
)
1717

core/checks_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/alecthomas/assert"
1312
"github.com/scaleway/scaleway-cli/v2/core"
1413
iam "github.com/scaleway/scaleway-sdk-go/api/iam/v1alpha1"
1514
"github.com/scaleway/scaleway-sdk-go/scw"
15+
"github.com/stretchr/testify/assert"
1616
)
1717

1818
func TestCheckAPIKey(t *testing.T) {

core/cobra_usage_builder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"reflect"
66
"testing"
77

8-
"github.com/alecthomas/assert"
98
"github.com/scaleway/scaleway-cli/v2/core"
9+
"github.com/stretchr/testify/assert"
1010
)
1111

1212
type ServerColor string

core/command_interceptor_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/alecthomas/assert"
87
"github.com/scaleway/scaleway-cli/v2/core"
8+
"github.com/stretchr/testify/assert"
99
)
1010

1111
func Test_CombineCommandInterceptor(t *testing.T) {

core/default_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/alecthomas/assert"
87
"github.com/scaleway/scaleway-cli/v2/core"
98
"github.com/scaleway/scaleway-cli/v2/internal/args"
9+
"github.com/stretchr/testify/assert"
1010
)
1111

1212
func Test_ApplyDefaultValues(t *testing.T) {

core/human/marshal_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ import (
66
"testing"
77
"time"
88

9-
"github.com/alecthomas/assert"
109
"github.com/dustin/go-humanize"
1110
"github.com/scaleway/scaleway-cli/v2/core/human"
1211
"github.com/scaleway/scaleway-sdk-go/scw"
12+
"github.com/stretchr/testify/assert"
13+
"github.com/stretchr/testify/require"
1314
)
1415

1516
type Struct struct {
@@ -85,10 +86,8 @@ func TestMarshal(t *testing.T) {
8586
expected = strings.Trim(expected, "\n")
8687

8788
if tc.result != "" {
88-
assert.NoError(t, err)
89+
require.NoError(t, err)
8990
assert.Equal(t, expected, result)
90-
} else {
91-
assert.Equal(t, err, err)
9291
}
9392
}
9493
}

core/reflect_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"strings"
77
"testing"
88

9-
"github.com/alecthomas/assert"
109
"github.com/scaleway/scaleway-cli/v2/core"
1110
"github.com/scaleway/scaleway-sdk-go/scw"
11+
"github.com/stretchr/testify/assert"
1212
)
1313

1414
type RequestEmbedding struct {
@@ -161,7 +161,7 @@ func Test_getValuesForFieldByName(t *testing.T) {
161161
t.Helper()
162162
values, err := core.GetValuesForFieldByName(reflect.ValueOf(tc.cmdArgs), strings.Split(tc.fieldName, "."))
163163
if err != nil {
164-
assert.Equal(t, nil, err.Error())
164+
assert.Nil(t, err.Error())
165165
} else if tc.expectedValues != nil && !reflect.DeepEqual(tc.expectedValues[0].Interface(), values[0].Interface()) {
166166
t.Errorf("Expected %v, got %v", tc.expectedValues[0].Interface(), values[0].Interface())
167167
}

0 commit comments

Comments
 (0)