Skip to content

Commit 4067975

Browse files
committed
fix ArchiveEntryExtractorTest under windows
1 parent ab54162 commit 4067975

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/util/ArchiveEntryExtractorTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
package org.cloudfoundry.multiapps.controller.process.util;
22

3+
import java.io.IOException;
4+
import java.io.InputStream;
5+
import java.util.Arrays;
6+
import java.util.UUID;
7+
import java.util.stream.Stream;
8+
39
import org.apache.commons.io.input.BoundedInputStream;
410
import org.cloudfoundry.multiapps.common.ContentException;
511
import org.cloudfoundry.multiapps.controller.persistence.services.FileContentConsumer;
@@ -13,12 +19,6 @@
1319
import org.mockito.Mock;
1420
import org.mockito.MockitoAnnotations;
1521

16-
import java.io.IOException;
17-
import java.io.InputStream;
18-
import java.util.Arrays;
19-
import java.util.UUID;
20-
import java.util.stream.Stream;
21-
2222
import static org.junit.jupiter.api.Assertions.assertEquals;
2323
import static org.junit.jupiter.api.Assertions.assertThrows;
2424
import static org.mockito.ArgumentMatchers.any;
@@ -93,7 +93,7 @@ private FileEntryProperties buildFileEntryProperty(long maxFileSizeInBytes) {
9393
private void assertDeploymentDescriptorAreEqual(String actualDeploymentDescriptor) throws IOException {
9494
String expectedDeploymentDescriptor = new String(getClass().getResourceAsStream("expected-mtad.yaml")
9595
.readAllBytes());
96-
assertEquals(expectedDeploymentDescriptor, actualDeploymentDescriptor);
96+
assertEquals(expectedDeploymentDescriptor.replace("\r", ""), actualDeploymentDescriptor.replace("\r", ""));
9797
}
9898

9999
static Stream<Arguments> processFileEntryBytes() {

0 commit comments

Comments
 (0)