OZG-4375 OZG-4716 CR

alfa-service/src/test/java/de/ozgcloud/alfa/common/file/OzgFileTestFactory.java

@@ -30,8 +30,7 @@ import de.ozgcloud.alfa.common.binaryfile.FileId;
 
 public class OzgFileTestFactory {
 
-	// See UUIDUtils.UUID_SPLIT_PATTERN
-	public static final FileId ID = FileId.from(UUID.randomUUID().toString().replace("-", ""));
+	public static final FileId ID = FileId.from(UUID.randomUUID().toString());
 	public static final String NAME = BinaryFileTestFactory.NAME;
 	public static final long SIZE = BinaryFileTestFactory.SIZE;
 	public static final String CONTENT_TYPE = BinaryFileTestFactory.CONTENT_TYPE;

alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/ExportServiceITCase.java

 package de.ozgcloud.alfa.export;
 
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.HexFormat;
 import java.util.List;
 import java.util.UUID;
 
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 
+import de.ozgcloud.alfa.common.binaryfile.FileId;
 import de.ozgcloud.alfa.common.file.OzgFile;
 import de.ozgcloud.alfa.common.file.OzgFileTestFactory;
 import de.ozgcloud.alfa.file.ExportFileService;
@@ -20,14 +26,11 @@ import de.ozgcloud.alfa.vorgang.VorgangWithEingangTestFactory;
 import de.ozgcloud.common.test.ITCase;
 
 @ITCase
-public class ExportServiceITCase {
-
-	private static final String VORGANG_ID = UUID.randomUUID().toString();
-	private static final String FILENAME_ID = UUID.randomUUID().toString();
+class ExportServiceITCase {
 
 	private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
 	private final VorgangWithEingang vorgangWithEingang = VorgangWithEingangTestFactory.create();
-	private final List<OzgFile> ozgFiles = List.of(OzgFileTestFactory.create());
+	private final List<OzgFile> ozgFiles = List.of(createOzgFile());
 
 	@SpyBean
 	private ExportFileService exportFileService;
@@ -36,6 +39,9 @@ public class ExportServiceITCase {
 	@Autowired
 	private ExportService exportService;
 
+	@Nested
+	class TestWriteExport {
+
 		@BeforeEach
 		void setup() {
 			doReturn(vorgangWithEingang).when(exportVorgangService).getVorgang(anyString());
@@ -45,6 +51,17 @@ public class ExportServiceITCase {
 
 		@Test
 		void shouldNotThrowException() {
-		exportService.writeExport(VORGANG_ID, FILENAME_ID, outputStream);
+			assertDoesNotThrow(() -> exportService.writeExport(UUID.randomUUID().toString(), UUID.randomUUID().toString(), outputStream));
+		}
+	}
+
+	private static OzgFile createOzgFile() {
+		return OzgFileTestFactory.createBuilder()
+				.id(FileId.from(createMongoDbObjectId()))
+				.build();
+	}
+
+	private static String createMongoDbObjectId() {
+		return HexFormat.of().formatHex(RandomStringUtils.randomAlphanumeric(24).getBytes(StandardCharsets.UTF_8));
 	}
 }