1 files changed, 162 insertions, 54 deletions

diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/pages/PropertiesAssignmentPage.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/pages/PropertiesAssignmentPage.java
index 1dd67b1036..40a58e35c9 100644
--- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/pages/PropertiesAssignmentPage.java
+++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/pages/PropertiesAssignmentPage.java
@@ -1,46 +1,93 @@
 package org.openecomp.sdc.ci.tests.pages;
 
 
-import java.util.List;
-
+import com.aventstack.extentreports.Status;
 import org.openecomp.sdc.ci.tests.datatypes.DataTestIdEnum;
 import org.openecomp.sdc.ci.tests.datatypes.DataTestIdEnum.PropertiesAssignmentScreen;
 import org.openecomp.sdc.ci.tests.execute.setup.SetupCDTest;
 import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils;
+import org.openqa.selenium.Keys;
+import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.WebElement;
 
-import com.aventstack.extentreports.Status;
-
 public class PropertiesAssignmentPage {
 	public static void clickOnInputTab(){
 		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Input Tab"));
 		GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.INPUTS_TAB.getValue());
-		GeneralUIUtils.ultimateWait();		
+//		GeneralUIUtils.ultimateWait();
 	}
 	
 	public static void clickOnPropertiesTab(){
 		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Properties Tab"));
 		GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.PROPERTIES_TAB.getValue());
-		GeneralUIUtils.ultimateWait();		
+//		GeneralUIUtils.ultimateWait();
 	}
 	
 	public static void clickOnCompositionRightTab(){
 		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Composition Right Tab"));
 		GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.COMPOSITION_TAB.getValue());
-		GeneralUIUtils.ultimateWait();		
+//		GeneralUIUtils.ultimateWait();
 	}
 	
 	public static void clickOnPropertyStructureRightTab(){
 		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Property Structure Right Tab"));
 		GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.PROPERTY_STRUCTURE_TAB.getValue());
-		GeneralUIUtils.ultimateWait();		
+//		GeneralUIUtils.ultimateWait();
 	}
 	
 	public static void clickOnDeclareButton(){
 		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Declare Button"));
 		GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.DECLARE_BUTTON.getValue());
-		GeneralUIUtils.ultimateWait();		
+//		GeneralUIUtils.ultimateWait();
+	}
+
+	public static void clickOnSaveButton(){
+		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Save Button"));
+		GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.SAVE_BUTTON.getValue());
+//		GeneralUIUtils.ultimateWait();
+	}
+
+	public static void clickOnDiscardButton(){
+		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Discard Button"));
+		GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.DISCARD_BUTTON.getValue());
+//		GeneralUIUtils.ultimateWait();
+	}
+
+	public static void clickOnDialogSaveButton(){
+		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Save Button in Dialog Popup"));
+		GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.SAVE_DIALOG_SAVE.getValue());
+//		GeneralUIUtils.ultimateWait();
+	}
+
+	public static void clickOnDialogDiscardButton(){
+		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Discard Button in Dialog Popup"));
+		GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.SAVE_DIALOG_DISCARD.getValue());
+//		GeneralUIUtils.ultimateWait();
 	}
+
+	public static void clickOnDialogCancelButton(){
+        SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Cancel Button in Dialog Popup"));
+        GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.SAVE_DIALOG_CANCEL.getValue());
+//        GeneralUIUtils.ultimateWait();
+    }
+
+	public static void clickOnEditButton(String propertyName) {
+		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Edit button "));
+		GeneralUIUtils.clickOnElementByTestId(PropertyNameBuilder.buildPopupField(propertyName));
+//		GeneralUIUtils.ultimateWait();
+	}
+
+    public static void clickOnSetButton() {
+        SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Set button in a property popup "));
+        GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.FILTER_SET_BUTTON.getValue());
+//        GeneralUIUtils.ultimateWait();
+    }
+
+    public static void clickOnExpandButton(String propertyName, int index){
+        SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Expand Complex Property Button"));
+        GeneralUIUtils.clickOnElementByTestId(PropertyNameBuilder.buildIExpandButton(propertyName, index));
+//        GeneralUIUtils.ultimateWait();
+    }
 	
 	public static void findSearchBoxAndClick(String resourceName) throws Exception {
 		SetupCDTest.getExtendTest().log(Status.INFO, "Searching for " + resourceName + " in Properties");
@@ -54,11 +101,10 @@ public class PropertiesAssignmentPage {
 			SetupCDTest.getExtendTest().log(Status.INFO, "Can't interact with search bar");
 			e.printStackTrace();
 		}
-		
-		
+
 		try{
 			SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on the %s component in Properties", resourceName));
-			GeneralUIUtils.clickOnElementByTestId(resourceName);
+			GeneralUIUtils.clickOnElementByInputTestIdWithoutWait(resourceName);
 			GeneralUIUtils.ultimateWait();
 			GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.GeneralElementsEnum.LIFECYCLE_STATE.getValue());
 		}
@@ -68,32 +114,58 @@ public class PropertiesAssignmentPage {
 		}
 	}
 	
