[#54] tests: unify test generator names

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2021-11-12 14:19:16 +03:00 committed by Alex Vanin
parent fa7c01bd0b
commit 3d0df0d068
35 changed files with 113 additions and 113 deletions

View file

@ -17,7 +17,7 @@ func TestAnnouncement(t *testing.T) {
const epoch, usedSpace uint64 = 10, 100
cidValue := [sha256.Size]byte{1, 2, 3}
id := cidtest.GenerateIDWithChecksum(cidValue)
id := cidtest.IDWithChecksum(cidValue)
a := container.NewAnnouncement()
a.SetEpoch(epoch)

View file

@ -20,7 +20,7 @@ func TestNewContainer(t *testing.T) {
nonce := uuid.New()
ownerID := ownertest.GenerateID()
ownerID := ownertest.ID()
policy := netmaptest.PlacementPolicy()
c.SetBasicACL(acl.PublicBasicRule)
@ -75,7 +75,7 @@ func TestContainerEncoding(t *testing.T) {
}
func TestContainer_SessionToken(t *testing.T) {
tok := sessiontest.Generate()
tok := sessiontest.Token()
cnr := container.New()

View file

@ -20,7 +20,7 @@ func TestID_ToV2(t *testing.T) {
t.Run("non-nil", func(t *testing.T) {
checksum := randSHA256Checksum()
id := cidtest.GenerateIDWithChecksum(checksum)
id := cidtest.IDWithChecksum(checksum)
idV2 := id.ToV2()
@ -46,19 +46,19 @@ func TestID_ToV2(t *testing.T) {
func TestID_Equal(t *testing.T) {
cs := randSHA256Checksum()
id1 := cidtest.GenerateIDWithChecksum(cs)
id2 := cidtest.GenerateIDWithChecksum(cs)
id1 := cidtest.IDWithChecksum(cs)
id2 := cidtest.IDWithChecksum(cs)
require.True(t, id1.Equal(id2))
id3 := cidtest.GenerateID()
id3 := cidtest.ID()
require.False(t, id1.Equal(id3))
}
func TestID_String(t *testing.T) {
t.Run("Parse/String", func(t *testing.T) {
id := cidtest.GenerateID()
id := cidtest.ID()
id2 := cid.New()
require.NoError(t, id2.Parse(id.String()))
@ -73,7 +73,7 @@ func TestID_String(t *testing.T) {
}
func TestContainerIDEncoding(t *testing.T) {
id := cidtest.GenerateID()
id := cidtest.ID()
t.Run("binary", func(t *testing.T) {
data, err := id.Marshal()

View file

@ -7,18 +7,18 @@ import (
cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
)
// GenerateID returns random cid.ID.
func GenerateID() *cid.ID {
// ID returns random cid.ID.
func ID() *cid.ID {
checksum := [sha256.Size]byte{}
rand.Read(checksum[:])
return GenerateIDWithChecksum(checksum)
return IDWithChecksum(checksum)
}
// GenerateIDWithChecksum returns cid.ID initialized
// IDWithChecksum returns cid.ID initialized
// with specified checksum.
func GenerateIDWithChecksum(cs [sha256.Size]byte) *cid.ID {
func IDWithChecksum(cs [sha256.Size]byte) *cid.ID {
id := cid.New()
id.SetSHA256(cs)

View file

@ -29,7 +29,7 @@ func Container() *container.Container {
x.SetVersion(versiontest.Version())
x.SetAttributes(Attributes())
x.SetOwnerID(ownertest.GenerateID())
x.SetOwnerID(ownertest.ID())
x.SetBasicACL(123)
x.SetPlacementPolicy(netmaptest.PlacementPolicy())
@ -40,7 +40,7 @@ func Container() *container.Container {
func UsedSpaceAnnouncement() *container.UsedSpaceAnnouncement {
x := container.NewAnnouncement()
x.SetContainerID(cidtest.GenerateID())
x.SetContainerID(cidtest.ID())
x.SetEpoch(55)
x.SetUsedSpace(999)