refactor: parameterize websocket url in tests

Author: goekay

src/test/java/de/rwth/idsg/steve/certification/ocpp16/AbstractOcpp16JsonCsms.java

@@ -19,6 +19,7 @@
 package de.rwth.idsg.steve.certification.ocpp16;
 
 import de.rwth.idsg.steve.ocpp.OcppVersion;
+import de.rwth.idsg.steve.utils.Helpers;
 import de.rwth.idsg.steve.utils.OcppJsonChargePoint;
 import de.rwth.idsg.steve.utils.__DatabasePreparer__;
 import de.rwth.idsg.steve.web.dto.RestCallback;
@@ -38,6 +39,8 @@
 import ocpp.cs._2015._10.StopTransactionRequest;
 import org.jetbrains.annotations.Nullable;
 import org.joda.time.DateTime;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.server.autoconfigure.ServerProperties;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -51,13 +54,14 @@
 @Slf4j
 public abstract class AbstractOcpp16JsonCsms {
 
-    static final String PATH = "ws://localhost:8080/steve/websocket/CentralSystemService/";
-
     static final String REGISTERED_CHARGE_BOX_ID = __DatabasePreparer__.getRegisteredChargeBoxId();
     static final String REGISTERED_OCPP_TAG = __DatabasePreparer__.getRegisteredOcppTag();
 
     static final String CPO_NAME = "SteVe-CPO";
 
+    @Autowired
+    ServerProperties serverProperties;
+
     static BootNotificationRequest bootNotification() {
         return new BootNotificationRequest()
             .withChargePointVendor(getRandomString())
@@ -183,8 +187,8 @@ static StartTransactionResponse enterChargingState(OcppJsonChargePoint chargePoi
         return startTransactionResponse;
     }
 
-    static OcppJsonChargePoint defaultStation() {
-        return new OcppJsonChargePoint(OcppVersion.V_16, REGISTERED_CHARGE_BOX_ID, PATH);
+    OcppJsonChargePoint defaultStation() {
+        return new OcppJsonChargePoint(OcppVersion.V_16, REGISTERED_CHARGE_BOX_ID, Helpers.getJsonPath(serverProperties));
     }
 
     @FunctionalInterface

src/test/java/de/rwth/idsg/steve/certification/ocpp16/Ocpp16JsonCsmsCertificationIT.java

@@ -22,6 +22,7 @@
 import de.rwth.idsg.steve.repository.ChargingProfileRepository;
 import de.rwth.idsg.steve.repository.ReservationStatus;
 import de.rwth.idsg.steve.service.OcppOperationsService;
+import de.rwth.idsg.steve.utils.Helpers;
 import de.rwth.idsg.steve.utils.OcppJsonChargePoint;
 import de.rwth.idsg.steve.utils.__DatabasePreparer__;
 import de.rwth.idsg.steve.utils.mapper.ChargingProfileDetailsMapper;
@@ -2911,12 +2912,14 @@ public void test_TC_085_CSMS_BasicAuthenticationValidCredentials() {
 
     @Test
     public void test_TC_088_CSMS_WebSocketSubprotocolNegotiation() {
+        String path = Helpers.getJsonPath(serverProperties);
+
         assertThrows(
             RuntimeException.class,
-            () -> new OcppJsonChargePoint(List.of("ocpp0.1"), REGISTERED_CHARGE_BOX_ID, PATH).start()
+            () -> new OcppJsonChargePoint(List.of("ocpp0.1"), REGISTERED_CHARGE_BOX_ID, path).start()
         );
 
-        var chargePoint = new OcppJsonChargePoint(List.of("ocpp0.1", "ocpp1.6"), REGISTERED_CHARGE_BOX_ID, PATH).start();
+        var chargePoint = new OcppJsonChargePoint(List.of("ocpp0.1", "ocpp1.6"), REGISTERED_CHARGE_BOX_ID, path).start();
 
         List<String> responseHeaders = chargePoint.getResponseHeader("Sec-WebSocket-Protocol");
         assertNotNull(responseHeaders);

src/test/java/de/rwth/idsg/steve/certification/ocpp16/Ocpp16JsonCsmsCertification_TLS_IT.java

@@ -18,10 +18,12 @@
  */
 package de.rwth.idsg.steve.certification.ocpp16;
 
+import de.rwth.idsg.steve.config.WebSocketConfiguration;
 import de.rwth.idsg.steve.ocpp.OcppVersion;
 import de.rwth.idsg.steve.ocpp.task.CertificateSignedTask;
 import de.rwth.idsg.steve.repository.TaskStore;
 import de.rwth.idsg.steve.service.OcppOperationsService;
+import de.rwth.idsg.steve.utils.Helpers;
 import de.rwth.idsg.steve.utils.OcppJsonChargePoint;
 import de.rwth.idsg.steve.utils.__DatabasePreparer__;
 import de.rwth.idsg.steve.web.dto.ocpp.ExtendedTriggerMessageParams;
@@ -89,17 +91,13 @@ public class Ocpp16JsonCsmsCertification_TLS_IT extends AbstractOcpp16JsonCsms {
         Security.addProvider(new BouncyCastleProvider());
     }
 
-    private static final String SECURE_PATH = "wss://localhost:8443/steve/websocket/CentralSystemService/";
-
     @Autowired
     private DSLContext dslContext;
     @Autowired
     private PasswordEncoder passwordEncoder;
     @Autowired
     private OcppOperationsService operationsService;
     @Autowired
-    private ServerProperties serverProperties;
-    @Autowired
     private TaskStore taskStore;
 
     private __DatabasePreparer__ databasePreparer;
@@ -407,7 +405,7 @@ private static Path saveCertsToTempFile(List<X509Certificate> certs, CsrMaterial
         return p12Path;
     }
 
-    private static OcppJsonChargePoint defaultSecureStation() {
-        return new OcppJsonChargePoint(OcppVersion.V_16, REGISTERED_CHARGE_BOX_ID, SECURE_PATH);
+    private OcppJsonChargePoint defaultSecureStation() {
+        return new OcppJsonChargePoint(OcppVersion.V_16, REGISTERED_CHARGE_BOX_ID, Helpers.getJsonPath(serverProperties));
     }
 }

src/test/java/de/rwth/idsg/steve/utils/Helpers.java

@@ -19,6 +19,7 @@
 package de.rwth.idsg.steve.utils;
 
 import de.rwth.idsg.steve.config.SteveProperties;
+import de.rwth.idsg.steve.config.WebSocketConfiguration;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 import org.apache.cxf.ws.addressing.WSAddressingFeature;
 import org.springframework.boot.web.server.autoconfigure.ServerProperties;
@@ -81,7 +82,7 @@ public static String getJsonPath(ServerProperties serverProperties) {
                + ":"
                + serverProperties.getPort()
                + serverProperties.getServlet().getContextPath()
-               + "/websocket/CentralSystemService/";
+               + WebSocketConfiguration.PATH_INFIX;
     }
 
     public static ocpp.cs._2015._10.CentralSystemService getForOcpp16(String path) {