aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-be')
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java14
-rw-r--r--openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java15
2 files changed, 4 insertions, 25 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 8126d2967c..19f4d59514 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
@@ -64,23 +64,13 @@ public class BaseFullTranslationTest {
@BeforeClass
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);
- }
+ manager.enableAll();
}
@AfterClass
public static void disableToggleableFeatures() {
- manager.disable(ToggleableFeature.FORWARDER_CAPABILITY);
- manager.disable(ToggleableFeature.ANNOTATIONS);
- manager.disable(ToggleableFeature.VLAN_TAGGING);
+ manager.disableAll();
manager = null;
TestFeatureManagerProvider.setFeatureManager(null);
}
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 4dc1612893..e784f94df9 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
@@ -98,23 +98,12 @@ public class BaseResourceTranslationTest {
@BeforeClass
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);
- }
-
+ manager.enableAll();
}
@AfterClass
public static void disableToggleableFeatures() {
- manager.disable(ToggleableFeature.FORWARDER_CAPABILITY);
- manager.disable(ToggleableFeature.ANNOTATIONS);
- manager.disable(ToggleableFeature.VLAN_TAGGING);
+ manager.disableAll();
manager = null;
TestFeatureManagerProvider.setFeatureManager(null);
}