Upgrade mockery to v3

Signed-off-by: Lorenzo <[email protected]>

Author: lorenzodonini

.github/workflows/test.yaml

@@ -38,9 +38,9 @@ jobs:
         uses: jaxxstorm/[email protected]
         with: # Grab a specific tag
           repo: vektra/mockery
-          tag: v2.53.3
+          tag: v3.5.3
       - name: Generate mocks
-        run: mockery
+        run: mockery --config .mockery.yaml
       - name: Cache generated mocks
         uses: actions/cache@v4
         with:

.mockery.yaml

@@ -1,139 +1,110 @@
-with-expecter: true
-dir: "{{.InterfaceDir}}/mocks"
-outpkg: mocks
-filename: "mock_{{.InterfaceName}}.go"
-mockname: "Mock{{.InterfaceName}}"
 all: true
-
+dir: '{{.InterfaceDir}}/mocks'
+structname: Mock{{.InterfaceName}}
+pkgname: mocks
+template: testify
+template-data:
+  unroll-variadic: true
 packages:
-  github.com/lorenzodonini/ocpp-go/ocpp1.6/core:
+  github.com/lorenzodonini/ocpp-go/ocpp1.6:
     config:
-      dir: "ocpp1.6_test/mocks"
-      filename: "mock_core_{{.InterfaceName|snakecase}}.go"
-      mockname: "MockCore{{.InterfaceName}}"
+      dir: ocpp1.6_test/mocks
     interfaces:
-      CentralSystemHandler:
-      ChargePointHandler:
-
+      CentralSystem: {}
+      ChargePoint: {}
+      ChargePointConnection: {}
   github.com/lorenzodonini/ocpp-go/ocpp1.6/certificates:
     config:
-      dir: "ocpp1.6_test/mocks"
-      filename: "mock_certificates_{{.InterfaceName|snakecase}}.go"
-      mockname: "MockCertificates{{.InterfaceName}}"
-
+      dir: ocpp1.6_test/mocks
+      structname: MockCertificates{{.InterfaceName}}
+      filename: mock_certificates_{{.InterfaceName|snakecase}}.go
     interfaces:
-      ChargePointHandler:
-
-  github.com/lorenzodonini/ocpp-go/ocpp1.6/logging:
+      ChargePointHandler: {}
+  github.com/lorenzodonini/ocpp-go/ocpp1.6/core:
     config:
-      dir: "ocpp1.6_test/mocks"
-      filename: "mock_logging_{{.InterfaceName|snakecase}}.go"
-      mockname: "MockLog{{.InterfaceName}}"
-
+      dir: ocpp1.6_test/mocks
+      structname: MockCore{{.InterfaceName}}
+      filename: mock_core_{{.InterfaceName|snakecase}}.go
     interfaces:
-      CentralSystemHandler:
-      ChargePointHandler:
-
+      CentralSystemHandler: {}
+      ChargePointHandler: {}
   github.com/lorenzodonini/ocpp-go/ocpp1.6/extendedtriggermessage:
     config:
-      dir: "ocpp1.6_test/mocks"
-      filename: "mock_extended_trigger_message_{{.InterfaceName|snakecase}}.go"
-      mockname: "MockExtendedTriggerMessage{{.InterfaceName}}"
-
+      dir: ocpp1.6_test/mocks
+      structname: MockExtendedTriggerMessage{{.InterfaceName}}
+      filename: mock_extended_trigger_message_{{.InterfaceName|snakecase}}.go
     interfaces:
-      ChargePointHandler:
-
+      ChargePointHandler: {}
   github.com/lorenzodonini/ocpp-go/ocpp1.6/firmware:
     config:
-      dir: "ocpp1.6_test/mocks"
-      filename: "mock_firmware_{{.InterfaceName|snakecase}}.go"
-      mockname: "MockFirmware{{.InterfaceName}}"
-
+      dir: ocpp1.6_test/mocks
+      structname: MockFirmware{{.InterfaceName}}
+      filename: mock_firmware_{{.InterfaceName|snakecase}}.go
     interfaces:
-      CentralSystemHandler:
-      ChargePointHandler:
-
+      CentralSystemHandler: {}
+      ChargePointHandler: {}
   github.com/lorenzodonini/ocpp-go/ocpp1.6/localauth:
     config:
-      dir: "ocpp1.6_test/mocks"
-      filename: "mock_local_auth_list_{{.InterfaceName|snakecase}}.go"
-      mockname: "MockLocalAuthList{{.InterfaceName}}"
-
+      dir: ocpp1.6_test/mocks
+      structname: MockLocalAuthList{{.InterfaceName}}
+      filename: mock_local_auth_list_{{.InterfaceName|snakecase}}.go
+    interfaces:
+      CentralSystemHandler: {}
+      ChargePointHandler: {}
+  github.com/lorenzodonini/ocpp-go/ocpp1.6/logging:
+    config:
+      dir: ocpp1.6_test/mocks
+      structname: MockLog{{.InterfaceName}}
+      filename: mock_logging_{{.InterfaceName|snakecase}}.go
     interfaces:
