aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/test/java
diff options
context:
space:
mode:
authornoahs <noah.shogan@gmail.com>2017-12-06 13:11:38 +0200
committernoahs <noah.shogan@amdocs.com>2017-12-06 17:38:57 +0200
commitf9f112f5fd5b193e79e38442cc566b7b437f87d2 (patch)
tree01a1ef7f840cbacb5ed465095926d14e83a7fd27 /openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/test/java
parent0566f581c0f310384f42838c388f57234ed1d60e (diff)
Duplicate logging frameworks merging
There was two copies of the SDC logging framework Change-Id: I55c94c9817a83162c6d90e504dfd91e4858c7269 Issue-ID: SDC-703 Signed-off-by: noahs <noah.shogan@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/test/java')
-rw-r--r--openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/test/java/org/openecomp/sdc/healing/healers/util/TestUtil.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/test/java/org/openecomp/sdc/healing/healers/util/TestUtil.java b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/test/java/org/openecomp/sdc/healing/healers/util/TestUtil.java
index 20ba5ebf19..da44ec422f 100644
--- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/test/java/org/openecomp/sdc/healing/healers/util/TestUtil.java
+++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/test/java/org/openecomp/sdc/healing/healers/util/TestUtil.java
@@ -1,5 +1,6 @@
package org.openecomp.sdc.healing.healers.util;
+import org.junit.Assert;
import org.openecomp.core.utilities.json.JsonUtil;
import org.openecomp.sdc.logging.api.Logger;
import org.openecomp.sdc.logging.api.LoggerFactory;
@@ -7,7 +8,6 @@ import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil;
import org.openecomp.sdc.tosca.services.ToscaUtil;
-import org.springframework.util.Assert;
import java.io.File;
import java.io.FileInputStream;
@@ -98,8 +98,7 @@ public class TestUtil {
ServiceTemplate actualServiceTemplate =
actualServiceTemplates.get(serviceTemplateName);
- Assert.notNull(actualServiceTemplate,
- "Missing service template in service model : " + serviceTemplateName);
+ Assert.assertNotNull("Missing service template in service model : " + serviceTemplateName, actualServiceTemplate);
org.junit.Assert.assertEquals("Difference in file " + serviceTemplateName,
JsonUtil.object2Json(expectedServiceTemplateEntry.getValue()),
JsonUtil.object2Json(actualServiceTemplate));