-	public static void clickOnProperty(String propertyName) {
-		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on property %s ", propertyName));
-		GeneralUIUtils.clickOnElementByTestId(DataTestIdEnum.InputsScreenService.RESOURCE_INSTANCE_PROPERTY_NAME.getValue() + propertyName);
-		GeneralUIUtils.ultimateWait();
+	public static void clickOnProperty(String propertyName)throws Exception {
+
+			SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on the %s component in Properties", propertyName));
+			GeneralUIUtils.clickOnElementByTestId(propertyName);
+//			GeneralUIUtils.ultimateWait();
+			GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.GeneralElementsEnum.LIFECYCLE_STATE.getValue());
+	}
+
+	public static void clickOnAddValueToList(String propertyName)throws Exception {
+		try{
+			SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on the Add To List button of %s component in Properties", propertyName));
+			GeneralUIUtils.clickOnElementByTestId( PropertiesAssignmentScreen.ADD_TO_LIST_BUTTON.getValue() + propertyName);
+//			GeneralUIUtils.ultimateWait();
+			GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.GeneralElementsEnum.LIFECYCLE_STATE.getValue());
+		}
+		catch(Exception e){
+			SetupCDTest.getExtendTest().log(Status.INFO, "Can't click on Add To List button of component named " + propertyName);
+			e.printStackTrace();
+		}
 	}
+
+    public static void clickODeleteValueFromList(String propertyName, int index)throws Exception {
+        try{
+            SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on the Delete From List button of %s component in Properties", propertyName));
+            GeneralUIUtils.clickOnElementByTestId( PropertiesAssignmentScreen.DELETE_FROM_LIST_BUTTON.getValue() + propertyName + "." + String.valueOf(index));
+//            GeneralUIUtils.ultimateWait();
+            GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.GeneralElementsEnum.LIFECYCLE_STATE.getValue());
+        }
+        catch(Exception e){
+            SetupCDTest.getExtendTest().log(Status.INFO, "Can't click on Delete From List button of component named " + propertyName);
+            e.printStackTrace();
+        }
+    }
 	
 	public static void clickOnDeleteInputButton(){
 		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Delete Input Button"));
 		GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.INPUT_DELETE_BUTTON.getValue());
-		GeneralUIUtils.ultimateWait();		
+//		GeneralUIUtils.ultimateWait();
 	}
 	
 	public static void clickOnDeleteInputDialogConfirmationButton(){
 		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Delete Input Dialog Confirmation Button"));
 		GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.INPUT_DELETE_DIALOG_DELETE.getValue());
-		GeneralUIUtils.ultimateWait();		
+//		GeneralUIUtils.ultimateWait();
 	}
-	
-	
-	
+
 	public static void clickOnComponentInComposition(String resourceName) throws Exception{
 		try{
 			SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on the %s component on Properties screen", resourceName));
 			GeneralUIUtils.clickOnElementByTestId(resourceName);
-			GeneralUIUtils.ultimateWait();
-			GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.GeneralElementsEnum.LIFECYCLE_STATE.getValue());
+//			GeneralUIUtils.ultimateWait();
+//			GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.GeneralElementsEnum.LIFECYCLE_STATE.getValue());
 		}
 		catch(Exception e){
 			SetupCDTest.getExtendTest().log(Status.INFO, "Can't click on component named " + resourceName);
@@ -105,92 +177,128 @@ public class PropertiesAssignmentPage {
 		SetupCDTest.getExtendTest().log(Status.INFO, "Searching for " + componentName + "_" + resourceName + " on Inputs screen");
 		WebElement searchTextbox = GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.PropertiesAssignmentScreen.SEARCH_BOX.getValue());
 		String searchPattern = componentName + "_" + resourceName;
-		try{
-			searchTextbox.clear();
-			searchTextbox.sendKeys(searchPattern);
-			GeneralUIUtils.ultimateWait();
-		}
-		catch(Exception e){
-			SetupCDTest.getExtendTest().log(Status.INFO, "Can't interact with search bar");
-			e.printStackTrace();
-		}
-		
+
+		searchTextbox.clear();
+		searchTextbox.sendKeys(searchPattern);
+		GeneralUIUtils.ultimateWait();
 	}
 	
 	public static void findProperty(String resourceName) throws Exception {
 		SetupCDTest.getExtendTest().log(Status.INFO, "Searching for " + resourceName + " property on Properties screen");
 		WebElement searchTextbox = GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.PropertiesAssignmentScreen.SEARCH_BOX.getValue());
-		
-		try{
-			searchTextbox.clear();
-			searchTextbox.sendKeys(resourceName);
-			GeneralUIUtils.ultimateWait();
-		}
-		catch(Exception e){
-			SetupCDTest.getExtendTest().log(Status.INFO, "Can't interact with search bar");
-			e.printStackTrace();
-		}
-		
+
+		searchTextbox.clear();
+		searchTextbox.sendKeys(resourceName);
+		GeneralUIUtils.ultimateWait();
 	}
-	
+
+	public static void editPropertyValue(String resourceName, String value) throws Exception {
+		SetupCDTest.getExtendTest().log(Status.INFO, "Searching for " + resourceName + " property on Properties screen");
+		WebElement valueTextbox = GeneralUIUtils.getWebElementByTestID(resourceName);
+
+        clickOnProperty(resourceName);
+		valueTextbox.clear();
+		SetupCDTest.getExtendTest().log(Status.INFO, "Editing " + resourceName + " property on Properties screen");
+		valueTextbox.sendKeys(value);
+		GeneralUIUtils.ultimateWait();
+
+	}
+
+    public static void deletePropertyValue(String resourceName) throws Exception {
+        SetupCDTest.getExtendTest().log(Status.INFO, "Searching for " + resourceName + " property on Properties screen");
+        WebElement valueTextbox = GeneralUIUtils.getWebElementByTestID(resourceName);
+
+        clickOnProperty(resourceName);
+        SetupCDTest.getExtendTest().log(Status.INFO, "Deleting " + resourceName + " property on Properties screen");
+        valueTextbox.sendKeys(Keys.chord(Keys.CONTROL, "a"));
+        valueTextbox.sendKeys(Keys.BACK_SPACE);
+        GeneralUIUtils.ultimateWait();
+
+    }
+
+
 	public static Boolean isPropertyChecked(String resourceName){
 //		TODO add better implementation for css string
 		GeneralUIUtils.ultimateWait();
 		Boolean isDisabled = GeneralUIUtils.checkForDisabledAttributeInHiddenElement("checkbox[data-tests-id='" + resourceName + "'] input");
+		SetupCDTest.getExtendTest().log(Status.INFO, "Is property checkbox disabled? " +  isDisabled);
 		if (isDisabled)
 			return true;
 		return false;
+
 		
 	}
-	
+
+	public static boolean isButtonDisabled(String dataTestId){
+		return GeneralUIUtils.checkForDisabledAttribute(dataTestId);
+	}
+
+	public static String selectBooleanPropertyValue(String propertyName, String propertyValue) {
+        SetupCDTest.getExtendTest().log(Status.INFO, "Searching for " + propertyName + " property on Properties screen");
+		String actualPropertyValue = null;
+		try{
+			actualPropertyValue = GeneralUIUtils.getSelectedElementFromDropDown(propertyName).getText();
+		}
+		catch(NoSuchElementException e){
+			SetupCDTest.getExtendTest().log(Status.INFO, "#selectBooleanPropertyValue - Failed to get selected boolean property value ");
+			SetupCDTest.getExtendTest().log(Status.INFO, e);
+		}
+        try{
+			GeneralUIUtils.getSelectList(propertyValue, propertyName);
+		}
+		catch(NoSuchElementException e){}
+		return actualPropertyValue;
+	}
+
+
 	
 	//Filter Actions
 		public static void clickOnFilterButton() {
 			SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Filter button "));
 			GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.FILTER_BUTTON.getValue());
-			GeneralUIUtils.ultimateWait();
+//			GeneralUIUtils.ultimateWait();
 		}
 		
 		public static void clickOnFilterAllCheckbox() {
 			SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Filter All Checkbox "));
 			GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.FILTER_CHECKBOX_ALL.getValue());
-			GeneralUIUtils.ultimateWait();
+//			GeneralUIUtils.ultimateWait();
 		}
 		
 		public static void clickOnFilterCPCheckbox() {
 			SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Filter CP Checkbox "));
 			GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.FILTER_CHECKBOX_CP.getValue());
-			GeneralUIUtils.ultimateWait();
+//			GeneralUIUtils.ultimateWait();
 		}
 		
 		public static void clickOnFilterVfcCheckbox() {
 			SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Filter VFC Checkbox "));
 			GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.FILTER_CHECKBOX_VFC.getValue());
-			GeneralUIUtils.ultimateWait();
+//			GeneralUIUtils.ultimateWait();
 		}
 		
 		public static void clickOnFilterVlCheckbox() {
 			SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Filter VL Checkbox "));
 			GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.FILTER_CHECKBOX_VL.getValue());
-			GeneralUIUtils.ultimateWait();
+//			GeneralUIUtils.ultimateWait();
 		}
 		
 		public static void clickOnFilterApplyButton(){
 			SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Filter Apply Button"));
 			GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.FILTER_APPLY_BUTTON.getValue());
-			GeneralUIUtils.ultimateWait();		
+//			GeneralUIUtils.ultimateWait();
 		}
 		
 		public static void clickOnFilterCloseButton(){
 			SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Filter Close Button"));
 			GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.FILTER_CLOSE_BUTTON.getValue());
-			GeneralUIUtils.ultimateWait();		
+//			GeneralUIUtils.ultimateWait();
 		}
 		
 		public static void clickOnFilterClearAllButton(){
 			SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on Filter Clear All Button"));
 			GeneralUIUtils.clickOnElementByTestId(PropertiesAssignmentScreen.CLEAR_FILTER_BUTTON.getValue());
-			GeneralUIUtils.ultimateWait();		
+//			GeneralUIUtils.ultimateWait();
 		}
 		
 		public static void findFilterBoxAndClick(String resourceName) throws Exception {