Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace 'properties/assert' with 'testify/assert' #1248

Merged
merged 1 commit into from
Jan 8, 2020
Merged

Replace 'properties/assert' with 'testify/assert' #1248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ require (
github.com/huandu/xstrings v1.2.0 // indirect
github.com/imdario/mergo v0.3.7 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/magiconair/properties v1.8.1
github.com/manifoldco/promptui v0.6.0
github.com/mattn/go-colorable v0.1.4 // indirect
github.com/mattn/go-runewidth v0.0.4 // indirect
Expand Down
4 changes: 0 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,14 +317,10 @@ github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a h1:weJVJJRzAJBF
github.com/lunixbochs/vtclean v0.0.0-20180621232353-2d01aacdc34a/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.0.0-20190620125010-da37f6c1e481 h1:IaSjLMT6WvkoZZjspGxy3rdaTEmWLoRm49WbtVUi9sA=
github.com/mailru/easyjson v0.0.0-20190620125010-da37f6c1e481/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
Expand Down
6 changes: 3 additions & 3 deletions pkg/kudoctl/kudohome/home_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package kudohome
import (
"testing"

"github.com/magiconair/properties/assert"
"github.com/stretchr/testify/assert"
)

func TestKudoHome(t *testing.T) {
h := Home("/a")

assert.Equal(t, h.String(), "/a")
assert.Equal(t, h.RepositoryFile(), "/a/repository/repositories.yaml")
assert.Equal(t, "/a", h.String())
assert.Equal(t, "/a/repository/repositories.yaml", h.RepositoryFile())
}
16 changes: 8 additions & 8 deletions pkg/kudoctl/util/repo/index_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"
"time"

"github.com/magiconair/properties/assert"
"github.com/stretchr/testify/assert"

"github.com/kudobuilder/kudo/pkg/apis/kudo/v1beta1"
"github.com/kudobuilder/kudo/pkg/kudoctl/packages"
Expand Down Expand Up @@ -46,9 +46,9 @@ entries:
b := []byte(indexString)
index, _ := ParseIndexFile(b)

assert.Equal(t, len(index.Entries), 2, "number of operator entries is 2")
assert.Equal(t, len(index.Entries["kafka"]), 2, "number of kafka operators is 2")
assert.Equal(t, index.Entries["flink"][0].AppVersion, "1.7.2", "flink app version")
assert.Equal(t, 2, len(index.Entries), "number of operator entries is 2")
assert.Equal(t, 2, len(index.Entries["kafka"]), "number of kafka operators is 2")
assert.Equal(t, "1.7.2", index.Entries["flink"][0].AppVersion, "flink app version")
}

// TestParsingGoldenIndex and parses the index file catching marshalling issues.
Expand Down Expand Up @@ -183,8 +183,8 @@ func TestMapPackageFileToPackageVersion(t *testing.T) {

pv := ToPackageVersion(&pf, "1234", "http://localhost")

assert.Equal(t, pv.Name, o.Name)
assert.Equal(t, pv.Version, o.Version)
assert.Equal(t, pv.URLs[0], "http://localhost/kafka-1.0.0.tgz")
assert.Equal(t, pv.Digest, "1234")
assert.Equal(t, o.Name, pv.Name)
assert.Equal(t, o.Version, pv.Version)
assert.Equal(t, "http://localhost/kafka-1.0.0.tgz", pv.URLs[0])
assert.Equal(t, "1234", pv.Digest)
}
6 changes: 3 additions & 3 deletions pkg/version/version_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package version
import (
"testing"

"github.com/magiconair/properties/assert"
"github.com/stretchr/testify/assert"
)

func Test_validVersion(t *testing.T) {
Expand All @@ -22,7 +22,7 @@ func Test_validVersion(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
val := tt.expected.CompareMajorMinor(tt.actual)
assert.Equal(t, tt.val, val)
assert.Equal(t, val, tt.val)
})
}
}
Expand All @@ -40,7 +40,7 @@ func TestClean(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := Clean(tt.actual)
assert.Equal(t, result, tt.expected)
assert.Equal(t, tt.expected, result)
})
}
}