From 2e97ad74082566ad909d3c9b12ee5950f542bb2c Mon Sep 17 00:00:00 2001 From: yunchen Date: Tue, 26 Jun 2018 04:05:14 +0000 Subject: [PATCH] Fix volume testing, change assert to suite --- src/server/handler_volume_test.go | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/server/handler_volume_test.go b/src/server/handler_volume_test.go index 56e18cb5..4b3f4ac1 100644 --- a/src/server/handler_volume_test.go +++ b/src/server/handler_volume_test.go @@ -15,7 +15,6 @@ import ( "github.com/linkernetworks/vortex/src/config" "github.com/linkernetworks/vortex/src/entity" "github.com/linkernetworks/vortex/src/serviceprovider" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "gopkg.in/mgo.v2/bson" corev1 "k8s.io/api/core/v1" @@ -32,7 +31,7 @@ type VolumeTestSuite struct { storageProvider entity.StorageProvider } -func (suite *VolumeTestSuite) SetupTest() { +func (suite *VolumeTestSuite) SetupSuite() { cf := config.MustRead("../../config/testing.json") sp := serviceprovider.New(cf) @@ -49,10 +48,10 @@ func (suite *VolumeTestSuite) SetupTest() { DisplayName: namesgenerator.GetRandomName(0), } err := suite.session.Insert(entity.StorageProviderCollectionName, suite.storageProvider) - assert.NoError(suite.T(), err) + suite.NoError(err) } -func (suite *VolumeTestSuite) TearDownTest() { +func (suite *VolumeTestSuite) TearDownSuite() { suite.session.Remove(entity.StorageProviderCollectionName, "_id", suite.storageProvider.ID) } @@ -72,11 +71,11 @@ func (suite *VolumeTestSuite) TestCreateVolume() { } bodyBytes, err := json.MarshalIndent(volume, "", " ") - assert.NoError(suite.T(), err) + suite.NoError(err) bodyReader := strings.NewReader(string(bodyBytes)) httpRequest, err := http.NewRequest("POST", "http://localhost:7890/v1/volume", bodyReader) - assert.NoError(suite.T(), err) + suite.NoError(err) httpRequest.Header.Add("Content-Type", "application/json") httpWriter := httptest.NewRecorder() @@ -87,13 +86,13 @@ func (suite *VolumeTestSuite) TestCreateVolume() { //load data to check retVolume := entity.Volume{} err = suite.session.FindOne(entity.VolumeCollectionName, bson.M{"name": volume.Name}, &retVolume) - assert.NoError(suite.T(), err) - assert.NotEqual(suite.T(), "", retVolume.ID) - assert.Equal(suite.T(), volume.Name, retVolume.Name) - assert.Equal(suite.T(), volume.StorageProviderName, retVolume.StorageProviderName) - assert.Equal(suite.T(), volume.AccessMode, retVolume.AccessMode) - assert.Equal(suite.T(), volume.Capacity, retVolume.Capacity) - assert.NotEqual(suite.T(), "", retVolume.MetaName) + suite.NoError(err) + suite.NotEqual("", retVolume.ID) + suite.Equal(volume.Name, retVolume.Name) + suite.Equal(volume.StorageProviderName, retVolume.StorageProviderName) + suite.Equal(volume.AccessMode, retVolume.AccessMode) + suite.Equal(volume.Capacity, retVolume.Capacity) + suite.NotEqual("", retVolume.MetaName) //We use the new write but empty input which will cause the readEntity Error httpWriter = httptest.NewRecorder() @@ -102,7 +101,7 @@ func (suite *VolumeTestSuite) TestCreateVolume() { //Create again and it should fail since the name exist bodyReader = strings.NewReader(string(bodyBytes)) httpRequest, err = http.NewRequest("POST", "http://localhost:7890/v1/volume", bodyReader) - assert.NoError(suite.T(), err) + suite.NoError(err) httpRequest.Header.Add("Content-Type", "application/json") httpWriter = httptest.NewRecorder() suite.wc.Dispatch(httpWriter, httpRequest) @@ -121,11 +120,11 @@ func (suite *VolumeTestSuite) TestCreateVolumeWithInvalidParameter() { } bodyBytes, err := json.MarshalIndent(volume, "", " ") - assert.NoError(suite.T(), err) + suite.NoError(err) bodyReader := strings.NewReader(string(bodyBytes)) httpRequest, err := http.NewRequest("POST", "http://localhost:7890/v1/volume", bodyReader) - assert.NoError(suite.T(), err) + suite.NoError(err) httpRequest.Header.Add("Content-Type", "application/json") httpWriter := httptest.NewRecorder()