diff options
author | vempo <vitaliy.emporopulo@amdocs.com> | 2018-01-30 21:28:35 +0200 |
---|---|---|
committer | Avi Gaffa <avi.gaffa@amdocs.com> | 2018-02-01 08:20:11 +0000 |
commit | ab88e0fdb4250730588bea07f357c4fd721f1425 (patch) | |
tree | 6ef13d6e7ebdda54a5fec6669f41e66b2f4b9e27 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java | |
parent | 162f50777e13eebe3b27ec8364ee892be628f7b0 (diff) |
Removed log constants from translator core
Removed constants associated with audit/metrics logging from
the business code. Some safe cleanup and refactoring.
Change-Id: I95d0fd3e72baf0fe4991f400bfd1bae6eba8009b
Issue-ID: SDC-772
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java')
2 files changed, 4 insertions, 11 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java index 10c40282ed..f5e1ebbe76 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java @@ -35,9 +35,6 @@ import org.openecomp.sdc.common.errors.ErrorCode; import org.openecomp.sdc.common.togglz.ToggleableFeature; import org.openecomp.sdc.datatypes.error.ErrorLevel; import org.openecomp.sdc.datatypes.error.ErrorMessage; -import org.openecomp.sdc.logging.types.LoggerConstants; -import org.openecomp.sdc.logging.types.LoggerErrorCode; -import org.openecomp.sdc.logging.types.LoggerTragetServiceName; import org.openecomp.sdc.tosca.services.ToscaFileOutputService; import org.openecomp.sdc.tosca.services.impl.ToscaFileOutputServiceCsarImpl; import org.openecomp.sdc.translator.TestUtils; diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java index 463c238b20..126c38833a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java @@ -39,9 +39,6 @@ import org.openecomp.sdc.datatypes.error.ErrorMessage; import org.openecomp.sdc.heat.datatypes.manifest.FileData; import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent; import org.openecomp.sdc.heat.datatypes.manifest.ManifestFile; -import org.openecomp.sdc.logging.types.LoggerConstants; -import org.openecomp.sdc.logging.types.LoggerErrorCode; -import org.openecomp.sdc.logging.types.LoggerTragetServiceName; import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; import org.openecomp.sdc.tosca.services.ToscaFileOutputService; import org.openecomp.sdc.tosca.services.impl.ToscaFileOutputServiceCsarImpl; @@ -100,9 +97,6 @@ public class BaseResourceTranslationTest { private Map<String, byte[]> expectedResultMap = new HashMap<>(); private Set<String> expectedResultFileNameSet = new HashSet<>(); - private final String MANIFEST_NAME = SdcCommon.MANIFEST_NAME; - private String validationFilename = "validationOutput.json"; - protected static TestFeatureManager manager; @BeforeClass @@ -229,9 +223,11 @@ public class BaseResourceTranslationTest { fileContent = FileUtils.toByteArray(fis); + String MANIFEST_NAME = SdcCommon.MANIFEST_NAME; if (file.getName().equals(MANIFEST_NAME)) { addManifest(translationContext, MANIFEST_NAME, fileContent); } else { + String validationFilename = "validationOutput.json"; if (!file.getName().equals(zipFilename) && (!file.getName().equals(validationFilename))) { addFile(translationContext, file.getName(), fileContent); } @@ -257,8 +253,8 @@ public class BaseResourceTranslationTest { translationContext.addFile(name, content); } - private static void addFilesFromManifestToTranslationContextManifestFilesMap(TranslationContext - translationContext, List<FileData> fileDataListFromManifest) { + private static void addFilesFromManifestToTranslationContextManifestFilesMap(TranslationContext translationContext, List<FileData> fileDataListFromManifest) { + for (FileData fileFromManfiest : fileDataListFromManifest) { translationContext.addManifestFile(fileFromManfiest.getFile(), fileFromManfiest.getType()); } |