From e10dbb0c75c3e2bcfc6f6fbcb6cb8bc9a1f0d766 Mon Sep 17 00:00:00 2001 From: NatashaPirogova Date: Fri, 11 May 2018 20:03:02 +0400 Subject: [PATCH] END --- Pirogova/src/test/java/ExternalLinks.java | 1 - Pirogova/src/test/java/NavigationMenu.java | 12 ------------ Pirogova/src/test/java/Search.java | 2 -- Pirogova/src/test/java/WorkWithDocument.java | 4 ---- 4 files changed, 19 deletions(-) diff --git a/Pirogova/src/test/java/ExternalLinks.java b/Pirogova/src/test/java/ExternalLinks.java index 7caf6dc..233ae95 100644 --- a/Pirogova/src/test/java/ExternalLinks.java +++ b/Pirogova/src/test/java/ExternalLinks.java @@ -37,7 +37,6 @@ public class ExternalLinks { MainPage page = PageFactory.initElements(context.getDriver(), MainPage.class); page.clickCompanySubmenu(); SubMenuPage subPage = PageFactory.initElements(context.getDriver(), SubMenuPage.class); - Assertions.assertTrue(subPage.isPageDisplaySubmenu()); subPage.clickSidebarExternalElement(); ExternalPage externalPage = PageFactory.initElements(context.getDriver(), ExternalPage.class); Assertions.assertTrue(externalPage.isPageDisplayExternalSidebar()); diff --git a/Pirogova/src/test/java/NavigationMenu.java b/Pirogova/src/test/java/NavigationMenu.java index 96dbaea..cc37420 100644 --- a/Pirogova/src/test/java/NavigationMenu.java +++ b/Pirogova/src/test/java/NavigationMenu.java @@ -29,7 +29,6 @@ public class NavigationMenu { MainPage page = PageFactory.initElements(context.getDriver(), MainPage.class); page.clickCompanySubmenu(); SubMenuPage subPage = PageFactory.initElements(context.getDriver(), SubMenuPage.class); - Assertions.assertTrue(subPage.isPageDisplaySubmenu()); subPage.clickLogoElement(); Assertions.assertTrue(page.isPageDisplayMain()); } @@ -62,7 +61,6 @@ public class NavigationMenu { context.getDriver().get(APP_URL); MainPage page = PageFactory.initElements(context.getDriver(), MainPage.class); page.clickCompanyMenu(); - Assertions.assertTrue(page.isPageDisplayMenu()); page.clickAdditionalInfoMenu(); AboutCompanyPage aboutPage = PageFactory.initElements(context.getDriver(), AboutCompanyPage.class); Assertions.assertTrue(aboutPage.isPageDisplayAboutCompany()); @@ -73,13 +71,10 @@ public class NavigationMenu { context.getDriver().get(APP_URL); MainPage page = PageFactory.initElements(context.getDriver(), MainPage.class); page.clickCompanyMenu(); - Assertions.assertTrue(page.isPageDisplayMenu()); page.clickAdditionalInfoMenu(); AboutCompanyPage aboutPage = PageFactory.initElements(context.getDriver(), AboutCompanyPage.class); - Assertions.assertTrue(aboutPage.isPageDisplayAboutCompany()); aboutPage.clickNextElement(); ActivitiesCompanyPage activitiesCompanyPage = PageFactory.initElements(context.getDriver(), ActivitiesCompanyPage.class); - Assertions.assertTrue(activitiesCompanyPage.isPageDisplayActivitiesCompany()); activitiesCompanyPage.clickPreviousElement(); Assertions.assertTrue(aboutPage.isPageDisplayAboutCompany()); } @@ -89,9 +84,7 @@ public class NavigationMenu { MainPage page = PageFactory.initElements(context.getDriver(), MainPage.class); page.clickCompanySubmenu(); SubMenuPage subPage = PageFactory.initElements(context.getDriver(), SubMenuPage.class); - Assertions.assertTrue(subPage.isPageDisplaySubmenu()); subPage.clickPlus(); - Assertions.assertTrue(subPage.isPageDisplayPlus()); SubMenuPage sub = PageFactory.initElements(context.getDriver(), SubMenuPage.class); sub.clickPlus(); Assertions.assertTrue(sub.isPageDisplayMinus()); @@ -102,12 +95,9 @@ public class NavigationMenu { MainPage page = PageFactory.initElements(context.getDriver(), MainPage.class); page.clickCompanySubmenu(); SubMenuPage subPage = PageFactory.initElements(context.getDriver(), SubMenuPage.class); - Assertions.assertTrue(subPage.isPageDisplaySubmenu()); subPage.clickPlus(); - Assertions.assertTrue(subPage.isPageDisplayPlus()); SubMenuPage sub = PageFactory.initElements(context.getDriver(), SubMenuPage.class); sub.clickPlus(); - Assertions.assertTrue(sub.isPageDisplayMinus()); subPage.clickPlus(); Assertions.assertTrue(subPage.isPageDisplayMinus()); } @@ -117,7 +107,6 @@ public class NavigationMenu { MainPage page = PageFactory.initElements(context.getDriver(), MainPage.class); page.clickCompanySubmenu(); SubMenuPage subPage = PageFactory.initElements(context.getDriver(), SubMenuPage.class); - Assertions.assertTrue(subPage.isPageDisplaySubmenu()); subPage.clickBreadcrumbsElement(); Assertions.assertTrue(page.isPageDisplayMenu()); } @@ -127,7 +116,6 @@ public class NavigationMenu { MainPage page = PageFactory.initElements(context.getDriver(), MainPage.class); page.clickCompanySubmenu(); SubMenuPage subPage = PageFactory.initElements(context.getDriver(), SubMenuPage.class); - Assertions.assertTrue(subPage.isPageDisplaySubmenu()); subPage.clickHyperlink(); FAQPage faqPage = PageFactory.initElements(context.getDriver(), FAQPage.class); Assertions.assertTrue(faqPage.isPageDisplayFAQ()); diff --git a/Pirogova/src/test/java/Search.java b/Pirogova/src/test/java/Search.java index f7c078b..40dd454 100644 --- a/Pirogova/src/test/java/Search.java +++ b/Pirogova/src/test/java/Search.java @@ -40,7 +40,6 @@ public class Search { page.insertSearchHeaderText("Проекты"); page.submitSearchHeader(); SearchPage searchPage = PageFactory.initElements(context.getDriver(), SearchPage.class); - Assertions.assertTrue(searchPage.checkSearch()); searchPage.clickSearchFilterElement(); Assertions.assertTrue(searchPage.checkSearch()); } @@ -51,7 +50,6 @@ public class Search { page.insertSearchHeaderText("Проекты"); page.submitSearchHeader(); SearchPage searchPage = PageFactory.initElements(context.getDriver(), SearchPage.class); - Assertions.assertTrue(searchPage.checkSearch()); searchPage.clickSearchSortingElement(); Assertions.assertTrue(searchPage.checkSearch()); } diff --git a/Pirogova/src/test/java/WorkWithDocument.java b/Pirogova/src/test/java/WorkWithDocument.java index 1eddc78..cbe7832 100644 --- a/Pirogova/src/test/java/WorkWithDocument.java +++ b/Pirogova/src/test/java/WorkWithDocument.java @@ -32,7 +32,6 @@ public class WorkWithDocument { context.getDriver().get(APP_URL); MainPage page = PageFactory.initElements(context.getDriver(), MainPage.class); page.clickCompanyMenu(); - Assertions.assertTrue(page.isPageDisplayMenu()); page.clickAddToFavoritesElement(); Assertions.assertTrue(page.isMessageDisplay()); } @@ -42,7 +41,6 @@ public class WorkWithDocument { MainPage page = PageFactory.initElements(context.getDriver(), MainPage.class); page.clickCompanySubmenu(); SubMenuPage subPage = PageFactory.initElements(context.getDriver(), SubMenuPage.class); - Assertions.assertTrue(subPage.isPageDisplaySubmenu()); subPage.clickMyFavoritesElement(); MyFavoritesPage myFavoritesPage = PageFactory.initElements(context.getDriver(), MyFavoritesPage.class); Assertions.assertTrue(myFavoritesPage.isPageDisplayMyFavorites()); @@ -53,7 +51,6 @@ public class WorkWithDocument { MainPage page = PageFactory.initElements(context.getDriver(), MainPage.class); page.clickDocumentSubmenu(); SubMenuPage subPage = PageFactory.initElements(context.getDriver(), SubMenuPage.class); - Assertions.assertTrue(subPage.isPageDisplayDocuments()); subPage.clickAddDocumentToFavoritesElement(); Assertions.assertTrue(subPage.isMessageDisplay()); } @@ -63,7 +60,6 @@ public class WorkWithDocument { MainPage page = PageFactory.initElements(context.getDriver(), MainPage.class); page.clickDocumentSubmenu(); SubMenuPage subPage = PageFactory.initElements(context.getDriver(), SubMenuPage.class); - Assertions.assertTrue(subPage.isPageDisplayDocuments()); subPage.clickOpenDocumentElement(); String fileName = subPage.getFileName(); Assertions.assertTrue(subPage.checkOpen(fileName));