diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java')
1 files changed, 13 insertions, 9 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 f5e1ebbe76..8126d2967c 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 @@ -1,9 +1,6 @@ -/*- - * ============LICENSE_START======================================================= - * SDC - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ +/* + * Copyright © 2016-2017 European Support Limited + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,7 +12,6 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * ============LICENSE_END========================================================= */ package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation; @@ -66,17 +62,25 @@ public class BaseFullTranslationTest { protected static TestFeatureManager manager; @BeforeClass - public static void enableForwarderFeature(){ + public static void enableToggleableFeatures(){ manager = new TestFeatureManager(ToggleableFeature.class); if (!ToggleableFeature.FORWARDER_CAPABILITY.isActive()) { manager.enable(ToggleableFeature.FORWARDER_CAPABILITY); } + if (!ToggleableFeature.ANNOTATIONS.isActive()) { + manager.enable(ToggleableFeature.ANNOTATIONS); + } + if(!ToggleableFeature.VLAN_TAGGING.isActive()) { + manager.enable(ToggleableFeature.VLAN_TAGGING); + } } @AfterClass - public static void disableForwarderFeature() { + public static void disableToggleableFeatures() { manager.disable(ToggleableFeature.FORWARDER_CAPABILITY); + manager.disable(ToggleableFeature.ANNOTATIONS); + manager.disable(ToggleableFeature.VLAN_TAGGING); manager = null; TestFeatureManagerProvider.setFeatureManager(null); } |