Skip to content

Commit 3f4328c

Browse files
xBlaz3kxxBlaz3kx
committed
fix: use suite assertions in ocpp 1.6 and 2.0.1 packages
1 parent 4dd2c25 commit 3f4328c

104 files changed

Lines changed: 1695 additions & 2207 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ocpp1.6_test/authorize_test.go‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,29 @@ import (
66

77
"github.com/lorenzodonini/ocpp-go/ocpp1.6/core"
88
"github.com/lorenzodonini/ocpp-go/ocpp1.6/types"
9-
"github.com/stretchr/testify/assert"
109
"github.com/stretchr/testify/mock"
11-
"github.com/stretchr/testify/require"
1210
)
1311

1412
// Test
1513
func (suite *OcppV16TestSuite) TestAuthorizeRequestValidation() {
16-
t := suite.T()
1714
var requestTable = []GenericTestEntry{
1815
{core.AuthorizeRequest{IdTag: "12345"}, true},
1916
{core.AuthorizeRequest{}, false},
2017
{core.AuthorizeRequest{IdTag: ">20.................."}, false},
2118
}
22-
ExecuteGenericTestTable(t, requestTable)
19+
ExecuteGenericTestTable(suite, requestTable)
2320
}
2421

2522
func (suite *OcppV16TestSuite) TestAuthorizeConfirmationValidation() {
26-
t := suite.T()
2723
var confirmationTable = []GenericTestEntry{
2824
{core.AuthorizeConfirmation{IdTagInfo: &types.IdTagInfo{ExpiryDate: types.NewDateTime(time.Now().Add(time.Hour * 8)), ParentIdTag: "00000", Status: types.AuthorizationStatusAccepted}}, true},
2925
{core.AuthorizeConfirmation{IdTagInfo: &types.IdTagInfo{Status: "invalidAuthorizationStatus"}}, false},
3026
{core.AuthorizeConfirmation{}, false},
3127
}
32-
ExecuteGenericTestTable(t, confirmationTable)
28+
ExecuteGenericTestTable(suite, confirmationTable)
3329
}
3430

