aboutsummaryrefslogtreecommitdiff
path: root/src/test/java/at/gv/egiz/moazs
diff options
context:
space:
mode:
authorChristof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>2019-07-03 15:27:14 +0200
committerChristof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>2019-07-03 15:27:14 +0200
commit78f0715d86a055aed11138df5f66b0794e72326a (patch)
tree4f5e16fea5740e25ee22e98e8940fa28365a2a93 /src/test/java/at/gv/egiz/moazs
parent8bcd9c265198e8d46e2ec862ca6e0cb47838bd7f (diff)
downloadmoa-zs-78f0715d86a055aed11138df5f66b0794e72326a.tar.gz
moa-zs-78f0715d86a055aed11138df5f66b0794e72326a.tar.bz2
moa-zs-78f0715d86a055aed11138df5f66b0794e72326a.zip
Refactor: Restructure Project
- Move components that depend on the service contracts into scheme package. - Move cxf related components into util package. - Rename SameThread to SingleThreaded.
Diffstat (limited to 'src/test/java/at/gv/egiz/moazs')
-rw-r--r--src/test/java/at/gv/egiz/moazs/ConfigProfileGeneratorTest.java4
-rw-r--r--src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java4
-rw-r--r--src/test/java/at/gv/egiz/moazs/ITMsgClientTest.java2
-rw-r--r--src/test/java/at/gv/egiz/moazs/SingleThreadedDeliveryPipelineTest.java (renamed from src/test/java/at/gv/egiz/moazs/SameThreadDeliveryPipelineTest.java)11
-rw-r--r--src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java2
5 files changed, 11 insertions, 12 deletions
diff --git a/src/test/java/at/gv/egiz/moazs/ConfigProfileGeneratorTest.java b/src/test/java/at/gv/egiz/moazs/ConfigProfileGeneratorTest.java
index 3157447..ff981a9 100644
--- a/src/test/java/at/gv/egiz/moazs/ConfigProfileGeneratorTest.java
+++ b/src/test/java/at/gv/egiz/moazs/ConfigProfileGeneratorTest.java
@@ -1,6 +1,6 @@
package at.gv.egiz.moazs;
-import at.gv.egiz.moazs.mzs.MzsValidator;
+import at.gv.egiz.moazs.scheme.MzsDeliveryRequestValidator;
import at.gv.egiz.moazs.preprocess.*;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -25,7 +25,7 @@ public class ConfigProfileGeneratorTest {
private ConfigUtil util;
@Mock
- private MzsValidator validator;
+ private MzsDeliveryRequestValidator validator;
@Mock
private SpringPropertiesFacade properties;
diff --git a/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java b/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java
index 424dce1..3bc0d3b 100644
--- a/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java
+++ b/src/test/java/at/gv/egiz/moazs/DeliveryRequestAugmenterTest.java
@@ -1,6 +1,6 @@
package at.gv.egiz.moazs;
-import at.gv.egiz.moazs.mzs.MzsValidator;
+import at.gv.egiz.moazs.scheme.MzsDeliveryRequestValidator;
import at.gv.egiz.moazs.preprocess.ConfigUtil;
import at.gv.egiz.moazs.preprocess.DeliveryRequestAugmenter;
import at.gv.zustellung.app2mzs.xsd.ConfigType;
@@ -29,7 +29,7 @@ public class DeliveryRequestAugmenterTest {
private ConfigUtil configUtil;
@Mock
- private MzsValidator validator;
+ private MzsDeliveryRequestValidator validator;
@Before
public void setupMock() {
diff --git a/src/test/java/at/gv/egiz/moazs/ITMsgClientTest.java b/src/test/java/at/gv/egiz/moazs/ITMsgClientTest.java
index bb9633e..70e300c 100644
--- a/src/test/java/at/gv/egiz/moazs/ITMsgClientTest.java
+++ b/src/test/java/at/gv/egiz/moazs/ITMsgClientTest.java
@@ -1,6 +1,6 @@
package at.gv.egiz.moazs;
-import at.gv.egiz.moazs.msg.ClientFactory;
+import at.gv.egiz.moazs.util.ClientFactory;
import at.gv.egiz.moazs.scheme.Marshaller;
import at.gv.zustellung.app2mzs.xsd.ClientType;
import at.gv.zustellung.app2mzs.xsd.KeyStoreType;
diff --git a/src/test/java/at/gv/egiz/moazs/SameThreadDeliveryPipelineTest.java b/src/test/java/at/gv/egiz/moazs/SingleThreadedDeliveryPipelineTest.java
index 74e6157..c08d567 100644
--- a/src/test/java/at/gv/egiz/moazs/SameThreadDeliveryPipelineTest.java
+++ b/src/test/java/at/gv/egiz/moazs/SingleThreadedDeliveryPipelineTest.java
@@ -1,12 +1,12 @@
package at.gv.egiz.moazs;
-import at.gv.egiz.moazs.msg.ClientFactory;
+import at.gv.egiz.moazs.util.ClientFactory;
import at.gv.egiz.moazs.pipeline.DeliveryPipeline;
-import at.gv.egiz.moazs.pipeline.SameThreadDeliveryPipeline;
+import at.gv.egiz.moazs.pipeline.SingleThreadedDeliveryPipeline;
import at.gv.egiz.moazs.repository.DeliveryRepository;
import at.gv.egiz.moazs.repository.InMemoryDeliveryRepository;
import at.gv.egiz.moazs.scheme.Mzs2MsgConverter;
-import at.gv.egiz.moazs.tnvz.TnvzHelper;
+import at.gv.egiz.moazs.scheme.TnvzHelper;
import at.gv.egiz.moazs.verify.MoaSPSSSignatureVerifier;
import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType;
import at.gv.zustellung.msg.xsd.App2ZusePort;
@@ -18,7 +18,6 @@ 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 static at.gv.egiz.moazs.MoaZSException.moaZSException;
@@ -35,7 +34,7 @@ import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.*;
@RunWith(MockitoJUnitRunner.class)
-public class SameThreadDeliveryPipelineTest {
+public class SingleThreadedDeliveryPipelineTest {
private DeliveryRepository repository = new InMemoryDeliveryRepository();
@@ -62,7 +61,7 @@ public class SameThreadDeliveryPipelineTest {
@Before
public void setup() {
- pipeline = new SameThreadDeliveryPipeline(repository, tnvzHelper, converter, clientFactory, verifier);
+ pipeline = new SingleThreadedDeliveryPipeline(repository, tnvzHelper, converter, clientFactory, verifier);
}
@Test
diff --git a/src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java b/src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java
index 4425297..66873d4 100644
--- a/src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java
+++ b/src/test/java/at/gv/egiz/moazs/TnvzHelperTest.java
@@ -2,7 +2,7 @@ package at.gv.egiz.moazs;
import at.gv.egiz.moazs.scheme.Mzs2MsgConverter;
-import at.gv.egiz.moazs.tnvz.TnvzHelper;
+import at.gv.egiz.moazs.scheme.TnvzHelper;
import at.gv.zustellung.app2mzs.xsd.DeliveryRequestType;
import at.gv.zustellung.app2mzs.xsd.persondata.IdentificationType;
import at.gv.zustellung.tnvz.xsd.MimeTypeList;