From: elinuxhenrik Date: Fri, 7 Oct 2022 08:51:51 +0000 (+0200) Subject: Change mock generation for tests X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=0446ebd7036916597c9c9fbdb8240647a879ac6b;p=nonrtric%2Frapp%2Forufhrecovery.git Change mock generation for tests Issue-ID: NONRTRIC-808 Signed-off-by: elinuxhenrik Change-Id: Ib6b670a43ce3eaa07b1f59759f56b1e06a6897e3 --- diff --git a/goversion/internal/linkfailure/linkfailurehandler_test.go b/goversion/internal/linkfailure/linkfailurehandler_test.go index 050417f..768d6be 100644 --- a/goversion/internal/linkfailure/linkfailurehandler_test.go +++ b/goversion/internal/linkfailure/linkfailurehandler_test.go @@ -34,8 +34,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" "oransc.org/usecase/oruclosedloop/internal/repository" + repomock "oransc.org/usecase/oruclosedloop/internal/repository/mocks" + "oransc.org/usecase/oruclosedloop/internal/restclient/mocks" "oransc.org/usecase/oruclosedloop/internal/ves" - "oransc.org/usecase/oruclosedloop/mocks" ) func Test_MessagesHandlerWithLinkFailure(t *testing.T) { @@ -54,7 +55,7 @@ func Test_MessagesHandlerWithLinkFailure(t *testing.T) { StatusCode: http.StatusOK, }, nil) - lookupServiceMock := mocks.LookupService{} + lookupServiceMock := repomock.LookupService{} lookupServiceMock.On("GetODuID", mock.Anything).Return("O-DU-1122", nil) @@ -115,7 +116,7 @@ func Test_MessagesHandlerWithClearLinkFailure(t *testing.T) { log.SetOutput(os.Stderr) }() - lookupServiceMock := mocks.LookupService{} + lookupServiceMock := repomock.LookupService{} lookupServiceMock.On("GetODuID", mock.Anything).Return("O-DU-1122", nil) @@ -142,7 +143,7 @@ func Test_MessagesHandlerWithLinkFailureUnmappedORU(t *testing.T) { log.SetOutput(os.Stderr) }() - lookupServiceMock := mocks.LookupService{} + lookupServiceMock := repomock.LookupService{} lookupServiceMock.On("GetODuID", mock.Anything).Return("", repository.IdNotMappedError{ Id: "ERICSSON-O-RU-11220", diff --git a/goversion/internal/repository/csvhelp.go b/goversion/internal/repository/csvhelp.go index c5afda7..d85e9e8 100644 --- a/goversion/internal/repository/csvhelp.go +++ b/goversion/internal/repository/csvhelp.go @@ -25,6 +25,7 @@ import ( "os" ) +//go:generate mockery --name CsvFileHelper type CsvFileHelper interface { GetCsvFromFile(name string) ([][]string, error) } diff --git a/goversion/internal/repository/lookupservice.go b/goversion/internal/repository/lookupservice.go index 1b6fa69..334fe76 100644 --- a/goversion/internal/repository/lookupservice.go +++ b/goversion/internal/repository/lookupservice.go @@ -32,6 +32,7 @@ func (inme IdNotMappedError) Error() string { return fmt.Sprintf("O-RU-ID: %v not mapped.", inme.Id) } +//go:generate mockery --name LookupService type LookupService interface { Init() error GetODuID(oRuId string) (string, error) diff --git a/goversion/internal/repository/lookupservice_test.go b/goversion/internal/repository/lookupservice_test.go index 8cfdbdc..33b3d4f 100644 --- a/goversion/internal/repository/lookupservice_test.go +++ b/goversion/internal/repository/lookupservice_test.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "oransc.org/usecase/oruclosedloop/mocks" + "oransc.org/usecase/oruclosedloop/internal/repository/mocks" ) func TestIdNotMappedError(t *testing.T) { diff --git a/goversion/internal/repository/mocks/CsvFileHelper.go b/goversion/internal/repository/mocks/CsvFileHelper.go new file mode 100644 index 0000000..b857de5 --- /dev/null +++ b/goversion/internal/repository/mocks/CsvFileHelper.go @@ -0,0 +1,33 @@ +// Code generated by mockery v1.0.0. DO NOT EDIT. + +package mocks + +import mock "github.com/stretchr/testify/mock" + +// CsvFileHelper is an autogenerated mock type for the CsvFileHelper type +type CsvFileHelper struct { + mock.Mock +} + +// GetCsvFromFile provides a mock function with given fields: name +func (_m *CsvFileHelper) GetCsvFromFile(name string) ([][]string, error) { + ret := _m.Called(name) + + var r0 [][]string + if rf, ok := ret.Get(0).(func(string) [][]string); ok { + r0 = rf(name) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([][]string) + } + } + + var r1 error + if rf, ok := ret.Get(1).(func(string) error); ok { + r1 = rf(name) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} diff --git a/goversion/mocks/LookupService.go b/goversion/internal/repository/mocks/LookupService.go similarity index 51% rename from goversion/mocks/LookupService.go rename to goversion/internal/repository/mocks/LookupService.go index 7aab2f7..2ba8369 100644 --- a/goversion/mocks/LookupService.go +++ b/goversion/internal/repository/mocks/LookupService.go @@ -1,23 +1,3 @@ -// - -// ========================LICENSE_START================================= -// O-RAN-SC -// %% -// Copyright (C) 2021-2022: Nordix Foundation -// %% -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// ========================LICENSE_END=================================== -// - // Code generated by mockery v1.0.0. DO NOT EDIT. package mocks diff --git a/goversion/internal/restclient/client.go b/goversion/internal/restclient/client.go index fdd0549..6857209 100644 --- a/goversion/internal/restclient/client.go +++ b/goversion/internal/restclient/client.go @@ -43,6 +43,7 @@ func (e RequestError) Error() string { } // HTTPClient interface +//go:generate mockery --name HTTPClient type HTTPClient interface { Get(url string) (*http.Response, error) diff --git a/goversion/internal/restclient/client_test.go b/goversion/internal/restclient/client_test.go index 2c915fd..fedd668 100644 --- a/goversion/internal/restclient/client_test.go +++ b/goversion/internal/restclient/client_test.go @@ -33,7 +33,7 @@ import ( "github.com/hashicorp/go-retryablehttp" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "oransc.org/usecase/oruclosedloop/mocks" + "oransc.org/usecase/oruclosedloop/internal/restclient/mocks" ) func TestRequestError_Error(t *testing.T) { diff --git a/goversion/mocks/HTTPClient.go b/goversion/internal/restclient/mocks/HTTPClient.go similarity index 59% rename from goversion/mocks/HTTPClient.go rename to goversion/internal/restclient/mocks/HTTPClient.go index c65bac6..3037798 100644 --- a/goversion/mocks/HTTPClient.go +++ b/goversion/internal/restclient/mocks/HTTPClient.go @@ -1,23 +1,3 @@ -// - -// ========================LICENSE_START================================= -// O-RAN-SC -// %% -// Copyright (C) 2021-2022: Nordix Foundation -// %% -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// ========================LICENSE_END=================================== -// - // Code generated by mockery v1.0.0. DO NOT EDIT. package mocks diff --git a/goversion/main_test.go b/goversion/main_test.go index 6da0d95..2b195b6 100644 --- a/goversion/main_test.go +++ b/goversion/main_test.go @@ -39,7 +39,8 @@ import ( "github.com/stretchr/testify/require" "oransc.org/usecase/oruclosedloop/internal/config" "oransc.org/usecase/oruclosedloop/internal/linkfailure" - "oransc.org/usecase/oruclosedloop/mocks" + repomock "oransc.org/usecase/oruclosedloop/internal/repository/mocks" + "oransc.org/usecase/oruclosedloop/internal/restclient/mocks" ) func Test_init(t *testing.T) { @@ -150,7 +151,7 @@ func Test_initializeLookupService(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - mockCsvFileHelper := &mocks.CsvFileHelper{} + mockCsvFileHelper := &repomock.CsvFileHelper{} mockCsvFileHelper.On("GetCsvFromFile", mock.Anything).Return(tt.args.mockReturn, tt.args.mockReturnError) err := initializeLookupService(mockCsvFileHelper, tt.args.csvFile) diff --git a/goversion/mocks/CsvFileHelper.go b/goversion/mocks/CsvFileHelper.go deleted file mode 100644 index 4cc8504..0000000 --- a/goversion/mocks/CsvFileHelper.go +++ /dev/null @@ -1,53 +0,0 @@ -// - -// ========================LICENSE_START================================= -// O-RAN-SC -// %% -// Copyright (C) 2021-2022: Nordix Foundation -// %% -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// ========================LICENSE_END=================================== -// - -// Code generated by mockery v1.0.0. DO NOT EDIT. - -package mocks - -import mock "github.com/stretchr/testify/mock" - -// CsvFileHelper is an autogenerated mock type for the CsvFileHelper type -type CsvFileHelper struct { - mock.Mock -} - -// GetCsvFromFile provides a mock function with given fields: name -func (_m *CsvFileHelper) GetCsvFromFile(name string) ([][]string, error) { - ret := _m.Called(name) - - var r0 [][]string - if rf, ok := ret.Get(0).(func(string) [][]string); ok { - r0 = rf(name) - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).([][]string) - } - } - - var r1 error - if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(name) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -}