From 22c939f231dc0c23768f444330e2de8393e0aba8 Mon Sep 17 00:00:00 2001 From: is005q Date: Mon, 9 Dec 2019 10:01:51 +0200 Subject: [PATCH] Minor changes - RnibReader UTs..... Change-Id: I9cde268fbbf2e6646efeba072dfa4381ff2636a6 Signed-off-by: is005q --- reader/rNibReader_test.go | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/reader/rNibReader_test.go b/reader/rNibReader_test.go index 32e3503..66205f8 100644 --- a/reader/rNibReader_test.go +++ b/reader/rNibReader_test.go @@ -1033,16 +1033,6 @@ func TestGetE2TInstanceSuccess(t *testing.T) { assert.Equal(t, e2tInstance, res) } -func TestUnmarshal(t *testing.T) { - e2tInstance := generateE2tInstance("10.0.2.15:5555") - marshaled, _ := json.Marshal(e2tInstance) - m := map[string]interface{}{ - "whatever": string(marshaled), - } - var entity *entities.E2TInstance - _ = json.Unmarshal([]byte(m["whatever"].(string)), entity) -} - func TestGetE2TInstanceEmptyAddressFailure(t *testing.T) { w, _ := initSdlInstanceMock() res, err := w.GetE2TInstance("") @@ -1076,6 +1066,18 @@ func generateE2tInstance(address string) *entities.E2TInstance { return e2tInstance } +func TestGetE2TAddressesSdlError(t *testing.T) { + w, sdlInstanceMock := initSdlInstanceMock() + + expectedErr := errors.New("expected error") + var ret map[string]interface{} + sdlInstanceMock.On("Get", []string{E2TAddressesKey}).Return(ret, expectedErr) + + res, rNibErr := w.GetE2TAddresses() + assert.NotNil(t, rNibErr) + assert.Nil(t, res) +} + func TestGetE2TAddressesSuccess(t *testing.T) { address := "10.10.2.15:9800" w, sdlInstanceMock := initSdlInstanceMock() @@ -1165,17 +1167,6 @@ func TestGetE2TInstancesEmptyData(t *testing.T) { assert.IsType(t, &common.ResourceNotFoundError{}, err) } -func TestGetE2TInfoListSdlError(t *testing.T) { - w, sdlInstanceMock := initSdlInstanceMock() - - expectedErr := errors.New("expected error") - var ret map[string]interface{} - sdlInstanceMock.On("Get", []string{E2TAddressesKey}).Return(ret, expectedErr) - - res, rNibErr := w.GetE2TAddresses() - assert.NotNil(t, rNibErr) - assert.Nil(t, res) -} //integration tests // -- 2.16.6