From f9f112f5fd5b193e79e38442cc566b7b437f87d2 Mon Sep 17 00:00:00 2001 From: noahs Date: Wed, 6 Dec 2017 13:11:38 +0200 Subject: Duplicate logging frameworks merging There was two copies of the SDC logging framework Change-Id: I55c94c9817a83162c6d90e504dfd91e4858c7269 Issue-ID: SDC-703 Signed-off-by: noahs --- .../test/java/org/openecomp/sdc/healing/healers/util/TestUtil.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-impl/src/test') 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)); -- cgit 1.2.3-korg