cheange

Nagaytseva/src/test/java/DownloadDoc.java

@@ -20,12 +20,19 @@ public class DownloadDoc {
     private final static String APP_URL = "https://1c.ru/";
 
     private static Context context;
-    private String tmpPath;
+    private int menuItemNumber;
+    private int imgNumber;
+    private static String tmpPath;
+
+
+
     @BeforeAll
     public static void setup() {
         context = new ChromeContext();
         context.start();
         context.getDriver().manage().window().setSize(new Dimension(1600, 900));
+        context.getDriver().get(APP_URL);
+        tmpPath = context.getTmpPath();
     }
 
     @AfterAll
@@ -33,37 +40,45 @@ public class DownloadDoc {
         context.close();
     }
 
-
     @Test
     public void testDownloandZip() throws InterruptedException {
         context.getDriver().get(APP_URL);
         PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
-        page.clickFooterMenuItem(4);
+        menuItemNumber = 4;
+        page.clickFooterMenuItem(menuItemNumber);
         PagePriceList pagePriceList = PageFactory.initElements(context.getDriver(), PagePriceList.class);
         String fileName = pagePriceList.getFileName();
         pagePriceList.clickBtn();
-
+        checkDownload(fileName,100,100);
-        Assertions.assertTrue(pagePriceList.isFileDownloaded(fileName));
-
     }
+
     @Test
     public void testDownloandOpenChrome() throws InterruptedException {
         context.getDriver().get(APP_URL);
         PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
-        page.clickFooterMenuItem(3);
+        menuItemNumber = 3;
+        page.clickFooterMenuItem(menuItemNumber);
         PageProgrammProduct pageProgrammProduct = PageFactory.initElements(context.getDriver(), PageProgrammProduct.class);
-        pageProgrammProduct.clickLeftMenu(5);
+        menuItemNumber = 5;
+        pageProgrammProduct.clickLeftMenu(menuItemNumber);
         PageGosCertification pageGosCertification = PageFactory.initElements(context.getDriver(), PageGosCertification.class);
-        String fileName = pageGosCertification.getFileNameImg(2);
+        imgNumber = 2;
-        pageGosCertification.clickiImg(2);
+        String fileName = pageGosCertification.getFileNameImg(imgNumber);
-
+        pageGosCertification.clickiImg(imgNumber);
-
-
-
         Assertions.assertTrue(pageGosCertification.checkOpenImg(fileName));
-
     }
 
-
+    private void checkDownload(String fileName,int timeout, int period) throws InterruptedException {
+        File f = new File(tmpPath +fileName);
+        int time=0;
+        while(!f.exists()&&time<timeout){
+            Thread.sleep(period);
+            time++;
+        }
+        Assertions.assertTrue(f.exists());
+        if(f.exists()) {
+            f.delete();
+        }
+    }
 
 }

Nagaytseva/src/test/java/FilterTest.java

