Merge pull request 'KOP-2850 Add new client certificate and truststore' (#22)...

Merge pull request 'KOP-2850 Add new client certificate and truststore' (#22) from KOP-2850-Dev-Deployment-und-Docker-compose-Tests into main

Reviewed-on: https://git.ozg-sh.de/ozgcloud-lib/xta-client-lib/pulls/22

src/test/java/de/ozgcloud/xta/client/extension/XtaTestServerSetupExtension.java

@@ -24,12 +24,12 @@ import lombok.extern.slf4j.Slf4j;
 public class XtaTestServerSetupExtension implements BeforeAllCallback, AfterAllCallback {
 
 	private static final DockerImageName XTA_TEST_SERVER_IMAGE = DockerImageName.parse("docker.ozg-sh.de/xta-test-server")
-			.withTag("1.6.0");
+			.withTag("release-1.7.0");
 
-	private static final String JOHN_SMITH_KEYSTORE_PATH = "store/john-smith-client-cert-keystore.p12";
-	private static final String JOHN_SMITH_KEYSTORE_PASSWORD = "password";
+	private static final String XTA_TEST_CLIENT_KEYSTORE_PATH = "store/xta-test-client-john-smith_keystore.p12";
+	private static final String XTA_TEST_CLIENT_KEYSTORE_PASSWORD = "password";
 
-	private static final String XTA_TEST_SERVER_TRUSTSTORE_PATH = "store/xta-test-server-truststore.jks";
+	private static final String XTA_TEST_SERVER_TRUSTSTORE_PATH = "store/xta-test_truststore.jks";
 	private static final String XTA_TEST_SERVER_TRUSTSTORE_PASSWORD = "password";
 
 	private XtaClient silentTestClient;
@@ -52,9 +52,9 @@ public class XtaTestServerSetupExtension implements BeforeAllCallback, AfterAllC
 	@SneakyThrows
 	private void setupClient() {
 		clientCertKeyStore = XtaClientConfig.KeyStore.builder()
-				.content(readBytesFromResource(JOHN_SMITH_KEYSTORE_PATH))
+				.content(readBytesFromResource(XTA_TEST_CLIENT_KEYSTORE_PATH))
 				.type("PKCS12")
-				.password(JOHN_SMITH_KEYSTORE_PASSWORD.toCharArray())
+				.password(XTA_TEST_CLIENT_KEYSTORE_PASSWORD.toCharArray())
 				.build();
 		trustStore = XtaClientConfig.KeyStore.builder()
 				.content(readBytesFromResource(XTA_TEST_SERVER_TRUSTSTORE_PATH))
@@ -69,7 +69,8 @@ public class XtaTestServerSetupExtension implements BeforeAllCallback, AfterAllC
 	}
 
 	private void setupServer() {
-		xtaServerContainer = new XtaTestServerContainer(XTA_TEST_SERVER_IMAGE);
+		xtaServerContainer = new XtaTestServerContainer(XTA_TEST_SERVER_IMAGE)
+				.withLogConsumer(outputFrame -> log.info(outputFrame.getUtf8String().strip()));
 
 		xtaServerContainer.start();
 	}