Fixed SOAP sub fault. Tried to stabilize the integration tests.

Author: TVolden

ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/FakeCentralSystem.java

@@ -261,7 +261,7 @@ public boolean hasReceivedUnlockConnectorConfirmation(String status) {
         return result;
     }
 
-    public void isRiggedToFailOnNextRequest() {
+    public void rigNextRequestToFail() {
         dummyHandlers.setRiggedToFail(true);
     }
 

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONAuthorizeSpec.groovy

@@ -55,7 +55,7 @@ class JSONAuthorizeSpec extends Specification {
         def conditions = new PollingConditions(timeout: 1)
 
         given:
-        centralSystem.isRiggedToFailOnNextRequest()
+        centralSystem.rigNextRequestToFail()
 
         when:
         chargePoint.sendAuthorizeRequest("")

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/soap/SOAPAuthorizeSpec.groovy

@@ -56,7 +56,7 @@ class SOAPAuthorizeSpec extends Specification
         def conditions = new PollingConditions(timeout: 1)
 
         given:
-        centralSystem.isRiggedToFailOnNextRequest()
+        centralSystem.rigNextRequestToFail()
 
         when:
         chargePoint.sendAuthorizeRequest("")

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

@@ -121,7 +121,7 @@ private void openWS() {
                 try {
                     soapMessage = transmitter.relay(message).get();
                 } catch (InterruptedException e) {
-                    e.printStackTrace();
+                    //e.printStackTrace();
                 } catch (ExecutionException e) {
                     e.printStackTrace();
                 }

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

@@ -34,6 +34,7 @@ of this software and associated documentation files (the "Software"), to deal
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
+import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.soap.*;
@@ -101,6 +102,15 @@ protected Object makeCall(String uniqueId, String action, Object payload) {
         return createMessage(uniqueId, action, (Document) payload, false);
     }
 
+    private QName blameSomeone(String errorCode) {
+        QName result = SOAPConstants.SOAP_RECEIVER_FAULT;
+        if ("SecurityError".equals(errorCode) || "IdentityMismatch".equals(errorCode) || "ProtocolError".equals(errorCode)) {
+            return SOAPConstants.SOAP_SENDER_FAULT;
+        }
+
+        return result;
+    }
+
     @Override
     protected Object makeCallError(String uniqueId, String action, String errorCode, String errorDescription) {
         SOAPFault fault = null;
@@ -110,9 +120,11 @@ protected Object makeCallError(String uniqueId, String action, String errorCode,
             createMessageHeader(uniqueId, String.format("%sResponse", action), true, message);
 
             SOAPFault soapFault = message.getSOAPBody().addFault();
-            soapFault.setFaultCode(errorCode);
+            soapFault.setFaultCode(blameSomeone(errorCode));
             soapFault.setFaultString(errorDescription);
 
+            soapFault.appendFaultSubcode(new QName("urn://Ocpp/Cs/2015/10/", errorCode));
+
         } catch (SOAPException e) {
             e.printStackTrace();
         }

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

@@ -84,7 +84,6 @@ void sendRequest(SOAPMessage message) throws NotConnectedException {
             try {
                 events.receivedMessage(soapConnection.call(message, url));
             } catch (SOAPException e) {
-                e.printStackTrace();
                 disconnect();
             }
         }).start();