aboutsummaryrefslogtreecommitdiff
path: root/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java
diff options
context:
space:
mode:
authorChristof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>2019-06-26 08:47:58 +0200
committerChristof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>2019-06-26 08:47:58 +0200
commite2e77ed55687cb92c6f5a273995daf64dedef848 (patch)
treec5955745715a513d2875fcd348a5d50d964c9b72 /src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java
parent97aadc426ca2f61dccd58a05f37d065b2752ef6d (diff)
downloadmoa-zs-e2e77ed55687cb92c6f5a273995daf64dedef848.tar.gz
moa-zs-e2e77ed55687cb92c6f5a273995daf64dedef848.tar.bz2
moa-zs-e2e77ed55687cb92c6f5a273995daf64dedef848.zip
Protect MsgClient via SSL (ink Client Authentication)
- Add Component to create SSLContexts with own Key- and trust store. - Inject SSLContext into HTTP Client. - Add EAAF-Components Core Dependency, which is needed by SSLContextCreator (KeyStoreUtils). Schema Changes in mzs:DeliveryRequest/Config: - Got Rid of mzs:DeliveryRequest/Config/Server. In mzs 1.4.1, Server replaces the result of zkopf query person request. Since this zkopf interface does not exist anymore, Server was removed. - Add ClientType, which holds all parameters needed to connect to a service (Url, SSL params, a.o.). Configuration: - Add default parameters for SSL Clients in application.yaml. - Merge default parameters into incoming mzs:DeliveryRequests. MoaZSException Fixes: - Remove "Extends throwable" from Builder. - Add convenient shorthand init method (message, throwable). Refactor: - Put "determinePath" to FileUtils. - Put string related utility functions into StringUtils.
Diffstat (limited to 'src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java')
-rw-r--r--src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java29
1 files changed, 23 insertions, 6 deletions
diff --git a/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java b/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java
index c389b61..4bd64ef 100644
--- a/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java
+++ b/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java
@@ -4,19 +4,36 @@ import at.gv.egiz.moazs.preprocess.ConfigUtil;
import at.gv.egiz.moazs.preprocess.DeliveryRequestAugmenter;
import at.gv.zustellung.app2mzs.xsd.ConfigType;
import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType;
+import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.Map;
+import static at.gv.zustellung.app2mzs.xsd.ClientType.clientTypeBuilder;
import static at.gv.zustellung.app2mzs.xsd.ConfigType.configTypeBuilder;
import static at.gv.zustellung.app2mzs.xsd.DeliveryRequestType.deliveryRequestTypeBuilder;
-import static at.gv.zustellung.app2mzs.xsd.ServerType.serverTypeBuilder;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public class DeliveryRequestAugmenterTest {
private final String msgUrl = "http://mzs";
+ @Mock
+ private ConfigUtil configUtil;
+
+ @Before
+ public void setupMock() {
+ when(configUtil.isComplete(Mockito.any())).thenReturn(true);
+ when(configUtil.merge(any(), any())).thenCallRealMethod();
+ }
+
@Test
public void augmentPrimaryWithoutConfig() {
var fallback = createConfig(msgUrl, false);
@@ -88,11 +105,11 @@ public class DeliveryRequestAugmenterTest {
}
private DeliveryRequestAugmenter createAugmenter(ConfigType fallback) {
- return new DeliveryRequestAugmenter(Map.of("default", fallback), new ConfigUtil());
+ return new DeliveryRequestAugmenter(Map.of("default", fallback), configUtil);
}
private DeliveryRequestAugmenter createAugmenter(Map<String, ConfigType> profiles) {
- return new DeliveryRequestAugmenter(profiles, new ConfigUtil());
+ return new DeliveryRequestAugmenter(profiles, configUtil);
}
private ConfigType createConfig(String url, Boolean performTnvz) {
@@ -101,12 +118,12 @@ public class DeliveryRequestAugmenterTest {
private ConfigType createConfig(String url, Boolean performTnvz, String profileId) {
- var server = serverTypeBuilder()
- .withZUSEUrlID(url)
+ var msgClient = clientTypeBuilder()
+ .withURL(url)
.build();
return configTypeBuilder()
- .withServer(server)
+ .withMSGClient(msgClient)
.withPerformQueryPersonRequest(performTnvz)
.withProfileID(profileId)
.build();