Upgrade Vulnerable Direct Dependencies [snakeyaml]
[sdc.git] / openecomp-be / lib / openecomp-sdc-enrichment-lib / openecomp-sdc-enrichment-impl / src / test / java / org / openecomp / sdc / enrichment / impl / tosca / BaseToscaEnrichmentTest.java
index a34f691..cf9ec3c 100644 (file)
@@ -174,8 +174,8 @@ public class BaseToscaEnrichmentTest {
                 name = entry.getName()
                         .substring(entry.getName().lastIndexOf(File.separator) + 1, entry.getName().length());
                 if (expectedResultFileNameSet.contains(name)) {
-                    expected = new String(expectedResultMap.get(name)).trim().replace("\r", "");
-                    actual = new String(FileUtils.toByteArray(zis)).trim().replace("\r", "");
+                    expected = sanitize(new String(expectedResultMap.get(name)));
+                    actual = sanitize(new String(FileUtils.toByteArray(zis)));
                     assertEquals("difference in file: " + name, expected, actual);
 
                     expectedResultFileNameSet.remove(name);
@@ -187,4 +187,8 @@ public class BaseToscaEnrichmentTest {
         }
         assertEquals(0, expectedResultFileNameSet.size());
     }
+
+    private static String sanitize(String s) {
+        return s.trim().replaceAll("\n", "").replaceAll("\r", "").replaceAll("\\s{2,}", " ").trim();
+    }
 }