File tree Expand file tree Collapse file tree 1 file changed +7
-7
lines changed
multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/util Expand file tree Collapse file tree 1 file changed +7
-7
lines changed Original file line number Diff line number Diff line change 11package 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+
39import org .apache .commons .io .input .BoundedInputStream ;
410import org .cloudfoundry .multiapps .common .ContentException ;
511import org .cloudfoundry .multiapps .controller .persistence .services .FileContentConsumer ;
1319import org .mockito .Mock ;
1420import 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-
2222import static org .junit .jupiter .api .Assertions .assertEquals ;
2323import static org .junit .jupiter .api .Assertions .assertThrows ;
2424import 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 () {
You can’t perform that action at this time.
0 commit comments