3531
func (suite *OcppV16TestSuite) TestAuthorizeE2EMocked() {
36-
t := suite.T()
3732
wsId := "test_id"
3833
messageId := defaultMessageId
3934
wsUrl := "someUrl"
@@ -52,22 +47,22 @@ func (suite *OcppV16TestSuite) TestAuthorizeE2EMocked() {
5247
coreListener := &MockCentralSystemCoreListener{}
5348
coreListener.On("OnAuthorize", mock.AnythingOfType("string"), mock.Anything).Return(authorizeConfirmation, nil).Run(func(args mock.Arguments) {
5449
request, ok := args.Get(1).(*core.AuthorizeRequest)
55-
require.True(t, ok)
56-
require.NotNil(t, request)
57-
assert.Equal(t, idTag, request.IdTag)
50+
suite.Require().True(ok)
51+
suite.Require().NotNil(request)
52+
suite.Equal(idTag, request.IdTag)
5853
})
5954
setupDefaultCentralSystemHandlers(suite, coreListener, expectedCentralSystemOptions{clientId: wsId, rawWrittenMessage: responseRaw, forwardWrittenMessage: true})
6055
setupDefaultChargePointHandlers(suite, nil, expectedChargePointOptions{serverUrl: wsUrl, clientId: wsId, createChannelOnStart: true, channel: channel, rawWrittenMessage: requestRaw, forwardWrittenMessage: true})
6156
// Run Test
6257
suite.centralSystem.Start(8887, "somePath")
6358
err := suite.chargePoint.Start(wsUrl)
64-
require.Nil(t, err)
59+
suite.Require().Nil(err)
6560
confirmation, err := suite.chargePoint.Authorize(idTag)
66-
require.Nil(t, err)
67-
require.NotNil(t, confirmation)
68-
assert.Equal(t, status, confirmation.IdTagInfo.Status)
69-
assert.Equal(t, parentIdTag, confirmation.IdTagInfo.ParentIdTag)
70-
assertDateTimeEquality(t, *expiryDate, *confirmation.IdTagInfo.ExpiryDate)
61+
suite.Require().Nil(err)
62+
suite.Require().NotNil(confirmation)
63+
suite.Equal(status, confirmation.IdTagInfo.Status)
64+
suite.Equal(parentIdTag, confirmation.IdTagInfo.ParentIdTag)
65+
assertDateTimeEquality(suite, *expiryDate, *confirmation.IdTagInfo.ExpiryDate)
7166
}
7267

7368
func (suite *OcppV16TestSuite) TestAuthorizeInvalidEndpoint() {

‎ocpp1.6_test/boot_notification_test.go‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@ import (
66

77
"github.com/lorenzodonini/ocpp-go/ocpp1.6/core"
88
"github.com/lorenzodonini/ocpp-go/ocpp1.6/types"
9-
"github.com/stretchr/testify/assert"
109
"github.com/stretchr/testify/mock"
11-
"github.com/stretchr/testify/require"
1210
)
1311

1412
// Tests
1513
func (suite *OcppV16TestSuite) TestBootNotificationRequestValidation() {
16-
t := suite.T()
1714
var requestTable = []GenericTestEntry{
1815
{core.BootNotificationRequest{ChargePointModel: "test", ChargePointVendor: "test"}, true},
1916
{core.BootNotificationRequest{ChargeBoxSerialNumber: "test", ChargePointModel: "test", ChargePointSerialNumber: "number", ChargePointVendor: "test", FirmwareVersion: "version", Iccid: "test", Imsi: "test"}, true},
@@ -29,11 +26,10 @@ func (suite *OcppV16TestSuite) TestBootNotificationRequestValidation() {
2926
{core.BootNotificationRequest{ChargePointModel: "test", ChargePointVendor: "test", MeterSerialNumber: ">25......................."}, false},
3027
{core.BootNotificationRequest{ChargePointModel: "test", ChargePointVendor: "test", MeterType: ">25......................."}, false},
3128
}
32-
ExecuteGenericTestTable(t, requestTable)
29+
ExecuteGenericTestTable(suite, requestTable)
3330
}
3431

3532
func (suite *OcppV16TestSuite) TestBootNotificationConfirmationValidation() {
36-
t := suite.T()
3733
var confirmationTable = []GenericTestEntry{
3834
{core.BootNotificationConfirmation{CurrentTime: types.NewDateTime(time.Now()), Interval: 60, Status: core.RegistrationStatusAccepted}, true},
3935
{core.BootNotificationConfirmation{CurrentTime: types.NewDateTime(time.Now()), Interval: 60, Status: core.RegistrationStatusPending}, true},
@@ -44,11 +40,10 @@ func (suite *OcppV16TestSuite) TestBootNotificationConfirmationValidation() {
4440
{core.BootNotificationConfirmation{CurrentTime: types.NewDateTime(time.Now()), Interval: 60}, false},
4541
{core.BootNotificationConfirmation{Interval: 60, Status: core.RegistrationStatusAccepted}, false},
4642
}
47-
ExecuteGenericTestTable(t, confirmationTable)
43+
ExecuteGenericTestTable(suite, confirmationTable)
4844
}
4945

5046
func (suite *OcppV16TestSuite) TestBootNotificationE2EMocked() {
51-
t := suite.T()
5247
wsId := "test_id"
5348
messageId := "1234"
5449
wsUrl := "someUrl"
@@ -65,23 +60,23 @@ func (suite *OcppV16TestSuite) TestBootNotificationE2EMocked() {
6560
coreListener := &MockCentralSystemCoreListener{}
6661
coreListener.On("OnBootNotification", mock.AnythingOfType("string"), mock.Anything).Return(bootNotificationConfirmation, nil).Run(func(args mock.Arguments) {
6762
request, ok := args.Get(1).(*core.BootNotificationRequest)
68-
require.True(t, ok)
69-
require.NotNil(t, request)
70-
assert.Equal(t, chargePointModel, request.ChargePointModel)
71-
assert.Equal(t, chargePointVendor, request.ChargePointVendor)
63+
suite.Require().True(ok)
64+
suite.Require().NotNil(request)
65+
suite.Equal(chargePointModel, request.ChargePointModel)
66+
suite.Equal(chargePointVendor, request.ChargePointVendor)
7267
})
7368
setupDefaultCentralSystemHandlers(suite, coreListener, expectedCentralSystemOptions{clientId: wsId, rawWrittenMessage: []byte(responseJson), forwardWrittenMessage: true})
7469
setupDefaultChargePointHandlers(suite, nil, expectedChargePointOptions{serverUrl: wsUrl, clientId: wsId, createChannelOnStart: true, channel: channel, rawWrittenMessage: []byte(requestJson), forwardWrittenMessage: true})
7570
// Run test
7671
suite.centralSystem.Start(8887, "somePath")
7772
err := suite.chargePoint.Start(wsUrl)
78-
require.Nil(t, err)
73+
suite.Require().Nil(err)
7974
confirmation, err := suite.chargePoint.BootNotification(chargePointModel, chargePointVendor)
80-
require.Nil(t, err)
81-
require.NotNil(t, confirmation)
82-
assert.Equal(t, registrationStatus, confirmation.Status)
83-
assert.Equal(t, interval, confirmation.Interval)
84-
assertDateTimeEquality(t, *currentTime, *confirmation.CurrentTime)
75+
suite.Require().Nil(err)
76+
suite.Require().NotNil(confirmation)
77+
suite.Equal(registrationStatus, confirmation.Status)
78+
suite.Equal(interval, confirmation.Interval)
79+
assertDateTimeEquality(suite, *currentTime, *confirmation.CurrentTime)
8580
}
8681

8782
func (suite *OcppV16TestSuite) TestBootNotificationInvalidEndpoint() {

‎ocpp1.6_test/cancel_reservation_test.go‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,29 @@ import (
44
"fmt"
55

66
"github.com/lorenzodonini/ocpp-go/ocpp1.6/reservation"
7-
"github.com/stretchr/testify/assert"
87
"github.com/stretchr/testify/mock"
9-
"github.com/stretchr/testify/require"
108
)
119

1210
// Test
1311
func (suite *OcppV16TestSuite) TestCancelReservationRequestValidation() {
14-
t := suite.T()
1512
requestTable := []GenericTestEntry{
1613
{reservation.CancelReservationRequest{ReservationId: 42}, true},
1714
{reservation.CancelReservationRequest{}, true},
1815
{reservation.CancelReservationRequest{ReservationId: -1}, true},
1916
}
20-
ExecuteGenericTestTable(t, requestTable)
17+
ExecuteGenericTestTable(suite, requestTable)
2118
}
2219

2320
func (suite *OcppV16TestSuite) TestCancelReservationConfirmationValidation() {
24-
t := suite.T()
2521
confirmationTable := []GenericTestEntry{
2622
{reservation.CancelReservationConfirmation{Status: reservation.CancelReservationStatusAccepted}, true},
2723
{reservation.CancelReservationConfirmation{Status: "invalidCancelReservationStatus"}, false},
2824
{reservation.CancelReservationConfirmation{}, false},
2925
}
30-
ExecuteGenericTestTable(t, confirmationTable)
26+
ExecuteGenericTestTable(suite, confirmationTable)
3127
}
3228

3329
func (suite *OcppV16TestSuite) TestCancelReservationE2EMocked() {
34-
t := suite.T()
3530
wsId := "test_id"
3631
messageId := defaultMessageId
3732
wsUrl := "someUrl"
@@ -45,27 +40,27 @@ func (suite *OcppV16TestSuite) TestCancelReservationE2EMocked() {
4540
reservationListener := &MockChargePointReservationListener{}
4641
reservationListener.On("OnCancelReservation", mock.Anything).Return(cancelReservationConfirmation, nil).Run(func(args mock.Arguments) {
4742
request, ok := args.Get(0).(*reservation.CancelReservationRequest)
48-
require.NotNil(t, request)
49-
require.True(t, ok)
50-
assert.Equal(t, reservationId, request.ReservationId)
43+
suite.Require().NotNil(request)
44+
suite.Require().True(ok)
45+
suite.Equal(reservationId, request.ReservationId)
5146
})
5247
setupDefaultCentralSystemHandlers(suite, nil, expectedCentralSystemOptions{clientId: wsId, rawWrittenMessage: []byte(requestJson), forwardWrittenMessage: true})
5348
setupDefaultChargePointHandlers(suite, nil, expectedChargePointOptions{serverUrl: wsUrl, clientId: wsId, createChannelOnStart: true, channel: channel, rawWrittenMessage: []byte(responseJson), forwardWrittenMessage: true})
5449
suite.chargePoint.SetReservationHandler(reservationListener)
5550
// Run Test
5651
suite.centralSystem.Start(8887, "somePath")
5752
err := suite.chargePoint.Start(wsUrl)
58-
require.Nil(t, err)
53+
suite.Require().Nil(err)
5954
resultChannel := make(chan bool, 1)
6055
err = suite.centralSystem.CancelReservation(wsId, func(confirmation *reservation.CancelReservationConfirmation, err error) {
61-
require.Nil(t, err)
62-
require.NotNil(t, confirmation)
63-
assert.Equal(t, status, confirmation.Status)
56+
suite.Require().Nil(err)
57+
suite.Require().NotNil(confirmation)
58+
suite.Equal(status, confirmation.Status)
6459
resultChannel <- true
6560
}, reservationId)
66-
require.Nil(t, err)
61+
suite.Require().Nil(err)
6762
result := <-resultChannel
68-
assert.True(t, result)
63+
suite.True(result)
6964
}
7065

7166
func (suite *OcppV16TestSuite) TestCancelReservationInvalidEndpoint() {

‎ocpp1.6_test/certificate_signed_test.go‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,28 @@ import (
55

66
"github.com/lorenzodonini/ocpp-go/ocpp1.6/security"
77
"github.com/lorenzodonini/ocpp-go/ocpp1.6_test/mocks"
8-
"github.com/stretchr/testify/assert"
98
"github.com/stretchr/testify/mock"
10-
"github.com/stretchr/testify/require"
119
)
1210

1311
func (suite *OcppV16TestSuite) TestCertificateSignedRequestValidation() {
14-
t := suite.T()
1512
var testTable = []GenericTestEntry{
1613
{security.CertificateSignedRequest{CertificateChain: "sampleCert"}, true},
1714
{security.CertificateSignedRequest{CertificateChain: ""}, false},
1815
{security.CertificateSignedRequest{}, false},
1916
{security.CertificateSignedRequest{CertificateChain: newLongString(100001)}, false},
2017
}
21-
ExecuteGenericTestTable(t, testTable)
18+
ExecuteGenericTestTable(suite, testTable)
2219
}
2320

2421
func (suite *OcppV16TestSuite) TestCertificateSignedConfirmationValidation() {
25-
t := suite.T()
2622
var testTable = []GenericTestEntry{
2723
{security.CertificateSignedResponse{Status: security.CertificateSignedStatusAccepted}, true},
2824
{security.CertificateSignedResponse{Status: security.CertificateSignedStatusAccepted}, true},
2925
{security.CertificateSignedResponse{Status: security.CertificateSignedStatusRejected}, true},
3026
{security.CertificateSignedResponse{Status: "invalidCertificateSignedStatus"}, false},
3127
{security.CertificateSignedResponse{}, false},
3228
}
33-
ExecuteGenericTestTable(t, testTable)
29+
ExecuteGenericTestTable(suite, testTable)
3430
}
3531

3632
// Test
@@ -49,7 +45,7 @@ func (suite *OcppV16TestSuite) TestCertificateSignedE2EMocked() {
4945
// Setting handlers
5046
handler := mocks.NewMockSecurityChargePointHandler(t)
5147
handler.EXPECT().OnCertificateSigned(mock.Anything).RunAndReturn(func(request *security.CertificateSignedRequest) (*security.CertificateSignedResponse, error) {
52-
assert.Equal(t, certificateChain, request.CertificateChain)
48+
suite.Equal(certificateChain, request.CertificateChain)
5349
return certificateSignedConfirmation, nil
5450
})
5551

@@ -60,19 +56,19 @@ func (suite *OcppV16TestSuite) TestCertificateSignedE2EMocked() {
6056
suite.centralSystem.Start(8887, "somePath")
6157
suite.chargePoint.SetSecurityHandler(handler)
6258
err := suite.chargePoint.Start(wsUrl)
63-
require.Nil(t, err)
59+
suite.Require().Nil(err)
6460
resultChannel := make(chan bool, 1)
6561
err = suite.centralSystem.CertificateSigned(wsId, func(confirmation *security.CertificateSignedResponse, err error) {
66-
require.Nil(t, err)
67-
require.NotNil(t, confirmation)
68-
assert.Equal(t, status, confirmation.Status)
62+
suite.Require().Nil(err)
63+
suite.Require().NotNil(confirmation)
64+
suite.Equal(status, confirmation.Status)
6965
resultChannel <- true
7066
}, certificateChain, func(request *security.CertificateSignedRequest) {
7167
request.CertificateChain = certificateChain
7268
})
73-
require.Nil(t, err)
69+
suite.Require().Nil(err)
7470
result := <-resultChannel
75-
assert.True(t, result)
71+
suite.True(result)
7672
}
7773

7874
func (suite *OcppV16TestSuite) TestCertificateSignedInvalidEndpoint() {

‎ocpp1.6_test/change_availability_test.go‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@ import (
44
"fmt"
55

66
"github.com/lorenzodonini/ocpp-go/ocpp1.6/core"
7-
"github.com/stretchr/testify/assert"
87
"github.com/stretchr/testify/mock"
9-
"github.com/stretchr/testify/require"
108
)
119

1210
func (suite *OcppV16TestSuite) TestChangeAvailabilityRequestValidation() {
13-
t := suite.T()
1411
var testTable = []GenericTestEntry{
1512
{core.ChangeAvailabilityRequest{ConnectorId: 0, Type: core.AvailabilityTypeOperative}, true},
1613
{core.ChangeAvailabilityRequest{ConnectorId: 0, Type: core.AvailabilityTypeInoperative}, true},
@@ -19,24 +16,22 @@ func (suite *OcppV16TestSuite) TestChangeAvailabilityRequestValidation() {
1916
{core.ChangeAvailabilityRequest{Type: "invalidAvailabilityType"}, false},
2017
{core.ChangeAvailabilityRequest{ConnectorId: -1, Type: core.AvailabilityTypeOperative}, false},
2118
}
22-
ExecuteGenericTestTable(t, testTable)
19+
ExecuteGenericTestTable(suite, testTable)
2320
}
2421

2522
func (suite *OcppV16TestSuite) TestChangeAvailabilityConfirmationValidation() {
26-
t := suite.T()
2723
var testTable = []GenericTestEntry{
2824
{core.ChangeAvailabilityConfirmation{Status: core.AvailabilityStatusAccepted}, true},
2925
{core.ChangeAvailabilityConfirmation{Status: core.AvailabilityStatusRejected}, true},
3026
{core.ChangeAvailabilityConfirmation{Status: core.AvailabilityStatusScheduled}, true},
3127
{core.ChangeAvailabilityConfirmation{Status: "invalidAvailabilityStatus"}, false},
3228
{core.ChangeAvailabilityConfirmation{}, false},
3329
}
34-
ExecuteGenericTestTable(t, testTable)
30+
ExecuteGenericTestTable(suite, testTable)
3531
}
3632

3733
// Test
3834
func (suite *OcppV16TestSuite) TestChangeAvailabilityE2EMocked() {
39-
t := suite.T()
4035
wsId := "test_id"
4136
messageId := defaultMessageId
4237
wsUrl := "someUrl"
@@ -51,27 +46,27 @@ func (suite *OcppV16TestSuite) TestChangeAvailabilityE2EMocked() {
5146
coreListener := &MockChargePointCoreListener{}
5247
coreListener.On("OnChangeAvailability", mock.Anything).Return(changeAvailabilityConfirmation, nil).Run(func(args mock.Arguments) {
5348
request, ok := args.Get(0).(*core.ChangeAvailabilityRequest)
54-
require.NotNil(t, request)
55-
require.True(t, ok)
56-
assert.Equal(t, connectorId, request.ConnectorId)
57-
assert.Equal(t, availabilityType, request.Type)
49+
suite.Require().NotNil(request)
50+
suite.Require().True(ok)
51+
suite.Equal(connectorId, request.ConnectorId)
52+
suite.Equal(availabilityType, request.Type)
5853
})
5954
setupDefaultCentralSystemHandlers(suite, nil, expectedCentralSystemOptions{clientId: wsId, rawWrittenMessage: []byte(requestJson), forwardWrittenMessage: true})
6055
setupDefaultChargePointHandlers(suite, coreListener, expectedChargePointOptions{serverUrl: wsUrl, clientId: wsId, createChannelOnStart: true, channel: channel, rawWrittenMessage: []byte(responseJson), forwardWrittenMessage: true})
6156
// Run Test
6257
suite.centralSystem.Start(8887, "somePath")
6358
err := suite.chargePoint.Start(wsUrl)
64-
require.Nil(t, err)
59+
suite.Require().Nil(err)
6560
resultChannel := make(chan bool, 1)
6661
err = suite.centralSystem.ChangeAvailability(wsId, func(confirmation *core.ChangeAvailabilityConfirmation, err error) {
67-
require.NotNil(t, confirmation)
68-
require.Nil(t, err)
69-
assert.Equal(t, status, confirmation.Status)
62+
suite.Require().NotNil(confirmation)
63+
suite.Require().Nil(err)
64+
suite.Equal(status, confirmation.Status)
7065
resultChannel <- true
7166
}, connectorId, availabilityType)
72-
require.Nil(t, err)
67+
suite.Require().Nil(err)
7368
result := <-resultChannel
74-
assert.True(t, result)
69+
suite.True(result)
7570
}
7671

7772
func (suite *OcppV16TestSuite) TestChangeAvailabilityInvalidEndpoint() {

0 commit comments

Comments
 (0)