aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pom.xml9
-rw-r--r--src/test/java/at/gv/egiz/moazs/ITSSLMsgClientTest.java (renamed from src/test/java/at/gv/egiz/moazs/ITMsgClientTest.java)8
-rw-r--r--src/test/resources/at/gv/egiz/moazs/ITSSLMsgClientTest/validDeliveryRequest.xml (renamed from src/test/resources/at/gv/egiz/moazs/ITMsgClientTest/validDeliveryRequest.xml)0
3 files changed, 12 insertions, 5 deletions
diff --git a/pom.xml b/pom.xml
index 775c262..62a5bdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,13 @@
</properties>
</profile>
<profile>
- <id>integration-test</id>
+ <id>integration-tests</id>
+ <properties>
+ <exclude-test-pattern>**/ITSSL*Test.java</exclude-test-pattern>
+ </properties>
+ </profile>
+ <profile>
+ <id>all-tests</id>
<properties>
<exclude-test-pattern></exclude-test-pattern>
</properties>
@@ -156,6 +162,7 @@
</dependency>
</dependencies>
<build>
+ <finalName>moa-zs</finalName>
<plugins>
<!-- spring-boot-maven-plugin -->
<plugin>
diff --git a/src/test/java/at/gv/egiz/moazs/ITMsgClientTest.java b/src/test/java/at/gv/egiz/moazs/ITSSLMsgClientTest.java
index 0f87dd6..477375a 100644
--- a/src/test/java/at/gv/egiz/moazs/ITMsgClientTest.java
+++ b/src/test/java/at/gv/egiz/moazs/ITSSLMsgClientTest.java
@@ -27,10 +27,10 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringRunner.class)
@SpringBootTest
-public class ITMsgClientTest {
+public class ITSSLMsgClientTest {
private static final Object VALID_MZS_REQUEST_ID = "valid-delivery-request-id" ;
- private final String basePath = "src/test/resources/at/gv/egiz/moazs/ITMsgClientTest/";
+ private final String basePath = "src/test/resources/at/gv/egiz/moazs/ITSSLMsgClientTest/";
@Autowired
private Marshaller msgMarshaller;
@@ -142,7 +142,7 @@ public class ITMsgClientTest {
private ClientType generateSSLClientParams(String httpsServiceURL, boolean trustAll, boolean laxHostNameVerification, KeyStoreType truststore) {
var keystore = keyStoreTypeBuilder()
- .withFileName("ssl/client.cert.key.p12")
+ .withFileName("config/ssl/client.cert.key.p12")
.withFileType("PKCS12")
.withPassword("123456")
.build();
@@ -165,7 +165,7 @@ public class ITMsgClientTest {
private KeyStoreType generateTrustLocalhostStore() {
return keyStoreTypeBuilder()
- .withFileName("ssl/truststore.jks")
+ .withFileName("config/ssl/truststore.jks")
.withPassword("123456")
.withFileType("JKS")
.build();
diff --git a/src/test/resources/at/gv/egiz/moazs/ITMsgClientTest/validDeliveryRequest.xml b/src/test/resources/at/gv/egiz/moazs/ITSSLMsgClientTest/validDeliveryRequest.xml
index f1879eb..f1879eb 100644
--- a/src/test/resources/at/gv/egiz/moazs/ITMsgClientTest/validDeliveryRequest.xml
+++ b/src/test/resources/at/gv/egiz/moazs/ITSSLMsgClientTest/validDeliveryRequest.xml