1 files changed, 65 insertions, 20 deletions

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 a0a6d12cb9..95adef3a8c 100644
--- 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
@@ -16,22 +16,43 @@
 
 package org.openecomp.sdc.translator;
 
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.NotDirectoryException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.junit.Assert;
-import org.openecomp.core.translator.api.HeatToToscaTranslator;
-import org.openecomp.core.utilities.file.FileUtils;
-import org.openecomp.sdc.common.utils.SdcCommon;
-import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
 import org.onap.sdc.tosca.datatypes.model.GroupDefinition;
 import org.onap.sdc.tosca.datatypes.model.NodeTemplate;
 import org.onap.sdc.tosca.datatypes.model.RequirementAssignment;
 import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
 import org.onap.sdc.tosca.datatypes.model.TopologyTemplate;
+import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil;
+import org.openecomp.core.translator.api.HeatToToscaTranslator;
+import org.openecomp.core.utilities.file.FileUtils;
+import org.openecomp.sdc.common.utils.SdcCommon;
+import org.openecomp.sdc.datatypes.error.ErrorMessage;
+import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
 import org.openecomp.sdc.tosca.services.DataModelUtil;
 import org.openecomp.sdc.tosca.services.ToscaConstants;
-import org.onap.sdc.tosca.services.ToscaExtensionYamlUtil;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ComputeConsolidationData;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ComputeTemplateConsolidationData;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ConsolidationData;
@@ -48,21 +69,6 @@ import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolida
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.TypeComputeConsolidationData;
 import org.openecomp.sdc.translator.services.heattotosca.globaltypes.GlobalTypesGenerator;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.NotDirectoryException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-
 public class TestUtils {
   private static final String MANIFEST_NAME = SdcCommon.MANIFEST_NAME;
   private static String zipFilename = "VSP.zip";
@@ -675,4 +681,43 @@ public class TestUtils {
     return initServiceTemplate;
   }
 
+  public static void compareTranslatedOutput(Set<String> expectedResultFileNameSet,
+                                      Map<String, byte[]> expectedResultMap,
+                                      ZipInputStream zis) throws IOException {
+    ZipEntry entry;
+    String name;
+    String expected;
+    String actual;
+
+    while ((entry = zis.getNextEntry()) != null) {
+
+      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", "");
+        assertEquals("difference in file: " + name, expected, actual);
+
+        expectedResultFileNameSet.remove(name);
+      }
+    }
+    if (expectedResultFileNameSet.isEmpty()) {
+      expectedResultFileNameSet.forEach(System.out::println);
+    }
+  }
+
+  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())
+            .append(getErrorList(errorList)));
+
+    return sb.toString();
+  }
+
+  private static String getErrorList(List<ErrorMessage> errors) {
+    StringBuilder sb = new StringBuilder();
+    errors.forEach(error -> sb.append(error.getMessage()).append("[").append(error.getLevel()).append("]")
+            .append(System.lineSeparator()));
+    return sb.toString();
+  }
 }