Upgrade Vulnerable Direct Dependencies [snakeyaml]

[sdc.git] / openecomp-be / lib / openecomp-sdc-translator-lib / openecomp-sdc-translator-core / src / test / java / org / openecomp / sdc / translator / TestUtils.java

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java
index 703fa0d..f65b0bb 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java
@@ -695,10 +695,10 @@ public class TestUtils {
     while ((entry = zis.getNextEntry()) != null) {
 
       name = entry.getName()
-              .substring(entry.getName().lastIndexOf(File.separator) + 1, entry.getName().length());
+              .substring(entry.getName().lastIndexOf(File.separator) + 1);
       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);
@@ -709,6 +709,10 @@ public class TestUtils {
     }
   }
 
+  private static String sanitize(String s) {
+    return s.trim().replaceAll("\n", "").replaceAll("\r", "").replaceAll("\\s{2,}", " ").trim();
+  }
+
   public static String getErrorAsString(Map<String, List<ErrorMessage>> errorMessages) {
     StringBuilder sb = new StringBuilder();
     errorMessages.forEach((file, errorList) -> sb.append("File:").append(file).append(System.lineSeparator())