diff options
Diffstat (limited to 'ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes')
7 files changed, 322 insertions, 29 deletions
diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/CanvasElement.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/CanvasElement.java index 818b488d64..e217847815 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/CanvasElement.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/CanvasElement.java @@ -43,6 +43,12 @@ public final class CanvasElement { elementType = canvasItem; } + public CanvasElement(String name, ImmutablePair<Integer, Integer> location) { + super(); + this.uniqueId = name; + this.location = location; + } + public String getUniqueId() { return uniqueId; } diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/CanvasManager.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/CanvasManager.java index b4f50020df..910cc54dad 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/CanvasManager.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/CanvasManager.java @@ -20,14 +20,8 @@ package org.openecomp.sdc.ci.tests.datatypes; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.UUID; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; - +import com.aventstack.extentreports.Status; +import com.clearspring.analytics.util.Pair; import org.apache.commons.lang3.tuple.ImmutablePair; import org.openecomp.sdc.ci.tests.datatypes.DataTestIdEnum.LeftPanelCanvasItems; import org.openecomp.sdc.ci.tests.datatypes.enums.CircleSize; @@ -40,9 +34,11 @@ import org.openqa.selenium.StaleElementReferenceException; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; import org.testng.Assert; +import org.testng.SkipException; -import com.aventstack.extentreports.Status; -import com.clearspring.analytics.util.Pair; +import java.util.*; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; public final class CanvasManager { private Map<String, CanvasElement> canvasElements; @@ -110,7 +106,7 @@ public final class CanvasManager { actions.clickAndHold(); actions.release(); actions.perform(); - isKeepWaiting = GeneralUIUtils.getWebElementByTestID("selectedCompTitle").getText() + isKeepWaiting = GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.CompositionRightPanel.COMPONENT_TITLE.getValue()).getText() .equals(containerName); sumOfWaiting += napPeriod; if (sumOfWaiting > maxWait) { @@ -131,6 +127,56 @@ public final class CanvasManager { ExtentTestActions.log(Status.INFO, String.format("Canvas element %s selected", canvasElement.getElementType())); } + public void openLinkPopupReqsCapsConnection(CanvasElement canvasElement) + { + ExtentTestActions.log(Status.INFO, "Open Link popup"); + clickOnCanvasLink(canvasElement); + int x = canvasElement.getLocation().getLeft() + 30; // view button x delta + int y = canvasElement.getLocation().getRight() + 11; // view button y delta + clickOnCanvasPosition(x,y); + GeneralUIUtils.ultimateWait(); + } + public void closeLinkPopupReqsCapsConnection() + { + GeneralUIUtils.clickOnElementByTestId("Cancel"); + GeneralUIUtils.ultimateWait(); + } + + public void clickSaveOnLinkPopup() + { + ExtentTestActions.log(Status.INFO, "Click save on link popup"); + GeneralUIUtils.clickOnElementByTestId("Save"); + GeneralUIUtils.ultimateWait(); + } + + public void deleteLinkPopupReqsCapsConnection(CanvasElement canvasElement) + { + clickOnCanvasLink(canvasElement); + int x = canvasElement.getLocation().getLeft() + 30; // delete button x delta + int y = canvasElement.getLocation().getRight() + 30; // delete button x delta + clickOnCanvasPosition(x,y); + } + + public void clickOnCanvasLink(CanvasElement canvasElement) { + actions.moveToElement(canvas, canvasElement.getLocation().left, canvasElement.getLocation().right); + actions.click().perform(); + GeneralUIUtils.ultimateWait(); + } + + public void clickOnCanvasPosition(int x, int y) { + + try { + actions.moveToElement(canvas, x, y); + actions.click(); + actions.perform(); + GeneralUIUtils.ultimateWait(); + } + catch (Exception e) + { + System.out.println(e); + } + } + public void moveElementOnCanvas(CanvasElement canvasElement) throws Exception { moveElementOnCanvas(canvasElement, getFreePosition()); } @@ -182,6 +228,7 @@ public final class CanvasManager { private CanvasElement createElementOnCanvasWithoutDuration(String elementDataTestId) throws Exception { try { + CompositionPage.searchForElement(elementDataTestId); WebElement element = findClickElement(elementDataTestId); ImmutablePair<Integer, Integer> freePosition = getFreePosition(); actions.moveToElement(element, 20, 20); @@ -245,12 +292,12 @@ public final class CanvasManager { } private void selectReqAndCapAndConnect() throws Exception { - addFitstReqOrCapAndPressNext(); - addFitstReqOrCapAndPressNext(); + addFirstReqOrCapAndPressNext(); + addFirstReqOrCapAndPressNext(); linkMenuClickOnFinishButton(); } - private void addFitstReqOrCapAndPressNext() throws Exception { + private void addFirstReqOrCapAndPressNext() throws Exception { addFirstReqOrCap(); linkMenuClickOnNextButton(); } @@ -344,12 +391,35 @@ public final class CanvasManager { * Validate that instance was selected on right sidebar */ public void validateInstanceSelected(CanvasElement canvasElement) { - long maxWait = 3000; + long maxWait = 5000; + long sumOfWaiting = 0; + long napPeriod = 200; + boolean isInstanceSelected; + do { + isInstanceSelected = CompositionPage.getSelectedInstanceName().toLowerCase().contains(canvasElement.getElementType().toLowerCase()); + + if (!isInstanceSelected) { + try { + TimeUnit.MILLISECONDS.sleep(napPeriod); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + + sumOfWaiting += napPeriod; + if (sumOfWaiting > maxWait) { + throw new SkipException(String.format("Open bug 342260, can't select instance properly, waited for %s seconds", (int) (maxWait/1000))); + } + } while (!isInstanceSelected); + } + + public void validateLinkIsSelected() { + long maxWait = 5000; long sumOfWaiting = 0; long napPeriod = 200; boolean isInstanceSelected; do { - isInstanceSelected = CompositionPage.getSelectedInstanceName().contains(canvasElement.getElementType()); + isInstanceSelected = GeneralUIUtils.isWebElementExistByClass("w-sdc-menu-item w-sdc-canvas-menu-item-view"); if (!isInstanceSelected) { try { @@ -361,7 +431,7 @@ public final class CanvasManager { sumOfWaiting += napPeriod; if (sumOfWaiting > maxWait) { - Assert.fail(String.format("Can't select instance properly, waited for %s seconds", (int) (maxWait/1000))); + Assert.fail(String.format("Can't select link properly, waited for %s seconds", (int) (maxWait/1000))); } } while (!isInstanceSelected); } @@ -372,18 +442,27 @@ public final class CanvasManager { GeneralUIUtils.ultimateWait(); } - private void selectTypeOfReqCap(String reqCapType) + private void selectTypeOfReqCap(String dataTestId, String reqCapType) { - GeneralUIUtils.getSelectList(reqCapType,DataTestIdEnum.LinkMenuItems.REQ_CAP_SELECT_DATA_TESTS_ID.getValue()); - GeneralUIUtils.ultimateWait(); + GeneralUIUtils.selectByValueTextContained(dataTestId, reqCapType); } public void linkElementsAndSelectCapReqTypeAndCapReqName(CanvasElement firstElement, CircleSize firstElementSize, CanvasElement secondElement, CircleSize secondElementSize, ConnectionWizardPopUpObject connectionWizardPopUpObject) throws Exception { - drawSimpleLink(firstElement, firstElementSize, secondElement, secondElementSize); - selectTypeOfReqCap(connectionWizardPopUpObject.getCapabilityTypeSecondItem()); - addFitstReqOrCapAndPressNext(); + SetupCDTest.getExtendTest().log(Status.INFO, String.format("Creating link between %s and %s", firstElement.getElementType(), secondElement.getElementType())); + drawSimpleLink(firstElement, firstElementSize, secondElement, secondElementSize); + selectTypeOfReqCap(DataTestIdEnum.LinkMenuItems.REQ_CAP_SELECT_DATA_TESTS_ID.getValue(),connectionWizardPopUpObject.getCapabilityTypeSecondItem()); + addFirstReqOrCapAndPressNext(); selectReqCapByName(connectionWizardPopUpObject.getCapabilityNameSecondItem()); linkMenuClickOnNextButton(); linkMenuClickOnFinishButton(); } + + public ImmutablePair<Integer, Integer> calcMidOfLink(ImmutablePair<Integer, Integer> location1, ImmutablePair<Integer, Integer> location2) + { + int x = (location1.getLeft()+location2.getLeft())/2; + int y = (location1.getRight()+location2.getRight())/2; + + ImmutablePair<Integer, Integer> location = new ImmutablePair<>(x,y); + return location; + } } diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/DataTestIdEnum.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/DataTestIdEnum.java index fdd6a572a4..65fdb9dc47 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/DataTestIdEnum.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/DataTestIdEnum.java @@ -525,9 +525,10 @@ public final class DataTestIdEnum { public enum DashboardCardEnum { ASSET_TYPE("asset-type"), LIFECYCLE_STATE("span[class^='w-sdc-dashboard-card-info-lifecycleState']"), - INFO_NAME("div.sdc-tile-content-info-item-name"), + INFO_NAME("div.sdc-tile-info-line"), VERSION("div[class^='w-sdc-dashboard-card-info-user']"), DASHBOARD_CARD("div[class^='w-sdc-dashboard-card ']"), + INFO_TITLE_XPATH("//div[contains(@class,'sdc-tile-info-line title')]"), ASSET_TYPE_CSS("span[data-tests-id='asset-type']"); private String value; @@ -820,7 +821,13 @@ public final class DataTestIdEnum { INPUT_DELETE_BUTTON("delete-input-button"), INPUT_DELETE_DIALOG_DELETE("Delete"), INPUT_DELETE_DIALOG_CLOSE("Close"), - FILTER_CHECKBOX_ALL("filter-checkbox-all"); + FILTER_CHECKBOX_ALL("filter-checkbox-all"), + FILTER_CHECKBOX_CP("filter-checkbox-cp"), + FILTER_CHECKBOX_VFC("filter-checkbox-vfc"), + FILTER_CHECKBOX_VL("filter-checkbox-vl"), + FILTER_APPLY_BUTTON("filter-apply-button"), + FILTER_CLOSE_BUTTON("filter-close-button"), + PROPERTY_NAME_COLUMN("property-name"); private String value; @@ -867,6 +874,82 @@ public final class DataTestIdEnum { this.value = value; } } - - + + public enum ComplexServiceAmdocs { + CREATE_BUTTON("Create"), + PATH_LIST_BUTTON("pathsListMenuItem"), + CREATE_PATH_MENU_BUTTON("createPathMenuItem"), + PATH_NAME("pathName"), + PATH_PROTOCOL("pathProtocol"), + PATH_PORT_NUMBER("pathPortNumbers"), + SAVE("Save"), + EXTEND_BUTTON("extendPathlnk"); + + private String value; + + public String getValue() { + return value; + } + + private ComplexServiceAmdocs(String value) { + this.value = value; + } + } + + public enum PortMirroring { + COLLECTOR_NODE("collector_node"), + EQUIP_MODEL("equip_model"), + EQUIP_VENDOR("equip_vendor"), + PMC_NAME_IN_PALLETE("Port Mirroring Configuration"), + PMCP_NAME_IN_PALLETE("Port Mirroring Configuration By Policy"); + + private String value; + + public String getValue() { + return value; + } + + private PortMirroring(String value) { + this.value = value; + } + } + + public enum CompositionRightPanel_GenerInfo { + TYPE("rightTab_componentType"), + RESOURCE_TYPE("rightTab_resourceType"), + SELECT_VERSION("changeVersion"), + CATEGORY("rightTab_category"), + SUB_CATEGORY("rightTab_subCategory"); + + private String value; + + public String getValue() { + return value; + } + + private CompositionRightPanel_GenerInfo(String value) { + this.value = value; + } + } + + public enum CompositionRightPanel { + + COMPONENT_TITLE("selectedCompTitle"), + REQS_AND_CAPS_TAB("requirements-and-capabilities"), + EDIT_PENCIL("editPencil"), + INSTANCE_NAME_TEXTBOX("instanceName"), + DELETE_ITEM("e-sdc-small-icon-delete"), + REQS_AND_CAPS_TAB_XPATH("//button[@tooltip-content='Requirements and Capabilities']"); + + private String value; + + public String getValue() { + return value; + } + + private CompositionRightPanel(String value) { + this.value = value; + } + } + } diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/PortMirrioringConfigurationObject.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/PortMirrioringConfigurationObject.java new file mode 100644 index 0000000000..60804cb278 --- /dev/null +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/PortMirrioringConfigurationObject.java @@ -0,0 +1,74 @@ +package org.openecomp.sdc.ci.tests.datatypes; + +import org.openecomp.sdc.be.model.Service; + +public class PortMirrioringConfigurationObject { + + private ServiceReqDetails serviceReqDetails; + private String vmmeSourceName; + private String vprobeSourceName; + private CanvasManager canvasManager; + private CanvasElement serviceElementVmmeSourceName; + private CanvasElement serviceElementVprobeCollector; + private CanvasElement portMirroringConfigurationElement; + private Service service; + private Service serviceContainerVmme_Source; + private Service serviceContainerVprobe_Collector; + + public PortMirrioringConfigurationObject(ServiceReqDetails serviceReqDetails, String vmmeSourceName, String vprobeSourceName, + CanvasManager canvasManager, CanvasElement serviceElementVmmeSourceName, + CanvasElement serviceElementVprobeCollector, Service service, CanvasElement portMirroringConfigurationElement, + Service serviceContainerVmme_Source, Service serviceContainerVprobe_Collector ) + { + this.serviceReqDetails = serviceReqDetails; + this.vmmeSourceName = vmmeSourceName; + this.vprobeSourceName = vprobeSourceName; + this.canvasManager = canvasManager; + this.serviceElementVmmeSourceName = serviceElementVmmeSourceName; + this.serviceElementVprobeCollector = serviceElementVprobeCollector; + this.service = service; + this.portMirroringConfigurationElement = portMirroringConfigurationElement; + this.serviceContainerVmme_Source = serviceContainerVmme_Source; + this.serviceContainerVprobe_Collector = serviceContainerVprobe_Collector; + } + + public Service getServiceContainerVmme_Source() { + return serviceContainerVmme_Source; + } + + public Service getServiceContainerVprobe_Collector() { + return serviceContainerVprobe_Collector; + } + + public CanvasElement getPortMirroringConfigurationElement() { + return portMirroringConfigurationElement; + } + + public ServiceReqDetails getServiceReqDetails() { + return serviceReqDetails; + } + + public String getVmmeSourceName() { + return vmmeSourceName; + } + + public String getVprobeSourceName() { + return vprobeSourceName; + } + + public CanvasManager getCanvasManager() { + return canvasManager; + } + + public CanvasElement getServiceElementVmmeSourceName() { + return serviceElementVmmeSourceName; + } + + public CanvasElement getServiceElementVprobeCollector() { + return serviceElementVprobeCollector; + } + + public Service getService() { + return service; + } +} diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/PortMirroringEnum.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/PortMirroringEnum.java new file mode 100644 index 0000000000..7cbdf6fc9c --- /dev/null +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/PortMirroringEnum.java @@ -0,0 +1,48 @@ +package org.openecomp.sdc.ci.tests.datatypes; + +public enum PortMirroringEnum { + + PMC_ELEMENT_IN_PALLETE("Port Mirroring Configuration"), + PMCP_ELEMENT_IN_PALLETE("Port Mirroring Configuration By Policy"), + PM_REQ_TYPE("org.openecomp.capabilities.PortMirroring"), + PMC_SOURCE_CAP("Port Mirroring Configuration 0: source: [1, UNBOUNDED]"), + PMC1_SOURCE_CAP("Port Mirroring Configuration 1: source: [1, UNBOUNDED]"), + PMCP_SOURCE_CAP("Port Mirroring Configuration By Policy 0: source: [1, UNBOUNDED]"), + PMCP1_SOURCE_CAP("Port Mirroring Configuration By Policy 1: source: [1, UNBOUNDED]"), + PMC_COLLECTOR_CAP("Port Mirroring Configuration 0: collector: [1, 1]"), + CISCO_VENDOR_NAME("CISCO"), + CISCO_VENDOR_MODEL_NUMBER("4500x"), + APCON1_VENDOR_NAME("APCON1"), + APCON1_VENDOR_MODEL_NUMBER("Test_APCON1"), + APCON2_VENDOR_NAME("APCON2"), + APCON2_VENDOR_MODEL_NUMBER("Test_APCON2"), + VMME_ZIP("2016-227_vmme_vmme_30_1610_e2e.zip"), + VPROBE_ZIP("vProbe_2017-10-22_07-24.zip"), + SERVICE_PROXY_TYPE("Service Proxy"), + SERVICE_TYPE("transport"), + TYPE("Resource"), + RESOURCE_TYPE("Configuration"), + CATEGORY("Configuration"), + SUB_CATEGORY("Configuration"), + NETWORK_ROLE_XPATH("//input[@name='network_role']"), + NFC_TYPE_XPATH("//input[@name='nfc_type']"), + PPS_CAPACITY_XPATH("//input[@name='pps_capacity']"), + NF_TYPE_XPATH("//input[@name='nf_type']"), + NETWORK_ROLE_VALUE("NETWORK ROLE TEXT"), + NFC_TYPE_VALUE("NFC TYPE TEXT"), + PPS_CAPACITY_VALUE("PPS CAPACITY TEXT"), + NF_TYPE_VALUE("NF TYPE TEXT"), + PMCP_NEWNAME("NewPMCP_Name"); + + + private String value; + + public String getValue() { + return value; + } + + private PortMirroringEnum(String value) { + this.value = value; + } + +} diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/UserManagementTab.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/UserManagementTab.java index 799649b1b6..f51e69af01 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/UserManagementTab.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/UserManagementTab.java @@ -61,6 +61,7 @@ public class UserManagementTab { public void clickCreateButton(){ ExtentTestActions.log(Status.INFO, "Clicking on 'Create' button."); + GeneralUIUtils.ultimateWait(); GeneralUIUtils.clickOnElementByTestId(DataTestIdEnum.UserManagementEnum.CREATE_BUTTON.getValue()); } @@ -99,7 +100,9 @@ public class UserManagementTab { public void deleteUser(int index){ ExtentTestActions.log(Status.INFO, "Deleting the user in row " + (index + 1)); + GeneralUIUtils.ultimateWait(); GeneralUIUtils.clickOnElementByTestId(DataTestIdEnum.UserManagementEnum.DELETE_USER.getValue() + index); + GeneralUIUtils.ultimateWait(); GeneralUIUtils.clickOnElementByTestId(DataTestIdEnum.ModalItems.OK.getValue()); } diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/VendorSoftwareProductObject.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/VendorSoftwareProductObject.java index 8b40210c0d..a6aba7f13c 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/VendorSoftwareProductObject.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/VendorSoftwareProductObject.java @@ -16,8 +16,8 @@ public class VendorSoftwareProductObject extends VendorSoftwareProductObjectReqD this.version = version; } - public VendorSoftwareProductObject(String name, String description, String category, String subCategory, String vendorId, String vendorName, LicensingVersion licensingVersion, LicensingData licensingData, String onboardingMethod, String networkPackageName, String onboardingOrigin, String vspId, String componentId, String attContact, String version) { - super(name, description, category, subCategory, vendorId, vendorName, licensingVersion, licensingData, onboardingMethod, networkPackageName, onboardingOrigin); + public VendorSoftwareProductObject(String name, String description, String category, String subCategory, String vendorId, String vendorName, String licensingVersion, LicensingData licensingData, String onboardingMethod, String networkPackageName, String onboardingOrigin, String icon, String vspId, String componentId, String attContact, String version) { + super(name, description, category, subCategory, vendorId, vendorName, licensingVersion, licensingData, onboardingMethod, networkPackageName, onboardingOrigin, icon); this.vspId = vspId; this.componentId = componentId; this.attContact = attContact; |