From 844a2b592524a5165d36710d0af09c0ffac13182 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Thu, 5 Sep 2024 17:40:29 +0200
Subject: [PATCH] OZG-6239 Move test factories
---
.../app/data/XtaMessageRepositoryTest.java | 6 +++---
.../PartyTypeTestFactory.java | 2 +-
.../factory}/XtaCloseRequestTestFactory.java | 2 +-
.../XtaFileTestFactory.java | 11 +++++------
.../XtaLookupServiceRequestTestFactory.java | 2 +-
.../XtaMessageTestFactory.java | 3 +--
.../test/app/mapper/RequestMapperTest.java | 1 +
.../test/app/mapper/ResponseMapperTest.java | 5 ++++-
.../test/app/service/TempFileTestFactory.java | 19 -------------------
.../app/service/XtaMessageServiceTest.java | 5 +++--
10 files changed, 20 insertions(+), 36 deletions(-)
rename src/test/java/de/ozgcloud/xta/test/app/{mapper => factory}/PartyTypeTestFactory.java (92%)
rename src/{main/java/de/ozgcloud/xta/test/app/service => test/java/de/ozgcloud/xta/test/app/factory}/XtaCloseRequestTestFactory.java (92%)
rename src/test/java/de/ozgcloud/xta/test/app/{mapper => factory}/XtaFileTestFactory.java (58%)
rename src/test/java/de/ozgcloud/xta/test/app/{mapper => factory}/XtaLookupServiceRequestTestFactory.java (94%)
rename src/test/java/de/ozgcloud/xta/test/app/{mapper => factory}/XtaMessageTestFactory.java (88%)
delete mode 100644 src/test/java/de/ozgcloud/xta/test/app/service/TempFileTestFactory.java
diff --git a/src/test/java/de/ozgcloud/xta/test/app/data/XtaMessageRepositoryTest.java b/src/test/java/de/ozgcloud/xta/test/app/data/XtaMessageRepositoryTest.java
index c50e7b5..699a86d 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/data/XtaMessageRepositoryTest.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/data/XtaMessageRepositoryTest.java
@@ -1,7 +1,7 @@
package de.ozgcloud.xta.test.app.data;
import static de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory.*;
-import static de.ozgcloud.xta.test.app.mapper.XtaMessageTestFactory.*;
+import static de.ozgcloud.xta.test.app.factory.XtaMessageTestFactory.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -18,8 +18,8 @@ import org.mockito.InjectMocks;
import org.mockito.Spy;
import de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory;
-import de.ozgcloud.xta.test.app.mapper.XtaFileTestFactory;
-import de.ozgcloud.xta.test.app.mapper.XtaMessageTestFactory;
+import de.ozgcloud.xta.test.app.factory.XtaFileTestFactory;
+import de.ozgcloud.xta.test.app.factory.XtaMessageTestFactory;
import de.ozgcloud.xta.test.app.model.Identifier;
import de.ozgcloud.xta.test.app.model.XtaFile;
import de.ozgcloud.xta.test.app.model.XtaMessage;
diff --git a/src/test/java/de/ozgcloud/xta/test/app/mapper/PartyTypeTestFactory.java b/src/test/java/de/ozgcloud/xta/test/app/factory/PartyTypeTestFactory.java
similarity index 92%
rename from src/test/java/de/ozgcloud/xta/test/app/mapper/PartyTypeTestFactory.java
rename to src/test/java/de/ozgcloud/xta/test/app/factory/PartyTypeTestFactory.java
index f8c9682..78e2af6 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/mapper/PartyTypeTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/factory/PartyTypeTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.xta.test.app.mapper;
+package de.ozgcloud.xta.test.app.factory;
import static de.ozgcloud.xta.test.app.factory.MessageMetaDataTestFactory.*;
diff --git a/src/main/java/de/ozgcloud/xta/test/app/service/XtaCloseRequestTestFactory.java b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaCloseRequestTestFactory.java
similarity index 92%
rename from src/main/java/de/ozgcloud/xta/test/app/service/XtaCloseRequestTestFactory.java
rename to src/test/java/de/ozgcloud/xta/test/app/factory/XtaCloseRequestTestFactory.java
index cdb7194..01815f0 100644
--- a/src/main/java/de/ozgcloud/xta/test/app/service/XtaCloseRequestTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaCloseRequestTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.xta.test.app.service;
+package de.ozgcloud.xta.test.app.factory;
import de.ozgcloud.xta.test.app.model.XtaCloseRequest;
diff --git a/src/test/java/de/ozgcloud/xta/test/app/mapper/XtaFileTestFactory.java b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaFileTestFactory.java
similarity index 58%
rename from src/test/java/de/ozgcloud/xta/test/app/mapper/XtaFileTestFactory.java
rename to src/test/java/de/ozgcloud/xta/test/app/factory/XtaFileTestFactory.java
index fca7978..0e89e8e 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/mapper/XtaFileTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaFileTestFactory.java
@@ -1,21 +1,20 @@
-package de.ozgcloud.xta.test.app.mapper;
+package de.ozgcloud.xta.test.app.factory;
import java.io.File;
import java.math.BigInteger;
import de.ozgcloud.xta.test.app.model.XtaFile;
-import de.ozgcloud.xta.test.app.service.TempFileTestFactory;
public class XtaFileTestFactory {
- static final String NAME = "Test_File";
- static final String XTA_CONTENT = "slkafj3jifsdasx";
- static final String ZIP_CONTENT_TYPE = "application/zip";
+ public static final String NAME = "Test_File";
+ public static final String XTA_CONTENT = "slkafj3jifsdasx";
+ public static final String ZIP_CONTENT_TYPE = "application/zip";
public static XtaFile create() {
return createBuilder().build();
}
- static XtaFile.XtaFileBuilder createBuilder() {
+ public static XtaFile.XtaFileBuilder createBuilder() {
File tfile = TempFileTestFactory.createFile(XTA_CONTENT);
return XtaFile.builder()
.name(NAME)
diff --git a/src/test/java/de/ozgcloud/xta/test/app/mapper/XtaLookupServiceRequestTestFactory.java b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaLookupServiceRequestTestFactory.java
similarity index 94%
rename from src/test/java/de/ozgcloud/xta/test/app/mapper/XtaLookupServiceRequestTestFactory.java
rename to src/test/java/de/ozgcloud/xta/test/app/factory/XtaLookupServiceRequestTestFactory.java
index 2c9e28a..1062e28 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/mapper/XtaLookupServiceRequestTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaLookupServiceRequestTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.xta.test.app.mapper;
+package de.ozgcloud.xta.test.app.factory;
import de.ozgcloud.xta.test.app.model.XtaLookupServiceRequest;
diff --git a/src/test/java/de/ozgcloud/xta/test/app/mapper/XtaMessageTestFactory.java b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaMessageTestFactory.java
similarity index 88%
rename from src/test/java/de/ozgcloud/xta/test/app/mapper/XtaMessageTestFactory.java
rename to src/test/java/de/ozgcloud/xta/test/app/factory/XtaMessageTestFactory.java
index 4033f3c..d1f6281 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/mapper/XtaMessageTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaMessageTestFactory.java
@@ -1,8 +1,7 @@
-package de.ozgcloud.xta.test.app.mapper;
+package de.ozgcloud.xta.test.app.factory;
import java.util.List;
-import de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory;
import de.ozgcloud.xta.test.app.model.XtaMessage;
public class XtaMessageTestFactory {
diff --git a/src/test/java/de/ozgcloud/xta/test/app/mapper/RequestMapperTest.java b/src/test/java/de/ozgcloud/xta/test/app/mapper/RequestMapperTest.java
index 5aedc39..8ecbd17 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/mapper/RequestMapperTest.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/mapper/RequestMapperTest.java
@@ -23,6 +23,7 @@ import de.ozgcloud.xta.test.app.factory.MessageMetaDataTestFactory;
import de.ozgcloud.xta.test.app.factory.MsgBoxCloseRequestTypeTestFactory;
import de.ozgcloud.xta.test.app.factory.MsgBoxFetchRequestTestFactory;
import de.ozgcloud.xta.test.app.factory.MsgBoxStatusListRequestTypeTestFactory;
+import de.ozgcloud.xta.test.app.factory.PartyTypeTestFactory;
import de.ozgcloud.xta.test.app.factory.QualifierTypeBusinessScenarioTestFactory;
import de.ozgcloud.xta.test.app.model.Identifier;
import de.ozgcloud.xta.test.app.model.XtaCloseRequest;
diff --git a/src/test/java/de/ozgcloud/xta/test/app/mapper/ResponseMapperTest.java b/src/test/java/de/ozgcloud/xta/test/app/mapper/ResponseMapperTest.java
index 2c8c4b1..d65f05c 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/mapper/ResponseMapperTest.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/mapper/ResponseMapperTest.java
@@ -6,7 +6,7 @@ import static de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory.MES
import static de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory.READER_IDENTIFIER;
import static de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory.*;
import static de.ozgcloud.xta.test.app.mapper.ResponseMapper.*;
-import static de.ozgcloud.xta.test.app.mapper.XtaLookupServiceRequestTestFactory.*;
+import static de.ozgcloud.xta.test.app.factory.XtaLookupServiceRequestTestFactory.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -21,7 +21,10 @@ import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers;
import org.mockito.Mock;
+import de.ozgcloud.xta.test.app.factory.XtaFileTestFactory;
+import de.ozgcloud.xta.test.app.factory.XtaLookupServiceRequestTestFactory;
import de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory;
+import de.ozgcloud.xta.test.app.factory.XtaMessageTestFactory;
import de.ozgcloud.xta.test.app.model.XtaFile;
import de.ozgcloud.xta.test.app.model.XtaMessageMetaDataListing;
import de.ozgcloud.xta.test.app.util.XtaId;
diff --git a/src/test/java/de/ozgcloud/xta/test/app/service/TempFileTestFactory.java b/src/test/java/de/ozgcloud/xta/test/app/service/TempFileTestFactory.java
deleted file mode 100644
index b2b5014..0000000
--- a/src/test/java/de/ozgcloud/xta/test/app/service/TempFileTestFactory.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.ozgcloud.xta.test.app.service;
-
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-
-import org.apache.commons.io.FileUtils;
-
-import lombok.SneakyThrows;
-
-public class TempFileTestFactory {
-
- @SneakyThrows
- public static File createFile(String content) {
- File tFile = File.createTempFile("test", "zip");
- tFile.deleteOnExit();
- FileUtils.write(tFile, content, StandardCharsets.UTF_8);
- return tFile;
- }
-}
diff --git a/src/test/java/de/ozgcloud/xta/test/app/service/XtaMessageServiceTest.java b/src/test/java/de/ozgcloud/xta/test/app/service/XtaMessageServiceTest.java
index 2af9db0..4841132 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/service/XtaMessageServiceTest.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/service/XtaMessageServiceTest.java
@@ -1,7 +1,7 @@
package de.ozgcloud.xta.test.app.service;
import static de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory.*;
-import static de.ozgcloud.xta.test.app.mapper.XtaMessageTestFactory.*;
+import static de.ozgcloud.xta.test.app.factory.XtaMessageTestFactory.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -21,7 +21,8 @@ import org.mockito.Mock;
import org.mockito.Spy;
import de.ozgcloud.xta.test.app.data.XtaMessageRepository;
-import de.ozgcloud.xta.test.app.mapper.XtaMessageTestFactory;
+import de.ozgcloud.xta.test.app.factory.XtaCloseRequestTestFactory;
+import de.ozgcloud.xta.test.app.factory.XtaMessageTestFactory;
import de.ozgcloud.xta.test.app.model.XtaGetMessageRequest;
import de.ozgcloud.xta.test.app.model.XtaMessage;
import de.ozgcloud.xta.test.app.model.XtaMessageMetaDataListing;
--
GitLab