diff --git a/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/util/ArchiveEntryExtractorTest.java b/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/util/ArchiveEntryExtractorTest.java index 746b0808a6..dde1871106 100644 --- a/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/util/ArchiveEntryExtractorTest.java +++ b/multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/util/ArchiveEntryExtractorTest.java @@ -1,5 +1,11 @@ package org.cloudfoundry.multiapps.controller.process.util; +import java.io.IOException; +import java.io.InputStream; +import java.util.Arrays; +import java.util.UUID; +import java.util.stream.Stream; + import org.apache.commons.io.input.BoundedInputStream; import org.cloudfoundry.multiapps.common.ContentException; import org.cloudfoundry.multiapps.controller.persistence.services.FileContentConsumer; @@ -13,12 +19,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; -import java.util.UUID; -import java.util.stream.Stream; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; @@ -93,7 +93,7 @@ private FileEntryProperties buildFileEntryProperty(long maxFileSizeInBytes) { private void assertDeploymentDescriptorAreEqual(String actualDeploymentDescriptor) throws IOException { String expectedDeploymentDescriptor = new String(getClass().getResourceAsStream("expected-mtad.yaml") .readAllBytes()); - assertEquals(expectedDeploymentDescriptor, actualDeploymentDescriptor); + assertEquals(expectedDeploymentDescriptor.replace("\r", ""), actualDeploymentDescriptor.replace("\r", "")); } static Stream processFileEntryBytes() {