diff options
38 files changed, 5 insertions, 210 deletions
diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/AddComponentInstancesArtifactsInCsar.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/AddComponentInstancesArtifactsInCsar.java index 439cfa67a7..9b9ef18d9d 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/AddComponentInstancesArtifactsInCsar.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/AddComponentInstancesArtifactsInCsar.java @@ -332,9 +332,4 @@ public class AddComponentInstancesArtifactsInCsar extends SetupCDTest { return ElementFactory.getArtifactByType("ci", artifactType.get(random.nextInt(artifactType.size())), true, false); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/ImportUpdateInformationalDeploymentArtifacts.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/ImportUpdateInformationalDeploymentArtifacts.java index 11a3a8e062..9b5669f79b 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/ImportUpdateInformationalDeploymentArtifacts.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/ImportUpdateInformationalDeploymentArtifacts.java @@ -219,9 +219,4 @@ public class ImportUpdateInformationalDeploymentArtifacts extends SetupCDTest { } } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/Inputs.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/Inputs.java index f340043eb5..650f9f4598 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/Inputs.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/Inputs.java @@ -205,10 +205,4 @@ public class Inputs extends SetupCDTest { return normalizedName; } - - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/MIBsArtifactsOnResourceInstance.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/MIBsArtifactsOnResourceInstance.java index f2b743a5a8..05972b7e95 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/MIBsArtifactsOnResourceInstance.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/MIBsArtifactsOnResourceInstance.java @@ -258,10 +258,4 @@ public class MIBsArtifactsOnResourceInstance extends SetupCDTest { } } - - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/NewArtifactTypeGuide.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/NewArtifactTypeGuide.java index 61ac2347b2..2069e5c7c5 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/NewArtifactTypeGuide.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/NewArtifactTypeGuide.java @@ -112,10 +112,4 @@ public class NewArtifactTypeGuide extends SetupCDTest { InformationalArtifactPage.clickOK(); } - - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/RemoveRestrictionOfDeploymentArtifacts.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/RemoveRestrictionOfDeploymentArtifacts.java index 877c6d50c0..5af602dbd4 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/RemoveRestrictionOfDeploymentArtifacts.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/RemoveRestrictionOfDeploymentArtifacts.java @@ -108,9 +108,4 @@ public class RemoveRestrictionOfDeploymentArtifacts extends SetupCDTest { ResourceGeneralPage.clickSubmitForTestingButton(serviceMetadata.getName()); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/VfModule.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/VfModule.java index c1d5e6a9ba..a05a5cd5c0 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/VfModule.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/US/VfModule.java @@ -156,10 +156,4 @@ public class VfModule extends SetupCDTest { } - - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/AmdocsComplexService/CreatePath.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/AmdocsComplexService/CreatePath.java index eae7807c9f..508d2f1595 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/AmdocsComplexService/CreatePath.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/AmdocsComplexService/CreatePath.java @@ -291,9 +291,4 @@ public class CreatePath extends SetupCDTest { SetupCDTest.getExtendTest().log(Status.INFO, "Path has been created"); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/AmdocsComplexService/ElementsChanges.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/AmdocsComplexService/ElementsChanges.java index ce0053c74d..80f05c8940 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/AmdocsComplexService/ElementsChanges.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/AmdocsComplexService/ElementsChanges.java @@ -728,8 +728,4 @@ ElementsChanges extends SetupCDTest { TesterOperationPage.certifyComponent(serviceMetaData.getName()); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/AmdocsComplexService/PathName.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/AmdocsComplexService/PathName.java index c889faf0d6..95486b18f5 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/AmdocsComplexService/PathName.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/AmdocsComplexService/PathName.java @@ -128,9 +128,4 @@ public class PathName extends SetupCDTest { return vspName; } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - -}
\ No newline at end of file +} diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/AdminUserManagment.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/AdminUserManagment.java index d2c0aff1fc..8690ff3085 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/AdminUserManagment.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/AdminUserManagment.java @@ -256,10 +256,4 @@ public class AdminUserManagment extends SetupCDTest { } } - - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.ADMIN; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/Annotation.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/Annotation.java index 0ba9b065fe..c7a5ab17ae 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/Annotation.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/Annotation.java @@ -72,9 +72,4 @@ public class Annotation extends SetupCDTest { assertThat(toscaMainVfDefinition.getTopology_template().getInputs().get("availabilityzone_name").getAnnotations().get("source").getProperties().get("source_type")).isEqualTo("HEAT"); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ArchiveRestoreTest.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ArchiveRestoreTest.java index 1b0a3ed14f..5f7910669d 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ArchiveRestoreTest.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ArchiveRestoreTest.java @@ -234,8 +234,4 @@ public class ArchiveRestoreTest extends SetupCDTest { GeneralPageElements.clickSubmitForTestingButton(service.getName()); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/CatalogLeftPanelTest.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/CatalogLeftPanelTest.java index d4539b7f01..9324e229fe 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/CatalogLeftPanelTest.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/CatalogLeftPanelTest.java @@ -236,9 +236,4 @@ public class CatalogLeftPanelTest extends SetupCDTest { assertTrue(String.format("Wrong element name, Expected : %s , Actual: %s", resourceMetadata.getName(), firstElementName), resourceMetadata.getName().equals(firstElementName)); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/CatalogLeftPanelTestWithTime.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/CatalogLeftPanelTestWithTime.java index 9a44156d1a..87c5cb0d31 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/CatalogLeftPanelTestWithTime.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/CatalogLeftPanelTestWithTime.java @@ -286,9 +286,4 @@ public class CatalogLeftPanelTestWithTime extends SetupCDTest { assertTrue(String.format("Wrong element name, Expected : %s , Actual: %s", resourceMetadata.getName(), firstElementName), resourceMetadata.getName().equals(firstElementName)); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/CustomizationUUID.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/CustomizationUUID.java index e829a571c5..fbc9d080b4 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/CustomizationUUID.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/CustomizationUUID.java @@ -323,9 +323,4 @@ public class CustomizationUUID extends SetupCDTest { ServiceVerificator.verifyVersionUI(previousVersion); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/DeploymentViewTests.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/DeploymentViewTests.java index f513a49fbf..6b9f1751f8 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/DeploymentViewTests.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/DeploymentViewTests.java @@ -281,10 +281,4 @@ public class DeploymentViewTests extends SetupCDTest { DeploymentViewVerificator.validateModuleNameUpadate(); } - - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/EtsiNetworkServiceUiTests.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/EtsiNetworkServiceUiTests.java index a2a41b72d2..0854bec785 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/EtsiNetworkServiceUiTests.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/EtsiNetworkServiceUiTests.java @@ -230,8 +230,4 @@ public class EtsiNetworkServiceUiTests extends SetupCDTest { return new Yaml().load(new String(mainDefinitionFileBytes)); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/GAB.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/GAB.java index c3f05a7d59..bd5ad261f7 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/GAB.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/GAB.java @@ -119,9 +119,4 @@ public class GAB extends SetupCDTest { AssertJUnit.assertTrue(DeploymentArtifactPage.checkElementsCountInTable(deploymentArtifactList.size())); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ImportDCAE.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ImportDCAE.java index 5403e1312e..3b2b2bd183 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ImportDCAE.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ImportDCAE.java @@ -671,9 +671,4 @@ public class ImportDCAE extends SetupCDTest { return resourceMetaData; } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ImportVFCAsset.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ImportVFCAsset.java index a703e6d46b..511971f51f 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ImportVFCAsset.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ImportVFCAsset.java @@ -361,10 +361,4 @@ public class ImportVFCAsset extends SetupCDTest { assertTrue(GeneralUIUtils.checkForDisabledAttribute(DataTestIdEnum.GeneralElementsEnum.CREATE_BUTTON.getValue())); } - - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/OnboardingFlowsThroughAPI.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/OnboardingFlowsThroughAPI.java index 4cec05ef9c..e3a7ed43b5 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/OnboardingFlowsThroughAPI.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/OnboardingFlowsThroughAPI.java @@ -492,9 +492,4 @@ public class OnboardingFlowsThroughAPI extends SetupCDTest { assertTrue("Distribution status is " + distributeAndValidateService, distributeAndValidateService); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/OnboardingFlowsUi.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/OnboardingFlowsUi.java index 050e6960f2..f2e6036967 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/OnboardingFlowsUi.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/OnboardingFlowsUi.java @@ -632,10 +632,4 @@ public class OnboardingFlowsUi extends SetupCDTest { OpsOperationPage.waitUntilArtifactsDistributed(0); } - - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PNF.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PNF.java index 193f731403..6ae9ee122b 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PNF.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PNF.java @@ -423,9 +423,4 @@ public class PNF extends SetupCDTest { assertTrue(GeneralUIUtils.isElementInvisibleByTestId("BlockStorage")); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PortMirroring.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PortMirroring.java index 1de9853c38..3080e30ae4 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PortMirroring.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PortMirroring.java @@ -604,10 +604,4 @@ public class PortMirroring extends SetupCDTest { ServiceVerificator.verifyLinkCreated(serviceReqDetails, getUser(), 3); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } } - - diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/Product.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/Product.java index 5e252423fe..24384e35be 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/Product.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/Product.java @@ -66,9 +66,4 @@ public class Product extends SetupCDTest { reloginWithNewRole(UserRoleEnum.PRODUCT_STRATEGIST1); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PropertiesAssignment.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PropertiesAssignment.java index 5a13b67667..4b8b5752be 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PropertiesAssignment.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PropertiesAssignment.java @@ -572,10 +572,4 @@ public class PropertiesAssignment extends SetupCDTest { PropertiesAssignmentVerificator.validateFilteredPropertiesCount(propertiesCountWithoutFilter, propertyLocation); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } - diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PropertiesAssignmentUpdateFlow.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PropertiesAssignmentUpdateFlow.java index c5bcd7b6d7..26bfbac55c 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PropertiesAssignmentUpdateFlow.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PropertiesAssignmentUpdateFlow.java @@ -677,12 +677,4 @@ public class PropertiesAssignmentUpdateFlow extends SetupCDTest { DeploymentArtifactPage.clickCloseEnvParameters(); } - - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } - - diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PropertiesAssignmentUpdateFlow_New.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PropertiesAssignmentUpdateFlow_New.java index 0fcb75759d..4ab5a50497 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PropertiesAssignmentUpdateFlow_New.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/PropertiesAssignmentUpdateFlow_New.java @@ -916,11 +916,4 @@ public class PropertiesAssignmentUpdateFlow_New extends SetupCDTest { PropertiesAssignmentPage.clickOnInputTab(); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } - - diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/Service.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/Service.java index 6ff0ee9d56..dd953deec2 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/Service.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/Service.java @@ -774,9 +774,4 @@ public class Service extends SetupCDTest { ServiceVerificator.verifyVersionUI(previousVersion); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ToscaValidationTest.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ToscaValidationTest.java index 6e684d60b4..55d90decb5 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ToscaValidationTest.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/ToscaValidationTest.java @@ -688,13 +688,6 @@ public class ToscaValidationTest extends SetupCDTest { return resourceInstanceNormalizedName + ".." + resourceGroupName; } - - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - - public static ToscaDefinition addGenericInputsToToscaObject(ToscaDefinition toscaDefinition, String genericName) throws Exception { Resource genericResource = AtomicOperationUtils.getResourceObjectByNameAndVersion(UserRoleEnum.DESIGNER, genericName, "1.0"); ToscaTopologyTemplateDefinition topologyTemplate = toscaDefinition.getTopology_template(); @@ -939,7 +932,4 @@ public class ToscaValidationTest extends SetupCDTest { return ToscaParserUtils.parseToscaMainYamlToJavaObjectByCsarLocation(new File(filesFolder.getPath() + vfCsarFileName)); } - } - - diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/UpgradeServices.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/UpgradeServices.java index a0a176ac2a..f4b87a8626 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/UpgradeServices.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/UpgradeServices.java @@ -451,9 +451,4 @@ public class UpgradeServices extends SetupCDTest { return vfMetaData; } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/VFCArtifacts.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/VFCArtifacts.java index 34d2c9c9be..3dbb91e725 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/VFCArtifacts.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/VFCArtifacts.java @@ -335,12 +335,6 @@ public class VFCArtifacts extends SetupCDTest { } - - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - private Map<String, LinkedList<HeatMetaFirstLevelDefinition>> verifyVfcArtifacts(String filepath, String csarFile, ResourceReqDetails resourceMetaData, RestResponse getResponse) throws Exception { @@ -378,4 +372,5 @@ public class VFCArtifacts extends SetupCDTest { VFCArtifactVerificator.verifyVfcArtifacts(resourceMetaData, getUser(), key, expectedArtifactMap, getResponse); return expectedArtifactMap; } + } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/Vf.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/Vf.java index d84ee63455..790820a67b 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/Vf.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/Vf.java @@ -514,9 +514,4 @@ public class Vf extends SetupCDTest { } } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/VfAPI.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/VfAPI.java index 2631033a8c..3a4d77c6cf 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/VfAPI.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/VfAPI.java @@ -767,10 +767,4 @@ public class VfAPI extends SetupCDTest { VfModuleVerificator.validateSpecificModulePropertiesFromFile(toscaDefinition); } - - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/VfArtifacts.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/VfArtifacts.java index 412c2a5ec6..371ba548ff 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/VfArtifacts.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/VfArtifacts.java @@ -87,12 +87,6 @@ public class VfArtifacts extends SetupCDTest { createdEnvFilePath = config.getDownloadAutomationFolder(); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - - @DataProvider(name = "heatEnvAndVersion", parallel = false) // parameters: VSP, updatedVsp, expectedHeatVersion, expectedHeatEnvVersion public Object[][] provideData() { diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/VfDeploymentInformationalArtifacts.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/VfDeploymentInformationalArtifacts.java index 59956daf91..45fb68f804 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/VfDeploymentInformationalArtifacts.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/sanity/VfDeploymentInformationalArtifacts.java @@ -631,10 +631,4 @@ public class VfDeploymentInformationalArtifacts extends SetupCDTest { } } - - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } - } diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/setup/SetupCDTest.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/setup/SetupCDTest.java index 61c6c56222..e595cc372d 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/setup/SetupCDTest.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/setup/SetupCDTest.java @@ -124,11 +124,11 @@ public abstract class SetupCDTest extends DriverFactory { return HAR_FILES_FOLDER; } - - protected abstract UserRoleEnum getRole(); + protected UserRoleEnum getRole(){ + return UserRoleEnum.DESIGNER; + } /**************** BEFORE ****************/ - @BeforeSuite(alwaysRun = true) public void setupBeforeSuite(ITestContext context) throws Exception { RestCDUtils.deleteOnDemand(); |