Skip to content

Commit 8a59df6

Browse files
committed
improve storage unit-tests
1 parent ee0c1f8 commit 8a59df6

File tree

3 files changed

+30
-29
lines changed

3 files changed

+30
-29
lines changed

pkg/apis/storage/v1alpha/local_storage_spec_test.go

+11-17
Original file line numberDiff line numberDiff line change
@@ -25,34 +25,28 @@ package v1alpha
2525
import (
2626
"testing"
2727

28-
"github.com/pkg/errors"
28+
//"github.com/pkg/errors"
2929
"github.com/stretchr/testify/assert"
3030
)
3131

32-
func Test_LocalStorageSpec_Creation(t *testing.T) {
33-
var (
34-
class StorageClassSpec
35-
local LocalStorageSpec
36-
err error
37-
)
32+
// Test creation of local storage spec
33+
func TestLocalStorageSpecCreation(t *testing.T) {
3834

39-
class = StorageClassSpec{"SpecName", true}
40-
local = LocalStorageSpec{StorageClass: class, LocalPath: []string{""}}
41-
err = local.Validate()
42-
assert.Equal(t, errors.Cause(class.Validate()), errors.Cause(err))
35+
class := StorageClassSpec{"SpecName", true}
36+
local := LocalStorageSpec{StorageClass: class, LocalPath: []string{""}}
37+
assert.Error(t, local.Validate())
4338

4439
class = StorageClassSpec{"spec-name", true}
45-
local = LocalStorageSpec{StorageClass: class, LocalPath: []string{""}} //is this allowed - should the paths be checked?
46-
err = local.Validate()
47-
assert.Equal(t, nil, errors.Cause(err))
40+
local = LocalStorageSpec{StorageClass: class, LocalPath: []string{""}}
41+
assert.Error(t, local.Validate(), "should fail as the empty sting is not a valid path")
4842

4943
class = StorageClassSpec{"spec-name", true}
5044
local = LocalStorageSpec{StorageClass: class, LocalPath: []string{}}
51-
err = local.Validate()
52-
assert.Equal(t, ValidationError, errors.Cause(err)) //path empty
45+
assert.True(t, IsValidation(local.Validate()))
5346
}
5447

55-
func Test_LocalStorageSpec_Reset(t *testing.T) {
48+
// Test reset of local storage spec
49+
func TestLocalStorageSpecReset(t *testing.T) {
5650
class := StorageClassSpec{"spec-name", true}
5751
source := LocalStorageSpec{StorageClass: class, LocalPath: []string{"/a/path", "/another/path"}}
5852
target := LocalStorageSpec{}

pkg/apis/storage/v1alpha/local_storage_test.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ import (
2828
"github.com/stretchr/testify/assert"
2929
)
3030

31-
func Test_ArangoLocalStorage_Creation(t *testing.T) {
32-
assert.True(t, true)
31+
// test creation of arango local storage
32+
func TestArangoLocalStorageCreation(t *testing.T) {
33+
// REVIEW - is there something more meaningful to test
34+
storage := ArangoLocalStorage{}
35+
list := ArangoLocalStorageList{}
36+
list.Items = append(list.Items, storage)
37+
assert.Equal(t, 1, len(list.Items))
3338
}

pkg/apis/storage/v1alpha/storage_class_spec_test.go

+12-10
Original file line numberDiff line numberDiff line change
@@ -29,27 +29,29 @@ import (
2929
"github.com/stretchr/testify/assert"
3030
)
3131

32-
func Test_StorageClassSpec_Creation(t *testing.T) {
32+
// test creation of storage class spec
33+
func TestStorageClassSpecCreation(t *testing.T) {
3334
storageClassSpec := StorageClassSpec{}
34-
assert.True(t, nil != storageClassSpec.Validate())
35+
assert.Error(t, storageClassSpec.Validate(), "empty name name is not allowed")
3536

36-
storageClassSpec = StorageClassSpec{Name: "TheSpecName", IsDefault: true} // no upper-case allowed
37-
assert.True(t, nil != storageClassSpec.Validate())
37+
storageClassSpec = StorageClassSpec{Name: "TheSpecName", IsDefault: true}
38+
assert.Error(t, storageClassSpec.Validate(), "upper case letters are not allowed in resources")
3839

3940
storageClassSpec = StorageClassSpec{"the-spec-name", true}
40-
assert.Equal(t, nil, storageClassSpec.Validate())
41+
assert.NoError(t, storageClassSpec.Validate())
4142

42-
storageClassSpec = StorageClassSpec{} // this is invalid because it was not created with a proper name
43-
storageClassSpec.SetDefaults("foo") // here the Name is fixed
44-
assert.Equal(t, nil, storageClassSpec.Validate())
43+
storageClassSpec = StorageClassSpec{} // no proper name -> invalid
44+
storageClassSpec.SetDefaults("foo") // name is fixed -> vaild
45+
assert.NoError(t, storageClassSpec.Validate())
4546
}
4647

47-
func Test_StorageClassSpec_ResetImmutableFileds(t *testing.T) {
48+
// test reset of storage class spec
49+
func TestStorageClassSpecResetImmutableFileds(t *testing.T) {
4850
specSource := StorageClassSpec{"source", true}
4951
specTarget := StorageClassSpec{"target", true}
5052

5153
assert.Equal(t, "target", specTarget.Name)
5254
rv := specSource.ResetImmutableFields("fieldPrefix-", &specTarget)
53-
assert.Equal(t, "fieldPrefix-name", strings.Join(rv[:], ", "))
55+
assert.Equal(t, "fieldPrefix-name", strings.Join(rv, ", "))
5456
assert.Equal(t, "source", specTarget.Name)
5557
}

0 commit comments

Comments
 (0)