1 files changed, 130 insertions, 126 deletions
diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/CatalogVerificator.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/CatalogVerificator.java
index 8230e7e5bf..d2aa1497ec 100644
--- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/CatalogVerificator.java
+++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/verificator/CatalogVerificator.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.
@@ -41,128 +41,132 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 public class CatalogVerificator {
-	
-	public static int getResourceNumber(ResourceTypeEnum resourceType, Map<String, List<Component>> catalogAsMap) throws Exception {
-		List<Component> resourcesArrayList = catalogAsMap.get("resources");
-		return resourcesArrayList.stream().
-				                  filter(s -> ((Resource)s).getResourceType().equals(resourceType)).
-				                  collect(Collectors.toList()).size();
-	}
-	
-	public static int getTypeNumber(TypesEnum enumtype) throws Exception{
-		Map<String, List<Component>> catalogAsMap = RestCDUtils.getCatalogAsMap();
-		switch (enumtype) {
-		case RESOURCE:
-			return catalogAsMap.get("resources").size();
-		case SERVICE:
-			return catalogAsMap.get("services").size();
-		case PRODUCT:
-			return catalogAsMap.get("products").size();
-		default:
-			return getResourceNumber(ResourceTypeEnum.valueOf(enumtype.name()), catalogAsMap);
-		}		
-	}
-	
-	public static void validateType(TypesEnum enumtype) throws Exception{		
-		int numberOfElementsFromBE = getTypeNumber(enumtype);
-		int numberOfElementsFromUI = getNumberOfElementsFromCatalogHeader();
-		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Validating number of %s elements, should be %s ...", enumtype.name(), numberOfElementsFromBE));
-		Assert.assertEquals(numberOfElementsFromBE, numberOfElementsFromUI, String.format("Expected : %s, Actual: %s", numberOfElementsFromBE, numberOfElementsFromUI));
-	}
-	
-	public static int getStatusNumber(List<LifeCycleStateEnum> status) throws Exception {
-		Map<String, List<Component>> catalogAsMap = RestCDUtils.getCatalogAsMap();
-		return catalogAsMap.entrySet().stream().
-				            map(s -> s.getValue()).
-				            flatMap(List::stream).
-				            filter(s->(s != null && status.contains(mapBeLifecycleToUIStatus(s)))).
-				            collect(Collectors.toList()).size();
-	}
-
-	public static void validateStatus(List<LifeCycleStateEnum> status, String checkboxName) throws Exception{
-		int numberOfElementsFromBE = getStatusNumber(status);
-		int numberOfElementsFromUI = getNumberOfElementsFromCatalogHeader();
-		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Validating number of %s elements , should be %s ...", checkboxName, numberOfElementsFromBE));
-		Assert.assertEquals(numberOfElementsFromBE, numberOfElementsFromUI, String.format("Expected : %s, Actual: %s", numberOfElementsFromBE, numberOfElementsFromUI));
-	}
-	
-	public static int getCategoryNumber(String categoryName) throws Exception {
-		Map<String, List<Component>> catalogAsMap = RestCDUtils.getCatalogAsMap();
-		List<Component> serviceAndResourceList = new ArrayList<>();
-		serviceAndResourceList.addAll(catalogAsMap.get("resources"));
-		serviceAndResourceList.addAll(catalogAsMap.get("services"));
-		List<Component> list = new ArrayList<>();
-		if(!serviceAndResourceList.isEmpty()) {
-			for (Component s : serviceAndResourceList) {
-				if (s.getCategories().get(0).getName().equals(categoryName)) {
-					list.add(s);
-				}
-			}
-		}
-		return list.size();
-	}
-	
-	public static void validateCategory(String categoryName) throws Exception{
-//		int numberOfElementsFromBE = getCategoryNumber(categoryName);
-		int numberOfElementsFromUI = getNumberOfElementsFromCatalogHeader();
-		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Validating number of %s category elements , should be %s ...", categoryName, "more or equal to 0 elements "));
-		Assert.assertTrue(numberOfElementsFromUI >= 0, String.format("Expected : %s, Actual: %s", "more or equal to 0 elements ", numberOfElementsFromUI));
-	}
-	
-	public static int getSubCategoryNumber(String categoryName , String subCategoryName) throws Exception {
-		Map<String, List<Component>> catalogAsMap = RestCDUtils.getCatalogAsMap();
-		List<Component> resourcesArrayList = catalogAsMap.get("resources");
-		List<Component> list = new ArrayList<>();
-		if(!resourcesArrayList.isEmpty()) {
-			for (Component s : resourcesArrayList) {
-				if (s.getCategories().get(0).getName().equalsIgnoreCase(categoryName) &&
-						s.getCategories().get(0).getSubcategories().get(0).getName().equalsIgnoreCase(subCategoryName)) {
-					list.add(s);
-				}
-			}
-		}
-		return list.size();
-	}
-	
-	public static void validateSubCategory(String categoryName, String subCategoryName) throws Exception{
-		//int numberOfElementsFromBE = getSubCategoryNumber(categoryName, subCategoryName);
-
-		int numberOfElementsFromUI = getNumberOfElementsFromCatalogHeader();
-		SetupCDTest.getExtendTest().log(Status.INFO, String.format("Validating number of %s/%s subcategory elements , should be %s ...", categoryName, subCategoryName, "more then 0 elements "));
-		Assert.assertTrue(numberOfElementsFromUI > 0, String.format("Expected : %s, Actual: %s", "more then 0 elements ", numberOfElementsFromUI));
-	}
-	
-	public static int getNumberOfElementsFromCatalogHeader(){
-		String elementsAsString = GeneralUIUtils.getWebElementByClassName("w-sdc-dashboard-catalog-items-header").getText();
-		String numberOfElementsAsString = elementsAsString.split(" ")[0];
-		if (numberOfElementsAsString.equals("No")){
-			return 0;
-		} else {
-			return Integer.parseInt(numberOfElementsAsString);
-		}		
-	}
-	
-	private static LifeCycleStateEnum mapBeLifecycleToUIStatus(Component component){
-		boolean isServiceAndDistributed = component.getComponentType().equals(ComponentTypeEnum.SERVICE) &&
-				                          ((Service) component).getDistributionStatus().equals(DistributionStatusEnum.DISTRIBUTED);
-		switch (component.getLifecycleState()) {
-		case CERTIFIED:
-			if (isServiceAndDistributed){
-				return LifeCycleStateEnum.DISTRIBUTED;
-			} else {
-			    return LifeCycleStateEnum.CERTIFIED;
-			}
-		case READY_FOR_CERTIFICATION:
-			return LifeCycleStateEnum.READY_FOR_TESTING;
-		case CERTIFICATION_IN_PROGRESS:
-			return LifeCycleStateEnum.IN_TESTING;
-		case NOT_CERTIFIED_CHECKIN:
-			return LifeCycleStateEnum.CHECKIN;  //to IN DESIGN
-		case NOT_CERTIFIED_CHECKOUT:
-			return LifeCycleStateEnum.CHECKOUT;	//to IN DESIGN
-		default:
-	        throw new TestNGException("Missing enum value in enum converter");
-		}
-	}
-		
+
+    private CatalogVerificator() {
+        
+    }
+
+    public static int getResourceNumber(ResourceTypeEnum resourceType, Map<String, List<Component>> catalogAsMap) throws Exception {
+        List<Component> resourcesArrayList = catalogAsMap.get("resources");
+        return resourcesArrayList.stream().
+                filter(s -> ((Resource) s).getResourceType().equals(resourceType)).
+                collect(Collectors.toList()).size();
+    }
+
+    public static int getTypeNumber(TypesEnum enumtype) throws Exception {
+        Map<String, List<Component>> catalogAsMap = RestCDUtils.getCatalogAsMap();
+        switch (enumtype) {
+            case RESOURCE:
+                return catalogAsMap.get("resources").size();
+            case SERVICE:
+                return catalogAsMap.get("services").size();
+            case PRODUCT:
+                return catalogAsMap.get("products").size();
+            default:
+                return getResourceNumber(ResourceTypeEnum.valueOf(enumtype.name()), catalogAsMap);
+        }
+    }
+
+    public static void validateType(TypesEnum enumtype) throws Exception {
+        int numberOfElementsFromBE = getTypeNumber(enumtype);
+        int numberOfElementsFromUI = getNumberOfElementsFromCatalogHeader();
+        SetupCDTest.getExtendTest().log(Status.INFO, String.format("Validating number of %s elements, should be %s ...", enumtype.name(), numberOfElementsFromBE));
+        Assert.assertEquals(numberOfElementsFromBE, numberOfElementsFromUI, String.format("Expected : %s, Actual: %s", numberOfElementsFromBE, numberOfElementsFromUI));
+    }
+
+    public static int getStatusNumber(List<LifeCycleStateEnum> status) throws Exception {
+        Map<String, List<Component>> catalogAsMap = RestCDUtils.getCatalogAsMap();
+        return catalogAsMap.entrySet().stream().
+                map(s -> s.getValue()).
+                flatMap(List::stream).
+                filter(s -> (s != null && status.contains(mapBeLifecycleToUIStatus(s)))).
+                collect(Collectors.toList()).size();
+    }
+
+    public static void validateStatus(List<LifeCycleStateEnum> status, String checkboxName) throws Exception {
+        int numberOfElementsFromBE = getStatusNumber(status);
+        int numberOfElementsFromUI = getNumberOfElementsFromCatalogHeader();
+        SetupCDTest.getExtendTest().log(Status.INFO, String.format("Validating number of %s elements , should be %s ...", checkboxName, numberOfElementsFromBE));
+        Assert.assertEquals(numberOfElementsFromBE, numberOfElementsFromUI, String.format("Expected : %s, Actual: %s", numberOfElementsFromBE, numberOfElementsFromUI));
+    }
+
+    public static int getCategoryNumber(String categoryName) throws Exception {
+        Map<String, List<Component>> catalogAsMap = RestCDUtils.getCatalogAsMap();
+        List<Component> serviceAndResourceList = new ArrayList<>();
+        serviceAndResourceList.addAll(catalogAsMap.get("resources"));
+        serviceAndResourceList.addAll(catalogAsMap.get("services"));
+        List<Component> list = new ArrayList<>();
+        if (!serviceAndResourceList.isEmpty()) {
+            for (Component s : serviceAndResourceList) {
+                if (s.getCategories().get(0).getName().equals(categoryName)) {
+                    list.add(s);
+                }
+            }
+        }
+        return list.size();
+    }
+
+    public static void validateCategory(String categoryName) throws Exception {
+        //int numberOfElementsFromBE = getCategoryNumber(categoryName);
+        int numberOfElementsFromUI = getNumberOfElementsFromCatalogHeader();
+        SetupCDTest.getExtendTest().log(Status.INFO, String.format("Validating number of %s category elements , should be %s ...", categoryName, "more or equal to 0 elements "));
+        Assert.assertTrue(numberOfElementsFromUI >= 0, String.format("Expected : %s, Actual: %s", "more or equal to 0 elements ", numberOfElementsFromUI));
+    }
+
+    public static int getSubCategoryNumber(String categoryName, String subCategoryName) throws Exception {
+        Map<String, List<Component>> catalogAsMap = RestCDUtils.getCatalogAsMap();
+        List<Component> resourcesArrayList = catalogAsMap.get("resources");
+        List<Component> list = new ArrayList<>();
+        if (!resourcesArrayList.isEmpty()) {
+            for (Component s : resourcesArrayList) {
+                if (s.getCategories().get(0).getName().equalsIgnoreCase(categoryName)
+                        && s.getCategories().get(0).getSubcategories().get(0).getName().equalsIgnoreCase(subCategoryName)) {
+                    list.add(s);
+                }
+            }
+        }
+        return list.size();
+    }
+
+    public static void validateSubCategory(String categoryName, String subCategoryName) throws Exception {
+        //int numberOfElementsFromBE = getSubCategoryNumber(categoryName, subCategoryName);
+
+        int numberOfElementsFromUI = getNumberOfElementsFromCatalogHeader();
+        SetupCDTest.getExtendTest().log(Status.INFO, String.format("Validating number of %s/%s subcategory elements , should be %s ...", categoryName, subCategoryName, "more then 0 elements "));
+        Assert.assertTrue(numberOfElementsFromUI > 0, String.format("Expected : %s, Actual: %s", "more then 0 elements ", numberOfElementsFromUI));
+    }
+
+    public static int getNumberOfElementsFromCatalogHeader() {
+        String elementsAsString = GeneralUIUtils.getWebElementByClassName("w-sdc-dashboard-catalog-items-header").getText();
+        String numberOfElementsAsString = elementsAsString.split(" ")[0];
+        if (numberOfElementsAsString.equals("No")) {
+            return 0;
+        } else {
+            return Integer.parseInt(numberOfElementsAsString);
+        }
+    }
+
+    private static LifeCycleStateEnum mapBeLifecycleToUIStatus(Component component) {
+        boolean isServiceAndDistributed = component.getComponentType().equals(ComponentTypeEnum.SERVICE)
+                && ((Service) component).getDistributionStatus().equals(DistributionStatusEnum.DISTRIBUTED);
+        switch (component.getLifecycleState()) {
+            case CERTIFIED:
+                if (isServiceAndDistributed) {
+                    return LifeCycleStateEnum.DISTRIBUTED;
+                } else {
+                    return LifeCycleStateEnum.CERTIFIED;
+                }
+            case READY_FOR_CERTIFICATION:
+                return LifeCycleStateEnum.READY_FOR_TESTING;
+            case CERTIFICATION_IN_PROGRESS:
+                return LifeCycleStateEnum.IN_TESTING;
+            case NOT_CERTIFIED_CHECKIN:
+                return LifeCycleStateEnum.CHECKIN;  //to IN DESIGN
+            case NOT_CERTIFIED_CHECKOUT:
+                return LifeCycleStateEnum.CHECKOUT;    //to IN DESIGN
+            default:
+                throw new TestNGException("Missing enum value in enum converter");
+        }
+    }
+
 }