1 files changed, 61 insertions, 59 deletions

diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/PropertiesUIUtils.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/PropertiesUIUtils.java
index 7eb4e63ab3..609b18eaeb 100644
--- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/PropertiesUIUtils.java
+++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/PropertiesUIUtils.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,65 +31,67 @@ import java.util.Map;
 
 public class PropertiesUIUtils {
 
-	public static Map<String, String> addProperties(String name, String itemType, String defaultValue,
-			String description, String schemaType) throws Exception {
-		Map<String, String> propertyvalues = new HashMap<String, String>();
-		GeneralUIUtils.getSelectList(itemType, "propertyType");
-		ResourceUIUtils.definePropertyName(name);
-		if (itemType == "boolean") {
-			ResourceUIUtils.defineBoolenDefaultValue(defaultValue);
-			GeneralUIUtils.setWebElementByTestId("description","description");
-			Thread.sleep(2000);
-			GeneralUIUtils.getWebElementByTestID("Add").click();
-		} else if (itemType == "list" || itemType == "map") {
-			GeneralUIUtils.getSelectList(schemaType, "schemaType");
-		}
-		if (!(itemType == "boolean")) {
-			ResourceUIUtils.defineDefaultValueByType(defaultValue);
-			GeneralUIUtils.setWebElementByTestId("description", "des");
-			GeneralUIUtils.getWebElementByTestID("Add").click();
-			Thread.sleep(2000);
-		}
-		propertyvalues.put("type", itemType);
-		propertyvalues.put("defaultValue", defaultValue);
-		propertyvalues.put("description", description);
-		propertyvalues.put("name", name);
+    private static final int SLEEP_TIME = 2000;
 
-		return propertyvalues;
-	}
+    public static Map<String, String> addProperties(String name, String itemType, String defaultValue,
+                                                    String description, String schemaType) throws Exception {
+        Map<String, String> propertyvalues = new HashMap<String, String>();
+        GeneralUIUtils.getSelectList(itemType, "propertyType");
+        ResourceUIUtils.definePropertyName(name);
+        if (itemType == "boolean") {
+            ResourceUIUtils.defineBoolenDefaultValue(defaultValue);
+            GeneralUIUtils.setWebElementByTestId("description", "description");
+            Thread.sleep(SLEEP_TIME);
+            GeneralUIUtils.getWebElementByTestID("Add").click();
+        } else if (itemType == "list" || itemType == "map") {
+            GeneralUIUtils.getSelectList(schemaType, "schemaType");
+        }
+        if (!(itemType == "boolean")) {
+            ResourceUIUtils.defineDefaultValueByType(defaultValue);
+            GeneralUIUtils.setWebElementByTestId("description", "des");
+            GeneralUIUtils.getWebElementByTestID("Add").click();
+            Thread.sleep(SLEEP_TIME);
+        }
+        propertyvalues.put("type", itemType);
+        propertyvalues.put("defaultValue", defaultValue);
+        propertyvalues.put("description", description);
+        propertyvalues.put("name", name);
 
-	public static void vlidateProperties(Map<String, String> propertyValues) throws InterruptedException {
-		WebElement name = GeneralUIUtils.getWebElementByTestID(propertyValues.get("name"));
-		name.getText().equalsIgnoreCase(propertyValues.get("name"));
-		WebElement defaultValue = GeneralUIUtils.getWebElementByTestID(propertyValues.get("name"));
-		defaultValue.getText().equalsIgnoreCase(propertyValues.get("defaultValue"));
-		WebElement type = GeneralUIUtils.getWebElementByTestID(propertyValues.get("type"));
-		type.getText().equalsIgnoreCase(propertyValues.get("type"));
-	}
+        return propertyvalues;
+    }
 
-	public static void addNewProperty(PropertyTypeEnum property) {
-		GeneralUIUtils.ultimateWait();
-		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Adding new %s property", property.name()));
-		PropertiesPage.clickAddPropertyArtifact();
-		PropertiesPage.getPropertyPopup().insertPropertyName(property.getName());
-		PropertiesPage.getPropertyPopup().selectPropertyType(property.getType());
-		PropertiesPage.getPropertyPopup().insertPropertyDescription(property.getDescription());
-		PropertiesPage.getPropertyPopup().insertPropertyDefaultValue(property.getValue());
-		PropertiesPage.getPropertyPopup().clickSave();
-	}
-	
-	public static void updateProperty(PropertyTypeEnum property) {
-		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Updating property: %s", property.name()));
-		PropertiesPage.clickOnProperty(property.getName());
-		PropertiesPage.getPropertyPopup().insertPropertyDescription(property.getUpdateDescription());
-		PropertiesPage.getPropertyPopup().insertPropertyDefaultValue(property.getUpdateValue());
-		PropertiesPage.getPropertyPopup().clickSave();
-	}
-	
-	public static void changePropertyDefaultValueInComposition(String propertyName, String defaultValue) {
-		GeneralUIUtils.clickOnElementByTestId(propertyName);
-		PropertiesPage.getPropertyPopup().insertPropertyDefaultValue(defaultValue);
-		PropertiesPage.getPropertyPopup().clickSave();
-	}
+    public static void vlidateProperties(Map<String, String> propertyValues) throws InterruptedException {
+        WebElement name = GeneralUIUtils.getWebElementByTestID(propertyValues.get("name"));
+        name.getText().equalsIgnoreCase(propertyValues.get("name"));
+        WebElement defaultValue = GeneralUIUtils.getWebElementByTestID(propertyValues.get("name"));
+        defaultValue.getText().equalsIgnoreCase(propertyValues.get("defaultValue"));
+        WebElement type = GeneralUIUtils.getWebElementByTestID(propertyValues.get("type"));
+        type.getText().equalsIgnoreCase(propertyValues.get("type"));
+    }
+
+    public static void addNewProperty(PropertyTypeEnum property) {
+        GeneralUIUtils.ultimateWait();
+        SetupCDTest.getExtendTest().log(Status.INFO, String.format("Adding new %s property", property.name()));
+        PropertiesPage.clickAddPropertyArtifact();
+        PropertiesPage.getPropertyPopup().insertPropertyName(property.getName());
+        PropertiesPage.getPropertyPopup().selectPropertyType(property.getType());
+        PropertiesPage.getPropertyPopup().insertPropertyDescription(property.getDescription());
+        PropertiesPage.getPropertyPopup().insertPropertyDefaultValue(property.getValue());
+        PropertiesPage.getPropertyPopup().clickSave();
+    }
+
+    public static void updateProperty(PropertyTypeEnum property) {
+        SetupCDTest.getExtendTest().log(Status.INFO, String.format("Updating property: %s", property.name()));
+        PropertiesPage.clickOnProperty(property.getName());
+        PropertiesPage.getPropertyPopup().insertPropertyDescription(property.getUpdateDescription());
+        PropertiesPage.getPropertyPopup().insertPropertyDefaultValue(property.getUpdateValue());
+        PropertiesPage.getPropertyPopup().clickSave();
+    }
+
+    public static void changePropertyDefaultValueInComposition(String propertyName, String defaultValue) {
+        GeneralUIUtils.clickOnElementByTestId(propertyName);
+        PropertiesPage.getPropertyPopup().insertPropertyDefaultValue(defaultValue);
+        PropertiesPage.getPropertyPopup().clickSave();
+    }
 
 }