1 files changed, 34 insertions, 271 deletions

diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/ResourcePropertiesAssignmentPage.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/ResourcePropertiesAssignmentPage.java
index dcc26121e3..e69f1131e5 100644
--- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/ResourcePropertiesAssignmentPage.java
+++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/ResourcePropertiesAssignmentPage.java
@@ -19,302 +19,82 @@
 
 package org.onap.sdc.frontend.ci.tests.pages;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import com.aventstack.extentreports.Status;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.onap.sdc.frontend.ci.tests.execute.setup.ExtentTestActions;
-import org.onap.sdc.frontend.ci.tests.utilities.LoaderHelper;
-import org.onap.sdc.frontend.ci.tests.utilities.NotificationComponent;
-import org.onap.sdc.frontend.ci.tests.utilities.NotificationComponent.NotificationType;
+
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.Select;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 
 /**
- * Handles the Resource Properties Assignment Page UI actions
+ * Handles the Resource Properties Assignment Page UI actions.
  */
 public class ResourcePropertiesAssignmentPage extends AbstractPageObject {
 
-    private WebElement wrappingElement;
-    private LoaderHelper loaderHelper;
-    private NotificationComponent notificationComponent;
+    private ResourcePropertiesAssignmentTab resourcePropertiesAssignmentTab;
+    private ResourcePropertiesAssignmentInputTab resourcePropertiesAssignmentInputTab;
 
     public ResourcePropertiesAssignmentPage(final WebDriver webDriver) {
         super(webDriver);
-        notificationComponent = new NotificationComponent(webDriver);
-        loaderHelper = new LoaderHelper(webDriver);
+        resourcePropertiesAssignmentTab = new ResourcePropertiesAssignmentTab(webDriver);
+        resourcePropertiesAssignmentInputTab = new ResourcePropertiesAssignmentInputTab(webDriver);
     }
 
     @Override
     public void isLoaded() {
-        wrappingElement = getWait(5)
-            .until(ExpectedConditions.visibilityOfElementLocated(By.xpath(XpathSelector.MAIN_DIV.getXpath())));
-        getWait(5)
-            .until(ExpectedConditions.visibilityOfElementLocated(By.xpath(XpathSelector.TITLE_DIV.getXpath())));
-    }
-
-    /**
-     * Gets the software_version property values.
-     *
-     * @return the list of software versions found
-     */
-    public List<String> getSoftwareVersionProperty() {
-        waitPropertiesToLoad();
-        final By swVersionCheckboxLocator = By.xpath(XpathSelector.SOFTWARE_VERSION_PROPERTY_CHECKBOX.getXpath());
-        waitForElementVisibility(swVersionCheckboxLocator, 5);
-
-        final List<String> softwareVersionList = new ArrayList<>();
-        final List<WebElement> elements = wrappingElement.findElements(By.xpath(XpathSelector.SOFTWARE_VERSION_INPUT.getXpath()));
-        for (final WebElement element : elements) {
-            softwareVersionList.add(element.getAttribute("value"));
-        }
-
-        return softwareVersionList;
-    }
-
-    /**
-     * Gets the property row element for the given propertyName
-     * @param propertyName the property name
-     * @return the property row element
-     */
-    private WebElement getPropertyRow(String propertyName) {
-        final By propertyCheckboxLocator = By.xpath(XpathSelector.PROPERTY_CHECKBOX.getXpath(propertyName));
-        final WebElement propertyCheckbox = waitForElementVisibility(propertyCheckboxLocator, 5);
-        return propertyCheckbox.findElement(By.xpath("./../../.."));
+        waitForElementVisibility((By.xpath(XpathSelector.MAIN_DIV.getXpath())));
+        waitForElementVisibility(By.xpath(XpathSelector.TITLE_DIV.getXpath()));
+        resourcePropertiesAssignmentTab.isLoaded();
     }
 
     /**
-     * Gets the value of a string TOSCA property.
-     * @return the value of the property
+     * Select the Properties Tab to be displayed
      */
-    public String getStringPropertyValue(final String propertyName) {
-        waitPropertiesToLoad();
-        final WebElement propertyInput = getPropertyRow(propertyName).findElement(By.xpath(XpathSelector.INPUT_PROPERTY.getXpath(propertyName)));
-        return propertyInput.getAttribute("value");
+    public void selectPropertiesTab() {
+        findElement(By.xpath(XpathSelector.PROPERTIES_TAB.getXpath())).click();
+        resourcePropertiesAssignmentTab.isLoaded();
     }
 
     /**
-     * Sets a String value to a TOSCA property.
-     * @param propertyName the property name
-     * @param value property value to be set
+     * Select the Input Tab to be displayed
      */
-    public void setStringPropertyValue(final String propertyName, final String value) {
-        if (value == null) {
-            return;
-        }
-        waitPropertiesToLoad();
-        getPropertyRow(propertyName).findElement(By.xpath(XpathSelector.INPUT_PROPERTY.getXpath(propertyName))).sendKeys(value);
-    }
-
-    /**
-     * Sets a boolean value to a TOSCA property.
-     * @param propertyName
-     */
-    private void setBooleanPropertyValue(final String propertyName) {
-        waitPropertiesToLoad();
-        new Select(getPropertyRow(propertyName).findElement(By.xpath(XpathSelector.SELECT_INPUT_PROPERTY.getXpath(propertyName)))).
-            selectByVisibleText("TRUE");
+    public void selectInputTab() {
+        findElement(By.xpath(XpathSelector.INPUT_TAB.getXpath())).click();
+        resourcePropertiesAssignmentInputTab.isLoaded();
     }
 
-    /**
-     * Sets a complex property  type value to a TOSCA property. It handles List and Map
-     * @param propertyName the property name
-     * @param objectValue the property complex type value
-     */
-    public void setComplexPropertyValue(final String propertyName, final Object objectValue) {
-        if (objectValue == null) {
-            return;
-        }
-        waitPropertiesToLoad();
-        final WebElement addToListLink = getPropertyRow(propertyName)
-            .findElement(By.xpath(XpathSelector.PROPERTY_ADD_VALUE_COMPLEX_TYPE.getXpath(propertyName)));
-        if (objectValue instanceof List) {
-            setValueFromList(propertyName, (List<String>) objectValue, addToListLink);
-        }
-        if (objectValue instanceof Map) {
-            setValueFromMap(propertyName, (Map) objectValue, addToListLink);
-        }
-    }
-
-    /**
-     * Sets a value to a complex (List) property type.
-     * @param propertyName the property name
-     * @param values the List of values to be added to the given property name
-     * @param addToListLink the link to add the input value
-     */
-    private void setValueFromList(final String propertyName, final List<String> values, final WebElement addToListLink) {
-        AtomicInteger inputIndex = new AtomicInteger(0);
-        values.forEach(value -> {
-            addToListLink.click();
-            final WebElement propertyInput = addToListLink.findElement(By.xpath(XpathSelector.INPUT_PROPERTY_COMPLEX_TYPE_VALUE.getXpath(
-                String.valueOf(new StringBuilder(propertyName).append(".").append(inputIndex)))));
-            propertyInput.sendKeys(value);
-            inputIndex.getAndIncrement();
-        });
-    }
-
-    /**
-     * Sets a value to a complex (Map) property type.
-     * @param propertyName the property name
-     * @param values the Map of values to be added to the given property name
-     * @param addToListLink the link to add the input value
-     */
-    private void setValueFromMap(final String propertyName, final Map values, final WebElement addToListLink) {
-        AtomicInteger inputIndex = new AtomicInteger(0);
-        values.forEach((key, value) -> {
-            addToListLink.click();
-            WebElement propertyInput;
-            // Add Key
-            propertyInput = addToListLink.findElement(By.xpath(XpathSelector.INPUT_PROPERTY_COMPLEX_TYPE_KEY.getXpath(
-                String.valueOf(new StringBuilder(propertyName).append(".").append(inputIndex)))));
-            propertyInput.sendKeys(key.toString());
-            // Add Value
-            propertyInput = addToListLink.findElement(By.xpath(XpathSelector.INPUT_PROPERTY_COMPLEX_TYPE_VALUE.getXpath(
-                String.valueOf(new StringBuilder(propertyName).append(".").append(inputIndex)))));
-            propertyInput.sendKeys(value.toString());
-            inputIndex.getAndIncrement();
-        });
+    public List<String> getSoftwareVersionProperty() {
+        return resourcePropertiesAssignmentTab.getSoftwareVersionProperty();
     }
 
-    /**
-     * Sets a property value
-     * @param propertyName the property name
-     * @param value the property value
-     */
     public void setPropertyValue(final String propertyName, final Object value) {
-        if (value == null) {
-            return;
-        }
-
-        if (value instanceof String) {
-            setStringPropertyValue(propertyName, (String) value);
-            return;
-        }
-
-        if (value instanceof Integer) {
-            setStringPropertyValue(propertyName, ((Integer) value).toString());
-            return;
-        }
-
-        if (value instanceof Boolean) {
-            setBooleanPropertyValue(propertyName);
-            return;
-        }
-
-        if (value instanceof Map) {
-            setComplexPropertyValue(propertyName, value);
-            return;
-        }
-
-        if (value instanceof List) {
-            setComplexPropertyValue(propertyName, value);
-            return;
-        }
-
-        throw new UnsupportedOperationException("Cannot set property value of type: " + value.getClass());
+        resourcePropertiesAssignmentTab.setPropertyValue(propertyName, value);
     }
 
-    /**
-     * Checks if a property exists.
-     * @param propertyName the property name
-     * @return the value of the property
-     */
     public boolean isPropertyPresent(final String propertyName) {
-        waitPropertiesToLoad();
-        try {
-            waitForElementVisibility(By.xpath(XpathSelector.PROPERTY_CHECKBOX.getXpath(propertyName)), 5);
-        } catch (final Exception ignored) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Waits for the properties loading.
-     */
-    private void waitPropertiesToLoad() {
-        waitForElementVisibility(By.xpath(XpathSelector.PROPERTIES_TABLE.getXpath()), 5);
-        waitForElementInvisibility(By.xpath(XpathSelector.NO_DATA_MESSAGE.getXpath()), 5);
+        return resourcePropertiesAssignmentTab.isPropertyPresent(propertyName);
     }
 
-    /**
-     * Saves a property
-     */
     public void saveProperties() {
-        final WebElement saveBtn = waitForElementVisibility(By.xpath(XpathSelector.PROPERTY_SAVE_BTN.getXpath()));
-        assertTrue(saveBtn.isEnabled(), "Property save button should be enabled.");
-        saveBtn.click();
-        loaderHelper.waitForLoaderInvisibility(20);
-        notificationComponent.waitForNotification(NotificationType.SUCCESS, 20);
+        resourcePropertiesAssignmentTab.saveProperties();
     }
 
-    /**
-     * Adds a property
-     * @param propertiesMap the properties map to be added
-     */
     public void addProperties(final Map<String, String> propertiesMap) {
-        waitPropertiesToLoad();
-        propertiesMap.forEach((propertyName, propertyType) -> {
-            final By addPropertyButtonLocator = By.xpath(XpathSelector.PROPERTY_ADD_BTN.getXpath());
-            waitForElementVisibility(addPropertyButtonLocator, 30);
-            final WebElement addPropertyRightColumn = findElement(By.xpath(XpathSelector.PROPERTY_ADD_RIGHT_COLUMN_DIV.getXpath()));
-            final WebElement propertyAddButton = addPropertyRightColumn.findElement(addPropertyButtonLocator);
-            assertTrue(propertyAddButton.isDisplayed(), "Property add button should be enabled.");
-            propertyAddButton.click();
-            createProperty(propertyName, propertyType);
-            verifyProperty(propertyName);
-            ExtentTestActions.takeScreenshot(Status.INFO, "added-property",
-                String.format("Property '%s' was created on component", propertyName));
-        });
+        resourcePropertiesAssignmentTab.addProperties(propertiesMap);
     }
 
-    /**
-     * Fills the creation property modal.
-     * @param propertyName the property name to be created
-     * @param propertyType the property type to be selected
-     */
-    private void createProperty(final String propertyName, final String propertyType) {
-        final AddPropertyModal addPropertyModal = new AddPropertyModal(webDriver);
-        addPropertyModal.isLoaded();
-        addPropertyModal.fillPropertyForm(propertyName, propertyType);
-        addPropertyModal.clickOnCreate();
+    public Map<String, String> getPropertyNamesAndTypes() {
+        return resourcePropertiesAssignmentTab.getPropertyNamesAndTypes();
     }
 
-    /**
-     * Verifies if the added property is displayed on the UI.
-     * @param propertyName the property name to be found
-     */
-    private void verifyProperty(final String propertyName) {
-        final By propertyCheckboxLocator = By.xpath(XpathSelector.PROPERTY_CHECKBOX.getXpath(propertyName));
-        final WebElement propertyCheckbox = waitForElementVisibility(propertyCheckboxLocator, 5);
-        assertTrue(propertyCheckbox.isDisplayed(), String.format("%s Property should be displayed", propertyName));
-        assertTrue(this.getPropertyNamesAndTypes().containsKey(propertyName),
-            String.format("%s Property should be listed but found %s", propertyName, this.getPropertyNamesAndTypes().toString()));
+    public void setInputPropertyMetadata(String name, String key, String value) {
+        resourcePropertiesAssignmentInputTab.setInputPropertyMetadata(name, key, value);
     }
 
-    /**
-     * Creates a map based on property names and data types
-     */
-    public Map<String, String> getPropertyNamesAndTypes() {
-        waitPropertiesToLoad();
-        final Map<String, String> namesAndTypes = new HashMap<>();
-        final List<WebElement> names = findElements(By.xpath(XpathSelector.PROPERTY_NAMES.getXpath()));
-        final List<WebElement> types = findElements(By.xpath(XpathSelector.PROPERTY_TYPES.getXpath()));
-
-        for (int i = 0;i < names.size();i++) {
-            namesAndTypes.put(names.get(i).getAttribute("innerText"), types.get(i).getAttribute("innerText"));
-        }
-
-        return namesAndTypes;
+    public List<String> getInputPropertyNames() {
+        return resourcePropertiesAssignmentInputTab.getInputPropertyNames();
     }
 
     /**
@@ -324,21 +104,8 @@ public class ResourcePropertiesAssignmentPage extends AbstractPageObject {
     private enum XpathSelector {
         MAIN_DIV("w-sdc-main-right-container", "//div[@class='%s']"),
         TITLE_DIV("tab-title", "//div[contains(@class,'%s') and contains(text(), 'Properties Assignment')]"),
-        PROPERTIES_TABLE("properties-table", "//div[contains(@class,'%s')]"),
-        NO_DATA_MESSAGE("no-data", "//div[contains(@class,'%s') and text()='No data to display']"),
-        SOFTWARE_VERSION_PROPERTY_CHECKBOX("software_versions", "//checkbox[@data-tests-id='%s']"),
-        SOFTWARE_VERSION_INPUT("value-prop-software_versions", "//input[starts-with(@data-tests-id,'%s')]"),
-        PROPERTY_CHECKBOX("//checkbox[@data-tests-id='%s']"),
-        PROPERTY_SAVE_BTN("properties-save-button", "//button[@data-tests-id='%s']"),
-        PROPERTY_ADD_RIGHT_COLUMN_DIV("right-column", "//div[@class='%s']"),
-        PROPERTY_ADD_BTN("add-btn", "//div[contains(@class,'%s')]"),
-        PROPERTY_ADD_VALUE_COMPLEX_TYPE("//a[contains(@data-tests-id, 'add-to-list-%s')]"),
-        INPUT_PROPERTY_COMPLEX_TYPE_KEY("//input[contains(@data-tests-id, 'value-prop-key-%s')]"),
-        INPUT_PROPERTY_COMPLEX_TYPE_VALUE("//input[contains(@data-tests-id, 'value-prop-%s')]"),
-        INPUT_PROPERTY("//input[@data-tests-id='value-prop-%s']"),
-        SELECT_INPUT_PROPERTY("//select[@data-tests-id='value-prop-%s']"),
-        PROPERTY_TYPES("//*[contains(@data-tests-id, 'propertyType')]"),
-        PROPERTY_NAMES("//*[contains(@data-tests-id, 'propertyName')]");
+        PROPERTIES_TAB("//*[contains(@data-tests-id, 'Properties') and contains(@class, 'tab')]"),
+        INPUT_TAB("//*[contains(@data-tests-id, 'Inputs') and contains(@class, 'tab')]");
 
         @Getter
         private String id;
@@ -351,10 +118,6 @@ public class ResourcePropertiesAssignmentPage extends AbstractPageObject {
         public String getXpath() {
             return String.format(xpathFormat, id);
         }
-
-        public String getXpath(final String... xpathParams) {
-            return String.format(xpathFormat, xpathParams);
-        }
     }
 
 }