Trying to fix integration tests

Author: TVolden

ocpp-common/src/main/java/eu/chargetime/ocpp/Communicator.java

@@ -148,7 +148,7 @@ public void accept(CommunicatorEvents events) {
      * @param   action                  action name of the {@link eu.chargetime.ocpp.feature.Feature}.
      * @param   request                 the outgoing {@link Request}
      */
-    public void sendCall(String uniqueId, String action, Request request) {
+    synchronized public void sendCall(String uniqueId, String action, Request request) {
         Object call = makeCall(uniqueId, action, packPayload(request));
         try {
             if (request.transactionRelated() && transactionQueue.size() > 0) {

ocpp-common/src/main/java/eu/chargetime/ocpp/Session.java

@@ -134,7 +134,7 @@ public void onCallResult(String id, String action, Object payload) {
         }
 
         @Override
-        public void onCall(String id, String action, Object payload) {
+        synchronized public void onCall(String id, String action, Object payload) {
             Feature feature = events.findFeatureByAction(action);
             if (feature == null) {
                 communicator.sendCallError(id, action, "NotImplemented", "Requested Action is not known by receiver");

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/TimeoutSession.java

@@ -102,7 +102,7 @@ public void handleConfirmation(String uniqueId, Confirmation confirmation) {
             }
 
             @Override
-            public Confirmation handleRequest(Request request) {
+            synchronized public Confirmation handleRequest(Request request) {
                 resetTimer();
                 Confirmation confirmation = eventHandler.handleRequest(request);
 

ocpp-v1_6/src/test/java/eu/chargetime/ocpp/test/TimeoutSessionTest.java

@@ -60,10 +60,10 @@ public class TimeoutSessionTest {
     public void setup() throws Exception {
         when(sessionEvents.findFeatureByAction(any())).thenReturn(feature);
         when(sessionEvents.findFeatureByRequest(any())).thenReturn(feature);
-        session = new TimeoutSession(communicator, queue);
         doAnswer(invocation -> eventHandler = invocation.getArgumentAt(1, CommunicatorEvents.class)).when(communicator).connect(any(), any());
         doAnswer(invocation -> eventHandler = invocation.getArgumentAt(0, CommunicatorEvents.class)).when(communicator).accept(any());
 
+        session = new TimeoutSession(communicator, queue);
         session.setTimeoutTimer(timeoutTimer);
     }
 
@@ -118,8 +118,8 @@ public void onDisconnected_accepted_endTimeout() throws Exception {
     @Test
     public void onCall_request_resetTimeout() throws Exception {
         // Given
-        session.open(null, sessionEvents);
         when(communicator.unpackPayload(any(), any())).thenReturn(new TestRequest());
+        session.open(null, sessionEvents);
 
         // When
         eventHandler.onCall("", null, null);
@@ -131,8 +131,8 @@ public void onCall_request_resetTimeout() throws Exception {
     @Test
     public void onCall_confirmation_resetTimeout() throws Exception {
         // Given
-        session.open(null, sessionEvents);
         when(communicator.unpackPayload(any(), any())).thenReturn(new TestConfirmation());
+        session.open(null, sessionEvents);
 
         // When
         eventHandler.onCallResult("", null, null);