diff options
Diffstat (limited to 'ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/CatalogLeftPanelTestWithTime.java')
-rw-r--r-- | ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/CatalogLeftPanelTestWithTime.java | 409 |
1 files changed, 211 insertions, 198 deletions
diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/CatalogLeftPanelTestWithTime.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/CatalogLeftPanelTestWithTime.java index dda6dd438f..87c10688a8 100644 --- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/CatalogLeftPanelTestWithTime.java +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/sanity/CatalogLeftPanelTestWithTime.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. @@ -22,12 +22,22 @@ package org.openecomp.sdc.ci.tests.execute.sanity; import com.aventstack.extentreports.Status; import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; -import org.openecomp.sdc.ci.tests.datatypes.*; +import org.openecomp.sdc.ci.tests.datatypes.CheckBoxStatusEnum; +import org.openecomp.sdc.ci.tests.datatypes.DataTestIdEnum; import org.openecomp.sdc.ci.tests.datatypes.DataTestIdEnum.CatalogPageLeftPanelSubCategoryCheckbox; +import org.openecomp.sdc.ci.tests.datatypes.LifeCycleStateEnum; +import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails; +import org.openecomp.sdc.ci.tests.datatypes.ServiceReqDetails; +import org.openecomp.sdc.ci.tests.datatypes.TopMenuButtonsEnum; +import org.openecomp.sdc.ci.tests.datatypes.TypesEnum; import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum; import org.openecomp.sdc.ci.tests.execute.setup.SetupCDTest; import org.openecomp.sdc.ci.tests.pages.ResourceGeneralPage; -import org.openecomp.sdc.ci.tests.utilities.*; +import org.openecomp.sdc.ci.tests.utilities.CatalogUIUtilitis; +import org.openecomp.sdc.ci.tests.utilities.FileHandling; +import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.openecomp.sdc.ci.tests.utilities.ResourceUIUtils; +import org.openecomp.sdc.ci.tests.utilities.ServiceUIUtils; import org.openecomp.sdc.ci.tests.utils.Utils; import org.openecomp.sdc.ci.tests.utils.general.ElementFactory; import org.openecomp.sdc.ci.tests.verificator.CatalogVerificator; @@ -40,87 +50,90 @@ import java.util.Arrays; import java.util.List; import static org.testng.AssertJUnit.assertTrue; + @Test(singleThreaded = true) -public class CatalogLeftPanelTestWithTime extends SetupCDTest{ - - private String filePath; - @BeforeMethod - public void beforeTest(){ - filePath = FileHandling.getFilePath(""); - } - - public static String[] resourceTypes = Arrays.stream(ResourceTypeEnum.class.getEnumConstants()). - map(ResourceTypeEnum::name).toArray(String[]::new); - - public static String[] catalogTypes = {"RESOURCE", "SERVICE"}; - - public static Object[][] provideData(String[] arObj) { - Object[][] arObject = new Object[arObj.length][]; +public class CatalogLeftPanelTestWithTime extends SetupCDTest { + + private static final int REGULAR_TEST_RUN_TIME = 400; + private String filePath; + + @BeforeMethod + public void beforeTest() { + filePath = FileHandling.getFilePath(""); + } + + private static String[] resourceTypes = Arrays.stream(ResourceTypeEnum.class.getEnumConstants()). + map(ResourceTypeEnum::name).toArray(String[]::new); + + private static String[] catalogTypes = {"RESOURCE", "SERVICE"}; + + private static Object[][] provideData(String[] arObj) { + Object[][] arObject = new Object[arObj.length][]; + + int index = 0; + for (Object obj : arObj) { + arObject[index++] = new Object[]{obj}; + } + return arObject; + } + + @DataProvider(name = "Resource_Type_List") + private static Object[][] resourceTypeList() { + // Extract names of constants from enum as array of Strings + ResourceTypeEnum[] resourceEnums = {ResourceTypeEnum.CP, ResourceTypeEnum.VF, ResourceTypeEnum.VFC, ResourceTypeEnum.VL}; + String[] resourcesForTest = Arrays.stream(resourceEnums).map(ResourceTypeEnum::name).toArray(String[]::new); + return provideData(resourcesForTest); + } - int index = 0; - for (Object obj : arObj) { - arObject[index++] = new Object[]{obj}; - } - return arObject; - } - - @DataProvider(name = "Resource_Type_List") - private static final Object[][] resourceTypeList(){ - // Extract names of constants from enum as array of Strings - ResourceTypeEnum[] resourceEnums = {ResourceTypeEnum.CP, ResourceTypeEnum.VF, ResourceTypeEnum.VFC, ResourceTypeEnum.VL}; - String[] resourcesForTest = Arrays.stream(resourceEnums).map(ResourceTypeEnum::name).toArray(String[]::new); - return provideData(resourcesForTest); - } - - @DataProvider(name = "Type_List") - private static final Object[][] typeList(){ - // Extract names of constants from enum as array of Strings - Object[][] arObject = new Object[catalogTypes.length][]; - int index = 0; + @DataProvider(name = "Type_List") + private static Object[][] typeList() { + // Extract names of constants from enum as array of Strings + Object[][] arObject = new Object[catalogTypes.length][]; + int index = 0; for (String catalogType : catalogTypes) { - if (catalogType.equals("RESOURCE")){ - arObject[index++] = new Object[]{catalogType, resourceTypes}; - } else { - arObject[index++] = new Object[]{catalogType, new String[] {catalogType}}; - } - } - return arObject; - } - - @DataProvider(name = "Status_List") - private static final Object[][] statusList(){ - CheckBoxStatusEnum[] checkboxes = {CheckBoxStatusEnum.CERTIFIED, - CheckBoxStatusEnum.IN_DESIGN, - CheckBoxStatusEnum.DISTRIBUTED, - CheckBoxStatusEnum.IN_TESTING, - CheckBoxStatusEnum.READY_FOR_TESTING}; - Object[][] arObject = new Object[checkboxes.length][]; - int index = 0; - for (CheckBoxStatusEnum checkbox: checkboxes) { - if (checkbox.equals(CheckBoxStatusEnum.CERTIFIED)){ - arObject[index++] = new Object[]{checkbox, Arrays.asList(LifeCycleStateEnum.CERTIFIED, LifeCycleStateEnum.DISTRIBUTED, LifeCycleStateEnum.WAITING_FOR_DISTRIBUTION) }; - } else if (checkbox.equals(CheckBoxStatusEnum.IN_DESIGN)) { - arObject[index++] = new Object[]{checkbox, Arrays.asList(LifeCycleStateEnum.CHECKIN, LifeCycleStateEnum.CHECKOUT)}; - } else if (checkbox.equals(CheckBoxStatusEnum.DISTRIBUTED)) { - arObject[index++] = new Object[]{checkbox, Arrays.asList(LifeCycleStateEnum.DISTRIBUTED)}; - } else if (checkbox.equals(CheckBoxStatusEnum.IN_TESTING)) { - arObject[index++] = new Object[]{checkbox, Arrays.asList(LifeCycleStateEnum.IN_TESTING)}; - } else if (checkbox.equals(CheckBoxStatusEnum.READY_FOR_TESTING)) { - arObject[index++] = new Object[]{checkbox, Arrays.asList(LifeCycleStateEnum.READY_FOR_TESTING)}; - } - } - return arObject; - } + if (catalogType.equals("RESOURCE")) { + arObject[index++] = new Object[]{catalogType, resourceTypes}; + } else { + arObject[index++] = new Object[]{catalogType, new String[]{catalogType}}; + } + } + return arObject; + } + + @DataProvider(name = "Status_List") + private static Object[][] statusList() { + CheckBoxStatusEnum[] checkboxes = {CheckBoxStatusEnum.CERTIFIED, + CheckBoxStatusEnum.IN_DESIGN, + CheckBoxStatusEnum.DISTRIBUTED, + CheckBoxStatusEnum.IN_TESTING, + CheckBoxStatusEnum.READY_FOR_TESTING}; + Object[][] arObject = new Object[checkboxes.length][]; + int index = 0; + for (CheckBoxStatusEnum checkbox : checkboxes) { + if (checkbox.equals(CheckBoxStatusEnum.CERTIFIED)) { + arObject[index++] = new Object[]{checkbox, Arrays.asList(LifeCycleStateEnum.CERTIFIED, LifeCycleStateEnum.DISTRIBUTED, LifeCycleStateEnum.WAITING_FOR_DISTRIBUTION)}; + } else if (checkbox.equals(CheckBoxStatusEnum.IN_DESIGN)) { + arObject[index++] = new Object[]{checkbox, Arrays.asList(LifeCycleStateEnum.CHECKIN, LifeCycleStateEnum.CHECKOUT)}; + } else if (checkbox.equals(CheckBoxStatusEnum.DISTRIBUTED)) { + arObject[index++] = new Object[]{checkbox, Arrays.asList(LifeCycleStateEnum.DISTRIBUTED)}; + } else if (checkbox.equals(CheckBoxStatusEnum.IN_TESTING)) { + arObject[index++] = new Object[]{checkbox, Arrays.asList(LifeCycleStateEnum.IN_TESTING)}; + } else if (checkbox.equals(CheckBoxStatusEnum.READY_FOR_TESTING)) { + arObject[index++] = new Object[]{checkbox, Arrays.asList(LifeCycleStateEnum.READY_FOR_TESTING)}; + } + } + return arObject; + } - // filter by Type Resource in catalog - @Test(dataProvider = "Type_List") - public void filterByTypeWithTime(String catalogType, String[] classValues ) throws Exception { - setLog(catalogType); - //Load catalog + // filter by Type Resource in catalog + @Test(dataProvider = "Type_List") + public void filterByTypeWithTime(String catalogType, String[] classValues) throws Exception { + setLog(catalogType); + //Load catalog Long actualTestRunTime = GeneralUIUtils.getAndValidateActionDuration(() -> - CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG), 400); - SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog loading time is " + - actualTestRunTime + " seconds"); + CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG), REGULAR_TEST_RUN_TIME); + SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog loading time is " + + actualTestRunTime + " seconds"); //Filter by type actualTestRunTime = Utils.getAndValidateActionDuration(() -> { try { @@ -128,80 +141,80 @@ public class CatalogLeftPanelTestWithTime extends SetupCDTest{ } catch (Exception e) { e.printStackTrace(); } - }, 400); - SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog filtering time is " + - actualTestRunTime + " seconds"); + }, REGULAR_TEST_RUN_TIME); + SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog filtering time is " + + actualTestRunTime + " seconds"); //Validate number of elements after filtering - CatalogVerificator.validateType(TypesEnum.valueOf(catalogType)); - } - - @Test(dataProvider = "Resource_Type_List") - public void filterByResourceTypeWithTime(String resourceType) throws Exception { - setLog(resourceType); - //Load catalog + CatalogVerificator.validateType(TypesEnum.valueOf(catalogType)); + } + + @Test(dataProvider = "Resource_Type_List") + public void filterByResourceTypeWithTime(String resourceType) throws Exception { + setLog(resourceType); + //Load catalog Long actualTestRunTime = Utils.getAndValidateActionDuration(() -> - CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG), 400); - SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog loading time is " + - actualTestRunTime + " seconds"); - //Filter by resource type - actualTestRunTime = Utils.getAndValidateActionDuration(() -> { - try { - CatalogUIUtilitis.catalogFilterTypeChecBox(TypesEnum.valueOf(resourceType)); - } catch (Exception e) { - e.printStackTrace(); - } - }, 400); - SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog filtering time is " + - actualTestRunTime + " seconds"); - //Validate number of elements after filtering - CatalogVerificator.validateType(TypesEnum.valueOf(resourceType)); - } - - @Test(dataProvider = "Status_List") - public void filterByStatus(CheckBoxStatusEnum statusCheckbox, List<LifeCycleStateEnum> lifecycleStates) throws Exception{ - setLog(statusCheckbox.name()); + CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG), REGULAR_TEST_RUN_TIME); + SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog loading time is " + + actualTestRunTime + " seconds"); + //Filter by resource type + actualTestRunTime = Utils.getAndValidateActionDuration(() -> { + try { + CatalogUIUtilitis.catalogFilterTypeChecBox(TypesEnum.valueOf(resourceType)); + } catch (Exception e) { + e.printStackTrace(); + } + }, REGULAR_TEST_RUN_TIME); + SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog filtering time is " + + actualTestRunTime + " seconds"); + //Validate number of elements after filtering + CatalogVerificator.validateType(TypesEnum.valueOf(resourceType)); + } + + @Test(dataProvider = "Status_List") + public void filterByStatus(CheckBoxStatusEnum statusCheckbox, List<LifeCycleStateEnum> lifecycleStates) throws Exception { + setLog(statusCheckbox.name()); //Load catalog Long actualTestRunTime = Utils.getAndValidateActionDuration(() -> - CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG), 400); - SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog loading time is " + - actualTestRunTime + " seconds"); - CatalogUIUtilitis.clickOnLeftPanelElement(DataTestIdEnum.CatalogPageLeftPanelFilterTitle.CATEGORIES); + CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG), REGULAR_TEST_RUN_TIME); + SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog loading time is " + + actualTestRunTime + " seconds"); + CatalogUIUtilitis.clickOnLeftPanelElement(DataTestIdEnum.CatalogPageLeftPanelFilterTitle.CATEGORIES); //Filter by resource type - actualTestRunTime = Utils.getAndValidateActionDuration(() -> CatalogUIUtilitis.catalogFilterStatusChecBox(statusCheckbox), 400); - SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog filtering time is " + - actualTestRunTime + " seconds"); - //TODO check the test after removing lifecycle steps for resource + actualTestRunTime = Utils.getAndValidateActionDuration(() -> CatalogUIUtilitis.catalogFilterStatusChecBox(statusCheckbox), REGULAR_TEST_RUN_TIME); + SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog filtering time is " + + actualTestRunTime + " seconds"); + //TODO check the test after removing lifecycle steps for resource //Validate number of elements after filtering - CatalogVerificator.validateStatus(lifecycleStates, statusCheckbox.name()); - } + CatalogVerificator.validateStatus(lifecycleStates, statusCheckbox.name()); + } - @Test - public void filterByUpperCategory() throws Exception{ + @Test + public void filterByUpperCategory() throws Exception { //Load catalog Long actualTestRunTime = Utils.getAndValidateActionDuration(() -> - CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG), 400); - SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog loading time is " + - actualTestRunTime + " seconds"); + CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG), REGULAR_TEST_RUN_TIME); + SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog loading time is " + + actualTestRunTime + " seconds"); //Filter by Upper Category - CatalogUIUtilitis.clickOnLeftPanelElement(DataTestIdEnum.CatalogPageLeftPanelFilterTitle.TYPE); - actualTestRunTime = Utils.getAndValidateActionDuration(() -> CatalogUIUtilitis.clickOnUpperCategoryCheckbox(), 400); - SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog filtering time is " + - actualTestRunTime + " seconds"); - WebElement categoryCheckbox = CatalogUIUtilitis.getCategoryCheckbox(); - CatalogVerificator.validateCategory(categoryCheckbox.getAttribute("textContent").trim()); - } + CatalogUIUtilitis.clickOnLeftPanelElement(DataTestIdEnum.CatalogPageLeftPanelFilterTitle.TYPE); + actualTestRunTime = Utils.getAndValidateActionDuration(() -> CatalogUIUtilitis.clickOnUpperCategoryCheckbox(), REGULAR_TEST_RUN_TIME); + SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog filtering time is " + + actualTestRunTime + " seconds"); + WebElement categoryCheckbox = CatalogUIUtilitis.getCategoryCheckbox(); + CatalogVerificator.validateCategory(categoryCheckbox.getAttribute("textContent").trim()); + } - @Test - public void filterByGenericDatabaseSubCategory() throws Exception{ + @Test + public void filterByGenericDatabaseSubCategory() throws Exception { //Load catalog Long actualTestRunTime = Utils.getAndValidateActionDuration(() -> - CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG), 400); - SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog loading time is " + - actualTestRunTime + " seconds"); - CatalogUIUtilitis.clickOnLeftPanelElement(DataTestIdEnum.CatalogPageLeftPanelFilterTitle.TYPE); + CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG), REGULAR_TEST_RUN_TIME); + SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog loading time is " + + actualTestRunTime + " seconds"); + CatalogUIUtilitis.clickOnLeftPanelElement(DataTestIdEnum.CatalogPageLeftPanelFilterTitle.TYPE); WebElement checkboxElement = GeneralUIUtils.getElementsByCSS(CatalogPageLeftPanelSubCategoryCheckbox.DATABASE.getValue()).get(0); - String checkboxElementName = checkboxElement.getAttribute("textContent").trim(); - SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on %s subcategory ...", checkboxElementName)); + String checkboxElementName = checkboxElement.getAttribute("textContent").trim(); + SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on %s subcategory ...", checkboxElementName)); //Filter by sub category actualTestRunTime = Utils.getAndValidateActionDuration(() -> { try { @@ -209,74 +222,74 @@ public class CatalogLeftPanelTestWithTime extends SetupCDTest{ } catch (Exception e) { e.printStackTrace(); } - }, 400); - SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog filtering time is " + - actualTestRunTime + " seconds"); + }, REGULAR_TEST_RUN_TIME); + SetupCDTest.getExtendTest().log(Status.INFO, "Actual catalog filtering time is " + + actualTestRunTime + " seconds"); //Validate filtering results - CatalogVerificator.validateSubCategory("Generic", checkboxElementName); - } - - @Test(priority = 1) - public void lastUpdatedService() throws Exception{ - // create service - ServiceReqDetails serviceMetadata = ElementFactory.getDefaultService(); - ServiceUIUtils.createService(serviceMetadata, getUser()); - - ResourceGeneralPage.clickCheckinButton(serviceMetadata.getName()); - CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG); - List<WebElement> cardElements = GeneralUIUtils.getElementsByCSS(DataTestIdEnum.DashboardCardEnum.INFO_NAME.getValue()); - String firstElementName = cardElements.get(0).getAttribute("textContent").trim(); - assertTrue(String.format("Wrong element name, Expected : %s , Actual: %s", serviceMetadata.getName(), firstElementName), serviceMetadata.getName().equals(firstElementName)); - } - - @Test(priority = 17) - public void lastUpdatedResource() throws Exception{ - // create resource - ResourceReqDetails vfMetaData = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF, getUser()); - ResourceUIUtils.createVF(vfMetaData, getUser()); - - ResourceGeneralPage.clickCheckinButton(vfMetaData.getName()); - CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG); - List<WebElement> cardElements = GeneralUIUtils.getElementsByCSS(DataTestIdEnum.DashboardCardEnum.INFO_NAME.getValue()); - String firstElementName = cardElements.get(0).getAttribute("textContent").trim(); - assertTrue(String.format("Wrong element name, Expected : %s , Actual: %s", vfMetaData.getName(), firstElementName), vfMetaData.getName().equals(firstElementName)); - } - - @Test(priority = 5) - public void fromCatalogCheckout() throws Exception{ - // create resource - ResourceReqDetails vfMetaData = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF, getUser()); - ResourceUIUtils.createVF(vfMetaData, getUser()); - ResourceGeneralPage.clickCheckinButton(vfMetaData.getName()); - CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG); + CatalogVerificator.validateSubCategory("Generic", checkboxElementName); + } + + @Test(priority = 1) + public void lastUpdatedService() throws Exception { + // create service + ServiceReqDetails serviceMetadata = ElementFactory.getDefaultService(); + ServiceUIUtils.createService(serviceMetadata, getUser()); + + ResourceGeneralPage.clickCheckinButton(serviceMetadata.getName()); + CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG); + List<WebElement> cardElements = GeneralUIUtils.getElementsByCSS(DataTestIdEnum.DashboardCardEnum.INFO_NAME.getValue()); + String firstElementName = cardElements.get(0).getAttribute("textContent").trim(); + assertTrue(String.format("Wrong element name, Expected : %s , Actual: %s", serviceMetadata.getName(), firstElementName), serviceMetadata.getName().equals(firstElementName)); + } + + @Test(priority = 17) + public void lastUpdatedResource() throws Exception { + // create resource + ResourceReqDetails vfMetaData = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF, getUser()); + ResourceUIUtils.createVF(vfMetaData, getUser()); + + ResourceGeneralPage.clickCheckinButton(vfMetaData.getName()); + CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG); + List<WebElement> cardElements = GeneralUIUtils.getElementsByCSS(DataTestIdEnum.DashboardCardEnum.INFO_NAME.getValue()); + String firstElementName = cardElements.get(0).getAttribute("textContent").trim(); + assertTrue(String.format("Wrong element name, Expected : %s , Actual: %s", vfMetaData.getName(), firstElementName), vfMetaData.getName().equals(firstElementName)); + } + + @Test(priority = 5) + public void fromCatalogCheckout() throws Exception { + // create resource + ResourceReqDetails vfMetaData = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF, getUser()); + ResourceUIUtils.createVF(vfMetaData, getUser()); + ResourceGeneralPage.clickCheckinButton(vfMetaData.getName()); + CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG); //Search in catalog - GeneralUIUtils.findComponentAndClick(vfMetaData.getName()); - ResourceGeneralPage.clickCheckoutButton(); - ResourceGeneralPage.clickCheckinButton(vfMetaData.getName()); - } + GeneralUIUtils.findComponentAndClick(vfMetaData.getName()); + ResourceGeneralPage.clickCheckoutButton(); + ResourceGeneralPage.clickCheckinButton(vfMetaData.getName()); + } @Test - public void keepSearchResultsInCatalogAfterBrowserBack() throws Exception{ - ResourceReqDetails resourceMetadata = ElementFactory.getDefaultResource(); - ResourceUIUtils.createVF(resourceMetadata, getUser()); - ResourceGeneralPage.clickCheckinButton(resourceMetadata.getName()); - CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG); + public void keepSearchResultsInCatalogAfterBrowserBack() throws Exception { + ResourceReqDetails resourceMetadata = ElementFactory.getDefaultResource(); + ResourceUIUtils.createVF(resourceMetadata, getUser()); + ResourceGeneralPage.clickCheckinButton(resourceMetadata.getName()); + CatalogUIUtilitis.clickTopMenuButton(TopMenuButtonsEnum.CATALOG); CatalogUIUtilitis.catalogSearchBox(resourceMetadata.getName()); GeneralUIUtils.findComponentAndClick(resourceMetadata.getName()); - GeneralUIUtils.clickOnBrowserBackButton(); + GeneralUIUtils.clickOnBrowserBackButton(); - int numOfElementsInFilteredCatalog = CatalogVerificator.getNumberOfElementsFromCatalogHeader(); - assertTrue(String.format("Wrong number fo elements, Expected : %s , Actual: %s", 1, numOfElementsInFilteredCatalog), numOfElementsInFilteredCatalog == 1 ); + int numOfElementsInFilteredCatalog = CatalogVerificator.getNumberOfElementsFromCatalogHeader(); + assertTrue(String.format("Wrong number fo elements, Expected : %s , Actual: %s", 1, numOfElementsInFilteredCatalog), numOfElementsInFilteredCatalog == 1); - List<WebElement> cardElements = GeneralUIUtils.getElementsByCSS(DataTestIdEnum.DashboardCardEnum.INFO_NAME.getValue()); - String firstElementName = cardElements.get(0).getAttribute("textContent").trim(); - assertTrue(String.format("Wrong element name, Expected : %s , Actual: %s", resourceMetadata.getName(), firstElementName), resourceMetadata.getName().equals(firstElementName)); + List<WebElement> cardElements = GeneralUIUtils.getElementsByCSS(DataTestIdEnum.DashboardCardEnum.INFO_NAME.getValue()); + String firstElementName = cardElements.get(0).getAttribute("textContent").trim(); + assertTrue(String.format("Wrong element name, Expected : %s , Actual: %s", resourceMetadata.getName(), firstElementName), resourceMetadata.getName().equals(firstElementName)); } - @Override - protected UserRoleEnum getRole() { - return UserRoleEnum.DESIGNER; - } + @Override + protected UserRoleEnum getRole() { + return UserRoleEnum.DESIGNER; + } } |