@@ -14,6 +14,10 @@ public class FilterTest {
     private final static String APP_URL = "https://1c.ru/";
 
     private static Context context;
+    private int menuItemNumber;
+    private int itemListCountry;
+    private int dateNumberListFirst;
+    private int dateNumberListLast;
 
     @BeforeAll
     public static void setup() {
@@ -30,63 +34,55 @@ public class FilterTest {
     @Test
     public void testSiteSearchEnter() {
         context.getDriver().get(APP_URL);
-
+        PageMain pageMain = PageFactory.initElements(context.getDriver(), PageMain.class);
-       PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
+        pageMain.clickButtomNews();
-       page.clickButtomNews();
         PageNews pageNews = PageFactory.initElements(context.getDriver(), PageNews.class);
         String queryString = "Предприятие";
         pageNews.insertSearchText(queryString);
-
         pageNews.submitSearch();
-
         Assertions.assertTrue(pageNews.checkSearch());
     }
+
     @Test
     public void testSiteSearchBtn() {
         context.getDriver().get(APP_URL);
-
+        PageMain pageMain = PageFactory.initElements(context.getDriver(), PageMain.class);
-        PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
+        pageMain.clickButtomNews();
-        page.clickButtomNews();
         PageNews pageNews = PageFactory.initElements(context.getDriver(), PageNews.class);
         String queryString = "Предприятие";
         pageNews.insertSearchText(queryString);
         pageNews.clickBtmSearch();
-
         Assertions.assertTrue(pageNews.checkSearch());
     }
+
     @Test
     public void testFilterParametrs() {
         context.getDriver().get(APP_URL);
-
+        PageMain pageMain = PageFactory.initElements(context.getDriver(), PageMain.class);
-        PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
+        menuItemNumber = 0;
-        page.clickTopMenuItem(0);
+        pageMain.clickTopMenuItem(menuItemNumber);
-
+        PageSearch pageSearch = PageFactory.initElements(context.getDriver(), PageSearch.class);
-        PageSearch page1 = PageFactory.initElements(context.getDriver(), PageSearch.class);
+        pageSearch.clickTopMenu();
-        page1.clickTopMenu();
-
         PageFirm1C pageFirm1C = PageFactory.initElements(context.getDriver(), PageFirm1C.class);
-        pageFirm1C.clickLeftMenu(18);
+        menuItemNumber = 18;
-
+        pageFirm1C.clickLeftMenu(menuItemNumber);
         PageUserCertification pageUserCertification = PageFactory.initElements(context.getDriver(), PageUserCertification.class);
-
+        itemListCountry = 1;
-        pageUserCertification.clickFilterCountry(1);
+        pageUserCertification.clickFilterCountry(itemListCountry);
         pageUserCertification.clickFilterCity();
-
+        Assertions.assertTrue(pageUserCertification.checkSortByFilterCity());
-         Assertions.assertTrue(pageUserCertification.checkFilterCity());
     }
+
     @Test
     public void testSortCity() {
         context.getDriver().get(APP_URL);
-
+        PageMain pageMain = PageFactory.initElements(context.getDriver(), PageMain.class);
-        PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
+        menuItemNumber = 0;
-        page.clickTopMenuItem(0);
+        pageMain.clickTopMenuItem(menuItemNumber);
-
         PageSearch pageSearch = PageFactory.initElements(context.getDriver(), PageSearch.class);
         pageSearch.clickTopMenu();
-
         PageFirm1C pageFirm1C = PageFactory.initElements(context.getDriver(), PageFirm1C.class);
         pageFirm1C.clickSystemManagment();
-
         PageSystemManagment page3 = PageFactory.initElements(context.getDriver(), PageSystemManagment.class);
         page3.clickLinkText();
         PageListFirm pageListFirm = PageFactory.initElements(context.getDriver(), PageListFirm.class);
@@ -97,36 +93,31 @@ public class FilterTest {
     @Test
     public void testSearchByDate() throws ParseException {
         context.getDriver().get(APP_URL);
-
+        PageMain pageMain = PageFactory.initElements(context.getDriver(), PageMain.class);
-        PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
+        pageMain.clickButtomNews();
-        page.clickButtomNews();
         PageNews pageNews = PageFactory.initElements(context.getDriver(), PageNews.class);
         String queryString = "Предприятие";
         pageNews.insertSearchText(queryString);
-
+        dateNumberListFirst = 7;
-        pageNews.clickSelectionDate(7);
+        pageNews.clickSelectionDate(dateNumberListFirst);
-        pageNews.clickSelectionDateL(26);
+        dateNumberListLast = 26;
-
+        pageNews.clickSelectionDateL(dateNumberListLast);
-
         pageNews.clickBtmSearch();
-
         Assertions.assertTrue(pageNews.checkSearchParametrsFirstLastDay());
     }
+
     @Test
     public void testSearchByDateL() throws ParseException {
         context.getDriver().get(APP_URL);
-
         PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
         page.clickButtomNews();
         PageNews pageNews = PageFactory.initElements(context.getDriver(), PageNews.class);
         String queryString = "1с";
         pageNews.insertSearchText(queryString);
-
+        dateNumberListLast = 26;
-        pageNews.clickSelectionDateL(26);
+        pageNews.clickSelectionDateL(dateNumberListLast);
-
         pageNews.clickBtmSearch();
         Assertions.assertTrue(pageNews.checkSearchParametrsLastDay());
-
     }
 
 }

Nagaytseva/src/test/java/FormMakeRequest.java

@@ -26,22 +26,27 @@ public class FormMakeRequest {
     public static void quit() {
         context.close();
     }
+
     @Test
     public void testMakeRequest() {
         context.getDriver().get(APP_URL);
-
-
         PagePartnersFirm pagePartnersFirm = PageFactory.initElements(context.getDriver(), PagePartnersFirm.class);
         String fio = "Ekaterina";
         String email = "test@yandex.ru";
         String phone = "89756523322";
         String inn = "745844556856";
-        pagePartnersFirm.insertSearchText(0,inn,3,phone,4,email,5,fio);
+        int numberFieldInn = 0;
-
+        int numberFieldPhone = 3;
-        pagePartnersFirm.clickCheckBox(6,10,21,31,33);
+        int numberFieldEmail = 4;
+        int numberFieldFio = 5;
+        pagePartnersFirm.insertSearchText(numberFieldInn, inn, numberFieldPhone, phone, numberFieldEmail, email, numberFieldFio, fio);
+        int numberCheckBox6 = 6;
+        int numberCheckBox10 = 10;
+        int numberCheckBox21 = 21;
+        int numberCheckBox31 = 31;
+        int numberCheckBox33 = 33;
+        pagePartnersFirm.clickCheckBox(numberCheckBox6, numberCheckBox10, numberCheckBox21, numberCheckBox31, numberCheckBox33);
         pagePartnersFirm.clickBtnRequest();
-
-        //pagePartnersFirm.clickBtmSearch();
         Assertions.assertTrue(pagePartnersFirm.displayForm());
     }
 }

Nagaytseva/src/test/java/FormSubscribeTest.java

@@ -27,15 +27,14 @@ public class FormSubscribeTest {
     public static void quit() {
         context.close();
     }
+
     @Test
     public void testFormSubscribe() {
         context.getDriver().get(APP_URL);
-
         Random random = new Random();
         BrowserWindow browserWindow = PageFactory.initElements(context.getDriver(), BrowserWindow.class);
         String queryString = "name" + random.nextInt(100) + "@yandex.ru";
         browserWindow.insertText(queryString);
-
         browserWindow.clickSubscribe();
         Assertions.assertTrue(browserWindow.subscribeTrue());
     }

Nagaytseva/src/test/java/MenuNavigation.java

@@ -12,6 +12,7 @@ public class MenuNavigation {
     private final static String APP_URL = "https://1c.ru/";
 
     private static Context context;
+    private int menuItemNumber;
 
     @BeforeAll
     public static void setup() {
@@ -28,142 +29,122 @@ public class MenuNavigation {
     @Test
     public void testTopMenuDropDownList() {
         context.getDriver().get(APP_URL);
-
+        PageMain pageMain = PageFactory.initElements(context.getDriver(), PageMain.class);
-        PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
+        pageMain.clickHeadMenuList();
-
+        Assertions.assertTrue(pageMain.menuList());
-        page.clickHeadMenuList();
-        Assertions.assertTrue(page.menuList());
     }
+
     @Test
     public void testTopMenuOutLink() {
         context.getDriver().get(APP_URL);
-
+        PageMain pageMain = PageFactory.initElements(context.getDriver(), PageMain.class);
-        PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
+        pageMain.clickMenuLink();
-        page.clickMenuLink();
+        Assertions.assertTrue(pageMain.menuOutLink());
-
-       Assertions.assertTrue(page.menuOutLink());
     }
+
     @Test
     public void testFooterMenu() {
         context.getDriver().get(APP_URL);
-
+        PageMain pageMain = PageFactory.initElements(context.getDriver(), PageMain.class);
-        PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
+        menuItemNumber = 0;
-        page.clickFooterMenuItem(0);
+        pageMain.clickFooterMenuItem(menuItemNumber);
         PageFirm1C pageFirm1C = PageFactory.initElements(context.getDriver(), PageFirm1C.class);
-
         Assertions.assertTrue(pageFirm1C.footerMenuList());
     }
+
     @Test
     public void testLeftMenuOutLink() {
         context.getDriver().get(APP_URL);
-
+        PageMain pageMain = PageFactory.initElements(context.getDriver(), PageMain.class);
-        PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
+        menuItemNumber = 0;
-        page.clickTopMenuItem(0);
+        pageMain.clickTopMenuItem(menuItemNumber);
-
+        PageSearch pageSearch = PageFactory.initElements(context.getDriver(), PageSearch.class);
-        PageSearch page1 = PageFactory.initElements(context.getDriver(), PageSearch.class);
+        pageSearch.clickLeftMenu(menuItemNumber);
-        page1.clickLeftMenu(0);
+        Assertions.assertTrue(pageSearch.searchPage());
-
-        Assertions.assertTrue(page1.searchPage());
     }
+
     @Test
     public void testPagination() {
         context.getDriver().get(APP_URL);
-
+        PageMain pageMain = PageFactory.initElements(context.getDriver(), PageMain.class);
-        PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
+        menuItemNumber = 0;
-        page.clickTopMenuItem(0);
+        pageMain.clickTopMenuItem(menuItemNumber);
-
+        PageSearch pageSearch = PageFactory.initElements(context.getDriver(), PageSearch.class);
-        PageSearch page1 = PageFactory.initElements(context.getDriver(), PageSearch.class);
+        pageSearch.clickTopMenu();
-        page1.clickTopMenu();
+        PageFirm1C pageFirm1C = PageFactory.initElements(context.getDriver(), PageFirm1C.class);
-
+        pageFirm1C.clickSystemManagment();
-        PageFirm1C page2 = PageFactory.initElements(context.getDriver(), PageFirm1C.class);
+        PageSystemManagment pageSystemManagment = PageFactory.initElements(context.getDriver(), PageSystemManagment.class);
-        page2.clickSystemManagment();
+        pageSystemManagment.clickLeftMenuListPagination();
-
+        pageSystemManagment.clickPaginationElement();
-        PageSystemManagment page3 = PageFactory.initElements(context.getDriver(), PageSystemManagment.class);
+        Assertions.assertTrue(pageSystemManagment.paginationCheck());
-        page3.clickLeftMenuListPagination();
-        page3.clickPaginationElement();
-        Assertions.assertTrue(page3.paginationCheck());
     }
 
     @Test
     public void testButtomNews() {
         context.getDriver().get(APP_URL);
-
+        PageMain pageMain = PageFactory.initElements(context.getDriver(), PageMain.class);
-        PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
+        pageMain.clickButtomNews();
-        page.clickButtomNews();
-
         PageNews pageNews = PageFactory.initElements(context.getDriver(), PageNews.class);
-
         Assertions.assertTrue(pageNews.disposeBlockNews());
     }
+
     @Test
     public void testLinkNews() {
         context.getDriver().get(APP_URL);
-
+        PageMain pageMain = PageFactory.initElements(context.getDriver(), PageMain.class);
-        PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
+        String str = pageMain.getTextTitleNews();
-        String str = page.getTextTitleNews();
+        pageMain.clickLinkNews();
-        page.clickLinkNews();
-
-
         PageInformationRelease pageInf = PageFactory.initElements(context.getDriver(), PageInformationRelease.class);
-
         Assertions.assertTrue(pageInf.displayNewsInformationTrue(str));
     }
 
     @Test
     public void testDropDownListVacancy() {
         context.getDriver().get(APP_URL);
-
+        PageMain pageMain = PageFactory.initElements(context.getDriver(), PageMain.class);
-        PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
+        menuItemNumber = 0;
-        page.clickTopMenuItem(0);
+        pageMain.clickTopMenuItem(menuItemNumber);
-
+        PageSearch pageSearch = PageFactory.initElements(context.getDriver(), PageSearch.class);
-        PageSearch page1 = PageFactory.initElements(context.getDriver(), PageSearch.class);
+        pageSearch.clickTopMenu();
-        page1.clickTopMenu();
+        PageFirm1C pageFirm1C = PageFactory.initElements(context.getDriver(), PageFirm1C.class);
-
+        pageFirm1C.clickVacancy();
-        PageFirm1C page2 = PageFactory.initElements(context.getDriver(), PageFirm1C.class);
+        pageFirm1C.clickVacancyLink();
-        page2.clickVacancy();
+        Assertions.assertTrue(pageFirm1C.disposalVacancyList());
-        page2.clickVacancyLink();
-       Assertions.assertTrue(page2.disposalVacancyList());
     }
+
     @Test
     public void testBtmBackNews() {
         context.getDriver().get(APP_URL);
-
+        PageMain pageMain = PageFactory.initElements(context.getDriver(), PageMain.class);
-        PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
+        pageMain.clickLinkNews5();
-        page.clickLinkNews5();
-
         PageInformationRelease pageInf = PageFactory.initElements(context.getDriver(), PageInformationRelease.class);
         pageInf.clickBtmBack();
-
         Assertions.assertTrue(pageInf.disposeMainInformation());
     }
+
     @Test
     public void testBtmNextNews() {
         context.getDriver().get(APP_URL);
-
+        PageMain pageMain = PageFactory.initElements(context.getDriver(), PageMain.class);
-        PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
+        pageMain.clickLinkNews5();
-        page.clickLinkNews5();
-
         PageInformationRelease pageInf = PageFactory.initElements(context.getDriver(), PageInformationRelease.class);
         pageInf.clickBtmNext();
-
         Assertions.assertTrue(pageInf.disposeMainInformation());
     }
+
     @Test
     public void testPopUpWindow() {
         context.getDriver().get(APP_URL);
-
+        PageMain pageMain = PageFactory.initElements(context.getDriver(), PageMain.class);
-        PageMain page = PageFactory.initElements(context.getDriver(), PageMain.class);
+        menuItemNumber = 0;
-        page.clickTopMenuItem(0);
+        pageMain.clickTopMenuItem(menuItemNumber);
-
+        PageSearch pageSearch = PageFactory.initElements(context.getDriver(), PageSearch.class);
-        PageSearch page1 = PageFactory.initElements(context.getDriver(), PageSearch.class);
+        pageSearch.clickTopMenu();
-        page1.clickTopMenu();
+        PageFirm1C pageFirm1C = PageFactory.initElements(context.getDriver(), PageFirm1C.class);
-
+        pageFirm1C.clickSystemManagment();
-        PageFirm1C page2 = PageFactory.initElements(context.getDriver(), PageFirm1C.class);
+        PageSystemManagment pageSystemManagment = PageFactory.initElements(context.getDriver(), PageSystemManagment.class);
-        page2.clickSystemManagment();
+        pageSystemManagment.clickLeftMenuListWindiw();
-
+        pageSystemManagment.clickPopUpWindowElement();
-        PageSystemManagment page3 = PageFactory.initElements(context.getDriver(), PageSystemManagment.class);
+        Assertions.assertTrue(pageSystemManagment.popUpWindowCheck());
-        page3.clickLeftMenuListWindiw();
-        page3.clickPopUpWindowElement();
-        Assertions.assertTrue(page3.popUpWindowCheck());
     }
 }

Nagaytseva/src/test/java/context/ChromeContext.java

@@ -1,6 +1,10 @@
 package context;
 
 import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeOptions;
+
+import java.util.HashMap;
+import java.util.Map;
 
 public class ChromeContext extends Context {
     private final static String WINDOWS_DRIVER = "chromedriver.exe";
@@ -9,6 +13,10 @@ public class ChromeContext extends Context {
 
     @Override
     protected void createDriver() {
+        ChromeOptions options = new ChromeOptions();
+        Map<String,Object> prefs = new HashMap<String, Object>();
+        tmpPath = System.getProperty("user.dir") + "/src/main/resources/downloads/";
+        prefs.put("download.default_directory",tmpPath);
         driver = new ChromeDriver();
     }
 

Nagaytseva/src/test/java/context/Context.java

@@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit;
 public abstract class Context {
     private final static String DRIVER_LOCATION = "drivers/%s";
     protected WebDriver driver;
-
+    protected String tmpPath;
     public WebDriver getDriver() {
         if (driver != null) {
             return driver;
@@ -36,6 +36,9 @@ public abstract class Context {
         return Context.class.getClassLoader().getResource(
                 String.format(DRIVER_LOCATION, getDriverExecutable(isWindows()))).getFile();
     }
+    public String getTmpPath(){
+        return tmpPath;
+    }
 
     private boolean isWindows() {
         return System.getProperty("os.name").toLowerCase().contains("windows");

Nagaytseva/src/test/java/page/BrowserWindow.java

@@ -14,17 +14,21 @@ public class BrowserWindow {
     private WebElement btnSubscribe;
     @FindBy(css = ".widebox h3")
     private List<WebElement> text;
+
     public BrowserWindow(WebDriver driver) {
         this.driver = driver;
     }
+
     public void insertText(String text) {
 
         textFieldEmail.sendKeys(text);
     }
+
     public void clickSubscribe() {
 
         btnSubscribe.click();
     }
+
     public boolean subscribeTrue() {
         if (text.get(1).getText().contains("Ваши данные приняты")) {
             return true;

Nagaytseva/src/test/java/page/InformersTest.java

@@ -1,42 +0,0 @@
-package page;
-
-import context.ChromeContext;
-import context.Context;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.openqa.selenium.Dimension;
-import org.openqa.selenium.support.PageFactory;
-
-public class InformersTest {
-   // http://1c.ru/news/informer.htm
-   private final static String APP_URL = "http://1c.ru/news/informer.htm";
-
-    private static Context context;
-
-    @BeforeAll
-    public static void setup() {
-        context = new ChromeContext();
-        context.start();
-        context.getDriver().manage().window().setSize(new Dimension(1600, 900));
-    }
-
-    @AfterAll
-    public static void quit() {
-        context.close();
-    }
-    @Test
-    public void testInformer(){
-        context.getDriver().get(APP_URL);
-
-
-        PageInformers pageInformers = PageFactory.initElements(context.getDriver(),PageInformers.class);
-        String count = "5";
-        pageInformers.insertText(count);
-
-        pageInformers.clickBtn();
-
-        Assertions.assertTrue(pageInformers.checkInformer());
-    }
-}

Nagaytseva/src/test/java/page/PageFirm1C.java

@@ -17,8 +17,8 @@ public class PageFirm1C {
     @FindBy(xpath = "//*[@id=\"main_field\"]/h4[1]/a")
     private WebElement linlVacancy;
 
-
     private static int systemManagmentMenuElementNumber = 5;
+
     public PageFirm1C(WebDriver driver) {
         this.driver = driver;
     }
@@ -30,9 +30,11 @@ public class PageFirm1C {
     public void clickLeftMenu(int number) {
         itemMenu.get(number).click();
     }
+
     public void clickVacancy() {
         itemMenu.get(4).click();
     }
+
     public void clickVacancyLink() {
         linlVacancy.click();
         try {
@@ -42,13 +44,12 @@ public class PageFirm1C {
         }
     }
 
-
     public boolean disposalVacancyList() {
         return driver.findElement(By.cssSelector("#dept6")).isDisplayed();
     }
+
     public boolean footerMenuList() {
         return driver.findElement(By.cssSelector(".widebox")).isDisplayed();
     }
 
-
 }

Nagaytseva/src/test/java/page/PageGosCertification.java

@@ -14,15 +14,14 @@ public class PageGosCertification {
     @FindBy(css = ".widebox a")
     private List<WebElement> elementImg;
 
-
     public PageGosCertification(WebDriver driver) {
         this.driver = driver;
     }
+
     public void clickiImg(int number) {
-
         elementImg.get(number).click();
-
     }
+
     public String getFileNameImg(int elementNumber) {
         String fileName = elementImg.get(elementNumber).getAttribute("href");
         fileName = fileName.substring(fileName.lastIndexOf("/") + 1);
@@ -36,9 +35,6 @@ public class PageGosCertification {
         if (s.contains(str))
             check = true;
         return check;
-
     }
 
-
-
 }

Nagaytseva/src/test/java/page/PageInformationRelease.java

@@ -20,6 +20,7 @@ public class PageInformationRelease {
 
     @FindBy(xpath = "//*[@id=\"pagecontentforsolr\"]/div[4]")
     private WebElement title;
+
     public PageInformationRelease(WebDriver driver) {
         this.driver = driver;
     }
@@ -27,16 +28,16 @@ public class PageInformationRelease {
     public void clickBtmBack() {
         elementBackBtmNews.click();
     }
+
     public void clickBtmNext() {
         elementBackBtmNews.click();
     }
-    public boolean disposeMainInformation() {
 
+    public boolean disposeMainInformation() {
         return content.isDisplayed();
     }
+
     public boolean displayNewsInformationTrue(String str) {
-
-
         return title.getText().contains(str);
     }
 }

Nagaytseva/src/test/java/page/PageInformers.java

@@ -13,40 +13,32 @@ public class PageInformers {
     @FindBy(xpath = "//*[@id=\"pagecontentforsolr\"]/table[1]/tbody/tr/td[2]/form/textarea")
     private WebElement elementCode;
 
-
     @FindBy(name = "limit")
     private WebElement textField;
 
     @FindBy(xpath = "//*[@id=\"pagecontentforsolr\"]/table[1]/tbody/tr/td[2]/form/table/tbody/tr[4]/td/input")
     private WebElement formBtn;
 
-
-
-
     public PageInformers(WebDriver driver) {
         this.driver = driver;
     }
+
     public void insertText(String text) {
         textField.clear();
         textField.sendKeys(text);
     }
 
     private String strCode;
-    private int countItem;
-    public void clickBtn() {
 
+    public void clickBtn() {
         formBtn.click();
         strCode = elementCode.getAttribute("value");
     }
 
-
+    public boolean checkWorkInformer() {
-
-    public boolean checkInformer(){
-
         boolean check = false;
         String strTexyField = textField.getAttribute("value");
         String strCode1 = strCode;
-
         if (strCode1.contains(strTexyField))
             check = true;
         return check;

Nagaytseva/src/test/java/page/PageListFirm.java

@@ -8,27 +8,29 @@ import java.util.List;
 
 public class PageListFirm {
     WebDriver driver;
-
     @FindBy(css = ".content select")
     private WebElement selectListCity;
+
     @FindBy(xpath = "//*[@id=\"pagecontentforsolr\"]/table/tbody/tr[1]/th[2]/select/option[17]")
     private WebElement itemListCity;
+
     @FindBy(css = "tr")
     private List<WebElement> tr;
 
     public PageListFirm(WebDriver driver) {
         this.driver = driver;
     }
+
     public void clickCity() {
         selectListCity.click();
         itemListCity.click();
-
         try {
             Thread.sleep(5000);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
     }
+
     public boolean checkSortCity() {
         boolean checkSearch = false;
         int count = tr.size();

Nagaytseva/src/test/java/page/PageMain.java

@@ -31,6 +31,7 @@ public class PageMain {
     public PageMain(WebDriver driver) {
         this.driver = driver;
     }
+
     public void clickHeadMenuList() {
         driver.findElement(By.className("droppable")).findElement(By.tagName("span")).click();
         try {
@@ -39,6 +40,7 @@ public class PageMain {
             e.printStackTrace();
         }
     }
+
     public void clickMenuLink() {
         menuElementsList.click();
         try {
@@ -47,24 +49,26 @@ public class PageMain {
             e.printStackTrace();
         }
     }
+
     public void clickTopMenuItem(int number) {
 
         menuElements.get(number).click();
     }
+
     public void clickFooterMenuItem(int number) {
         footerMenuElements.get(number).click();
     }
+
     public void clickButtomNews() {
 
         buttomNewsElements.click();
     }
+
     public void clickLinkNews() {
-
         linkElement.get(3).click();
-
     }
-    public void clickLinkNews5(){
 
+    public void clickLinkNews5() {
         linkElement.get(5).click();
         try {
             Thread.sleep(5000);
@@ -72,6 +76,7 @@ public class PageMain {
             e.printStackTrace();
         }
     }
+
     public String getTextTitleNews() {
         String str = linkElement.get(3).getText();
         return str;
@@ -79,12 +84,9 @@ public class PageMain {
 
     public boolean menuList() {
         return !(driver.findElement(By.xpath("/html/body/div[1]/div[1]/div/div[2]/div[2]/ul/div/li[1]/a")).isDisplayed());
-
     }
 
     public boolean menuOutLink() {
         return driver.findElement(By.cssSelector(".left-content")).isDisplayed();
     }
-
-
 }

Nagaytseva/src/test/java/page/PageNews.java

@@ -44,13 +44,16 @@ public class PageNews {
         elementEntryField.sendKeys(text);
 
     }
+
     private int strDayFirst;
     private int strDayLast;
     private String strMonthFirst;
     private String strMonthLast;
+
     public void clickBtmSearch() {
         elementBtnSearch.click();
     }
+
     public void submitSearch() {
         elementEntryField.sendKeys(Keys.RETURN);
         try {
@@ -59,6 +62,7 @@ public class PageNews {
             e.printStackTrace();
         }
     }
+
     public void clickSelectionDate(int number1) {
         elementDateFrom.click();
         elementBack.click();
@@ -67,8 +71,8 @@ public class PageNews {
         strMonthFirst = elementMonth.getText();
 
 
-
     }
+
     public void clickSelectionDateL(int number2) {
 
         elementDateTo.click();
@@ -85,8 +89,6 @@ public class PageNews {
     }
 
 
-   
-
     public boolean checkSearchParametrsFirstLastDay() throws ParseException {
         boolean checkSearch = false;
         int count = elementListNews.size();
@@ -102,16 +104,12 @@ public class PageNews {
         Date dateFDay = newDateFormat.parse(fDayNumber);
         Date dateEDay = newDateFormat.parse(eDayNumber);
 
-        if(dateFirstList.before(dateEDay)|| dateFirstList.equals(dateEDay))
+        if ((dateFirstList.before(dateEDay) || dateFirstList.equals(dateEDay)) && (dateEndList.after(dateFDay) || dateEndList.equals(dateFDay)) ) {
-        {
-            if(dateEndList.after(dateFDay) ||dateEndList.equals(dateFDay))
             checkSearch = true;
         }
-
-
-
         return checkSearch;
     }
+
     public boolean checkSearchParametrsLastDay() throws ParseException {
         boolean checkSearch = false;
         String firstDayNewsList = elementListNews.get(0).getText();
@@ -130,10 +128,9 @@ public class PageNews {
         if (date1.after(date) || date1.equals(date)) {
             checkSearch = true;
         }
-
-
         return checkSearch;
     }
+
     public boolean checkSearch() {
         boolean checkSearch = false;
         int count = elementListNews.size();

Nagaytseva/src/test/java/page/PagePartnersFirm.java

@@ -41,9 +41,8 @@ public class PagePartnersFirm {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-
-
     }
+
     public void clickCheckBox(int cBox,
                               int cBox1,
                               int cBox2,
@@ -74,23 +73,19 @@ public class PagePartnersFirm {
             e.printStackTrace();
         }
         elementInput.get(cBox4).click();
-
-
     }
 
 
     public void clickBtnRequest() {
-
         elementBtn.click();
     }
+
     public void submitRequest() {
         elementBtn.sendKeys(Keys.RETURN);
-
     }
+
     public boolean displayForm() {
-
         return elementSpan.getText().contains("Благодрим вас за отправленную анкету");
-
     }
 
 }

Nagaytseva/src/test/java/page/PagePriceList.java

@@ -14,8 +14,6 @@ public class PagePriceList {
     @FindBy(className = "btn")
     private WebElement elementBtn;
 
-    private String tmpPath = "C://Users/tab35/Downloads/";
-
     public PagePriceList(WebDriver driver) {
         this.driver = driver;
     }
@@ -27,7 +25,6 @@ public class PagePriceList {
     }
 
     public void clickBtn() {
-
         elementBtn.click();
         try {
             Thread.sleep(5000);
@@ -35,13 +32,5 @@ public class PagePriceList {
             e.printStackTrace();
         }
     }
-    public boolean isFileDownloaded(String filename){
 
-        boolean check = false;
-        File file = new File(tmpPath+filename);
-        if(file.exists()) {
-         check = true;
-        }
-        return check;
-    }
 }

Nagaytseva/src/test/java/page/PageProgrammProduct.java

@@ -12,10 +12,10 @@ public class PageProgrammProduct {
     @FindBy(css = ".dropdown a")
     private List<WebElement> elementMenu;
 
-
     public PageProgrammProduct(WebDriver driver) {
         this.driver = driver;
     }
+
     public void clickLeftMenu(int number) {
 
         elementMenu.get(number).click();

Nagaytseva/src/test/java/page/PageSearch.java

@@ -23,11 +23,11 @@ public class PageSearch {
     private WebElement searchBtn;
 
     private static int topMenuElementNumber = 1;
+
     public PageSearch(WebDriver driver) {
         this.driver = driver;
     }
 
-
     public void clickLeftMenu(int number) {
         leftMenuElement.get(number).click();
     }

Nagaytseva/src/test/java/page/PageSystemManagment.java

@@ -18,40 +18,41 @@ public class PageSystemManagment {
 
     @FindBy(className = "scope")
     private List<WebElement> elementPopUpWindow;
+
     @FindBy(css = ".scope .from")
     private WebElement windowPopUp;
+
     @FindBy(css = ".widebox  a")
     private List<WebElement> elementtLinkText;
+
     public PageSystemManagment(WebDriver driver) {
         this.driver = driver;
     }
 
     public void clickLeftMenuListPagination() {
-
         itemLeftMenu.get(4).click();
-
     }
+
     public void clickLeftMenuListWindiw() {
-
         itemLeftMenu.get(3).click();
-
     }
+
     public void clickPaginationElement() {
-
         paginationElement.get(3).click();
-
     }
+
     public void clickPopUpWindowElement() {
-
         elementPopUpWindow.get(0).click();
-
     }
+
     public void clickLinkText() {
         elementtLinkText.get(1).click();
     }
+
     public boolean paginationCheck() {
         return driver.findElement(By.cssSelector(".ndate")).isDisplayed();
     }
+
     public boolean popUpWindowCheck() {
         return windowPopUp.isDisplayed();
     }

Nagaytseva/src/test/java/page/PageUserCertification.java

@@ -14,25 +14,27 @@ public class PageUserCertification {
 
     @FindBy(name = "reg")
     private WebElement selectListCity;
+
     @FindBy(xpath = "//*[@id=\"pagecontentforsolr\"]/form[2]/select/option[8]")
     private WebElement itemListCity;
 
     @FindBy(css = "tr")
     private List<WebElement> tr;
+
     public PageUserCertification(WebDriver driver) {
         this.driver = driver;
     }
 
-
     public void clickFilterCountry(int number) {
         itemListCountry.get(number).click();
     }
+
     public void clickFilterCity() {
         selectListCity.click();
         itemListCity.click();
     }
 
-    public boolean checkFilterCity(){
+    public boolean checkSortByFilterCity() {
         boolean checkSearch = false;
         int count = tr.size();
         for (int i = 0; i < count; i++) {

Nagaytseva/src/test/java/page/SearchPage.java

@@ -23,7 +23,6 @@ public class SearchPage {
         inputField.sendKeys(text);
         return this;
     }
-
     public void clickSubmitButton() {
         inputField.sendKeys(Keys.RETURN);
     }