diff options
| author | Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at> | 2019-08-21 15:17:49 +0200 |
|---|---|---|
| committer | Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at> | 2019-08-23 14:57:28 +0200 |
| commit | af9478800e5e9884e690c5a48dce2b68d7d348a2 (patch) | |
| tree | 2374231a72dab027ba728e4b13dec2c5a1fb6902 | |
| parent | 66d12f41b530a063dc17a4add8dc3f2f842f04f6 (diff) | |
| download | moa-zs-af9478800e5e9884e690c5a48dce2b68d7d348a2.tar.gz moa-zs-af9478800e5e9884e690c5a48dce2b68d7d348a2.tar.bz2 moa-zs-af9478800e5e9884e690c5a48dce2b68d7d348a2.zip | |
Remove SSL Depending Testcases from Integration Test Suite
- Reason: Now we can run integration tests without the need to set up
SSL reverse proxy with client certificates.
| -rw-r--r-- | pom.xml | 9 | ||||
| -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
@@ -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 |