-      CentralSystemHandler:
-      ChargePointHandler:
-
-
+      CentralSystemHandler: {}
+      ChargePointHandler: {}
   github.com/lorenzodonini/ocpp-go/ocpp1.6/remotetrigger:
     config:
-      dir: "ocpp1.6_test/mocks"
-      filename: "mock_remote_trigger_{{.InterfaceName|snakecase}}.go"
-      mockname: "MockRemoteTrigger{{.InterfaceName}}"
-
+      dir: ocpp1.6_test/mocks
+      structname: MockRemoteTrigger{{.InterfaceName}}
+      filename: mock_remote_trigger_{{.InterfaceName|snakecase}}.go
     interfaces:
-      CentralSystemHandler:
-      ChargePointHandler:
-
+      CentralSystemHandler: {}
+      ChargePointHandler: {}
   github.com/lorenzodonini/ocpp-go/ocpp1.6/reservation:
     config:
-      dir: "ocpp1.6_test/mocks"
-      filename: "mock_reservation_{{.InterfaceName|snakecase}}.go"
-      mockname: "MockReservation{{.InterfaceName}}"
-
+      dir: ocpp1.6_test/mocks
+      structname: MockReservation{{.InterfaceName}}
+      filename: mock_reservation_{{.InterfaceName|snakecase}}.go
     interfaces:
-      CentralSystemHandler:
-      ChargePointHandler:
-
+      CentralSystemHandler: {}
+      ChargePointHandler: {}
   github.com/lorenzodonini/ocpp-go/ocpp1.6/securefirmware:
     config:
-      dir: "ocpp1.6_test/mocks"
-      filename: "mock_secure_firmware_{{.InterfaceName}}.go"
-      mockname: "MockSecureFirmware{{.InterfaceName}}"
-
+      dir: ocpp1.6_test/mocks
+      structname: MockSecureFirmware{{.InterfaceName}}
+      filename: mock_secure_firmware_{{.InterfaceName|snakecase}}.go
     interfaces:
-      CentralSystemHandler:
-      ChargePointHandler:
-
-
+      CentralSystemHandler: {}
+      ChargePointHandler: {}
   github.com/lorenzodonini/ocpp-go/ocpp1.6/security:
     config:
-      dir: "ocpp1.6_test/mocks"
-      filename: "mock_security_{{.InterfaceName|snakecase}}.go"
-      mockname: "MockSecurity{{.InterfaceName}}"
-
+      dir: ocpp1.6_test/mocks
+      structname: MockSecurity{{.InterfaceName}}
+      filename: mock_security_{{.InterfaceName|snakecase}}.go
     interfaces:
-      CentralSystemHandler:
-      ChargePointHandler:
-
-
+      CentralSystemHandler: {}
+      ChargePointHandler: {}
   github.com/lorenzodonini/ocpp-go/ocpp1.6/smartcharging:
     config:
-      dir: "ocpp1.6_test/mocks"
-      filename: "mock_smart_charging_{{.InterfaceName|snakecase}}.go"
-      mockname: "MockSmartCharging{{.InterfaceName}}"
-
-    interfaces:
-      CentralSystemHandler:
-      ChargePointHandler:
-
-
-  github.com/lorenzodonini/ocpp-go/ocpp1.6:
-    config:
-      dir: "ocpp1.6_test/mocks"
-      filename: "mock_ocpp16.go"
-
+      dir: ocpp1.6_test/mocks
+      structname: MockSmartCharging{{.InterfaceName}}
+      filename: mock_smart_charging_{{.InterfaceName|snakecase}}.go
     interfaces:
-      ChargePointConnection:
-      ChargePoint:
-      CentralSystem:
-
+      CentralSystemHandler: {}
+      ChargePointHandler: {}
   github.com/lorenzodonini/ocpp-go/ocppj:
     interfaces:
-      ServerQueueMap:
-      RequestQueue:
-
+      RequestQueue: {}
+      ServerQueueMap: {}
   github.com/lorenzodonini/ocpp-go/ws:
     interfaces:
-      WsClient:
-      WsServer:
-      Channel:
+      Channel: {}
+      Client: {}
+      Server: {}

Makefile

@@ -2,6 +2,6 @@ test:
 	docker compose -f docker-compose.test.yaml up toxiproxy integration_test --abort-on-container-exit
 
 mocks:
-	docker run --rm -v $(PWD):/src -w /src vektra/mockery:v2.53.3 --config .mockery.yaml
+	docker run --rm -v $(PWD):/src -w /src vektra/mockery:v3.5.3 --config .mockery.yaml
 
 .PHONY: test mocks