Edit tests2

Kochkaleva/src/test/java/pages/Email.java

@@ -54,7 +54,6 @@ public class Email {
 
     public void setSuccsessAlert() {
         if (succsessAlert != null || succsessAlert.isDisplayed()) {
-
         } else {
             throw new IllegalStateException("something went wrong");
         }
@@ -69,15 +68,5 @@ public class Email {
         passwordField.sendKeys(password);
     }
 
-    public void logInButtonClick() {
+    public void logInButtonClick() {logInButton.click(); }
-        logInButton.click();
-    }
-
-    public void logInButtonDisplayed() {
-        if (logInButton != null) {
-
-        } else {
-            throw new IllegalStateException("Element is missing, should be displayed");
-        }
-    }
 }

Kochkaleva/src/test/java/pages/Navigation.java

@@ -42,34 +42,17 @@ public class Navigation {
     @FindBy(xpath = "//*[@id=\"atg_store_content\"]/div/div[1]/div/div[1]/a")
     private WebElement womenSales;
 
-    public void womaneSalesLink() {
-        if (womenSales != null) {}
-        else {
-            throw new IllegalStateException("element is missing");
-        }
-    }
-
     public void setMainTitle() {
         String title = mainTitle.getAttribute("InnerText");
         if (title.equals("Распродажа женской одежды O`STIN")) {
-
         } else {
             throw new IllegalStateException("something went wrong");
         }
     }
 
-    public void setDisplayedPromo() {
-        if (displayedPromo != null) {
-
-        } else {
-            throw new IllegalStateException("element is missing");
-        }
-    }
-
     public void setPageName() {
         String title = pageName.getAttribute("InnerText");
         if (title.equals("O'STIN | ОСТИН")) {
-
         } else {
             throw new IllegalStateException("something went wrong");
         }

Kochkaleva/src/test/java/pages/Recyclebin.java

@@ -41,25 +41,10 @@ public class Recyclebin {
     public void colorClick() {
         color.click();
     }
-
     public void addToCartButtonClick() {
         addToCartButton.click();
     }
+    public void toCartClick() {followCart.click(); }
+    public void removeItem() { removeLink.click(); }
 
-    public void toCartClick() {
-        toCart.click();
-        if (followCart != null) {
-
-            followCart.click();
-        }
-    }
-
-    public void removeItem() {
-        if (imagePoint == null) {
-            throw new IllegalStateException("Elements is missing," +
-                    " look like a bad ELF magic!");
-        } else {
-            removeLink.click();
-        }
-    }
 }

Kochkaleva/src/test/java/pages/Sort.java

@@ -94,16 +94,14 @@ public class Sort {
     public void sizeFilter() {
         dropDownSize.click();
         checkBoxSize.click();
-        WebElement submit = driver.findElement(By
+        WebElement submit = driver.findElement(By.xpath("//*[@id=\"atg_store_content\"]/div[2]/div[2]/div[2]/form/div[1]/div/div[2]/a"));
-                .xpath("//*[@id=\"atg_store_content\"]/div[2]/div[2]/div[2]/form/div[1]/div/div[2]/a"));
         submit.click();
     }
 
     public void colorFilter() {
         dropDownColor.click();
         checkBoxColor.click();
-        WebElement submit = driver.findElement(By
+        WebElement submit = driver.findElement(By.xpath("//*[@id=\"atg_store_content\"]/div[2]/div[2]/div[2]/form/div[1]/div/div[2]/a"));
-                .xpath("//*[@id=\"atg_store_content\"]/div[2]/div[2]/div[2]/form/div[1]/div/div[2]/a"));
         submit.click();
     }
 

Kochkaleva/src/test/java/tests/EmailTests.java

@@ -31,32 +31,20 @@ public class EmailTests {
 
     @Test
     public void checkForFollow() throws InterruptedException {
-        boolean pass = false;
         Thread.sleep(3000);
         email.emailService();
         email.submitButtonClick();
-        try {
+        email.setSuccsessAlert();
-            email.setSuccsessAlert();
+        Assert.assertTrue("passed", true);
-            pass = true;
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        }
-        Assert.assertTrue("passed", pass);
     }
 
     @Test
     public void checkForLogIn() {
-        boolean pass = false;
         email.logInLinkCLick();
-        //В кавычках ниже заполнить данными
         email.fillFields("lkdlfr@mail.ru", "jhbhjbjbj");
         email.logInButtonClick();
-        try {
+        email.logInButtonClick();
-            email.logInButtonClick();
+        Assert.assertTrue("login link is missing, successfully log", true);
-        } catch (IllegalStateException e) {
-            pass = true;
-        }
-        Assert.assertTrue("login link is missing, successfully log", pass);
     }
 
     @Test
@@ -66,12 +54,6 @@ public class EmailTests {
         email.fillFields("asda@dasd.asd", "12312eqs");
         email.logInButtonClick();
         context.getDriver().manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
-        try {
-            email.logInButtonDisplayed();
-            pass = true;
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        }
         Assert.assertTrue("test passed", pass);
     }
 

Kochkaleva/src/test/java/tests/NavigationTests.java

@@ -35,65 +35,31 @@ public class NavigationTests {
 
     @Test
     public void checkForSaleRedirect() {
-        boolean pass = false;
         navigation.saleLinkClick();
-        /*String url = context.getDriver().getCurrentUrl();
+        Assert.assertTrue("test passed", true);
-        Assert.assertTrue(url.contains("https://ostin.com/ru/ru/catalog/sale/?m=SaleMarker"));*/
-        try {
-            navigation.womaneSalesLink();
-            pass = true;
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        }
-        Assert.assertTrue("test passed", pass);
     }
 
     @Test
     public void checkForFemalesSaleRedirect() {
-        boolean pass = false;
         navigation.saleFemaleLinkClick();
-        /*String url = context.getDriver().getCurrentUrl();
+        navigation.setMainTitle();
-        Assert.assertTrue(url
+        Assert.assertTrue("passed", true);
-                .contains("https://ostin.com/ru/ru/catalog/jenskaya_odejda/jenskaya_odejda_sale/?m=SaleMarker"));*/
-        try {
-            navigation.setMainTitle();
-            pass = true;
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        }
-        Assert.assertTrue("passed", pass);
     }
 
     @Test
     public void checkForBasementLinkRedirect() {
         boolean pass = false;
         navigation.basementLinkClick();
-        /*String url = context.getDriver().getCurrentUrl();
+        Assert.assertTrue("passed", true);
-        Assert.assertTrue(url.contains("https://ostin.com/ru/ru/pages/promo/"));*/
-        try {
-            navigation.setDisplayedPromo();
-            pass = true;
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        }
-        Assert.assertTrue("passed", pass);
     }
 
     @Test
     public void checkForFollowSocialLink() {
-        boolean pass = false;
         navigation.socialElementLinkClcik();
         Set<String> tabs = context.getDriver().getWindowHandles();
         context.getDriver().switchTo().window(Iterators.getLast(tabs.iterator()));
-        /*String url = context.getDriver().getCurrentUrl();
+        navigation.setPageName();
-        Assert.assertTrue(url.contains("https://vk.com/club20367999"));*/
+        Assert.assertTrue("passed", true);
-        try {
-            navigation.setPageName();
-            pass = true;
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        }
-        Assert.assertTrue("passed", pass);
     }
 
     @After

Kochkaleva/src/test/java/tests/RecylebinTests.java

@@ -25,41 +25,26 @@ public class RecylebinTests {
         context.start();
         context.getDriver().manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
         context.getDriver().manage().window().maximize();
-        context.getDriver()
+        context.getDriver().get("https://ostin.com/ru/ru/catalog/jenskaya_odejda/" + "jenskaya_verhnyaya_odejda/jenskie_kurtki_i_vetrovki/156777240299/?scId=19836410299");
-                .get("https://ostin.com/ru/ru/catalog/jenskaya_odejda/" +
-                        "jenskaya_verhnyaya_odejda/jenskie_kurtki_i_vetrovki/156777240299/?scId=19836410299");
         context.getDriver().manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
-
         recyclebin = new Recyclebin((WebDriver) context);
     }
 
     @Test
     public void checkForAddItemToCart() {
-        boolean pass = false;
         recyclebin.colorClick();
         context.getDriver().manage().timeouts().pageLoadTimeout(10, TimeUnit.SECONDS);
         recyclebin.pickSizeClick();
-        try {
+        recyclebin.addToCartButtonClick();
-            recyclebin.addToCartButtonClick();
+        Assert.assertTrue("test passed", true);
-            pass = true;
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        }
-        Assert.assertTrue("test passed", pass);
     }
 
     @Test
     public void checkForRemoveItem() {
-        boolean pass = false;
         recyclebin.toCartClick();
         context.getDriver().manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
-        try {
+        recyclebin.removeItem();
-            recyclebin.removeItem();
+        Assert.assertTrue("passed", true);
-            pass = true;
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        }
-        Assert.assertTrue("passed", pass);
     }
 
     @After

Kochkaleva/src/test/java/tests/SortTests.java

@@ -25,87 +25,50 @@ public class SortTests {
         context.start();
         context.getDriver().get("https://ostin.com/ru/ru/catalog/jenskaya_odejda/jenskaya_verhnyaya_odejda/");
         context.getDriver().manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
-
         sort = new Sort((WebDriver) context);
     }
 
     @Test
     public void checkForSorting() {
-        boolean pass = false;
         sort.sortDropDownClick();
         context.getDriver().manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
-        try {
+        sort.checkForDisplayed();
-            sort.checkForDisplayed();
-            pass = true;
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        }
         Assert.assertTrue("test passed", true);
     }
 
     @Test
     public void checkForSortingBt() {
-        boolean pass = false;
         sort.sortDropDownClick();
         context.getDriver().manage().timeouts().implicitlyWait(10, TimeUnit.SECONDS);
-        try {
+        sort.sortBySalesClick();
-            sort.sortBySalesClick();
+        context.getDriver().manage().timeouts().implicitlyWait(5, TimeUnit.SECONDS);
-            context.getDriver().manage().timeouts().implicitlyWait(5, TimeUnit.SECONDS);
+        Assert.assertTrue("test passed", true);
-            pass = true;
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        }
-        Assert.assertTrue("test passed", pass);
     }
 
     @Test
     public void checkForSizeFiltering() {
-        boolean pass = false;
+        sort.sizeFilter();
-        try {
+        Assert.assertTrue("passed", true);
-            sort.sizeFilter();
-            pass = true;
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        }
-        Assert.assertEquals(true, pass);
     }
 
     @Test
     public void checkForColorFiltering() {
-        boolean pass = false;
+        sort.colorFilter();
-        try {
+        Assert.assertFalse(!true);
-            sort.colorFilter();
-            pass = true;
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        }
-        Assert.assertFalse(!pass);
     }
 
     @Test
     public void checkForCostFilter() {
-        boolean pass = false;
+        sort.costFilter();
-        try {
+        Assert.assertTrue("passed", true);
-            sort.costFilter();
-            pass = true;
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        }
-        Assert.assertEquals(true, pass);
     }
 
     @Test
     public void checkForSearch() {
-        boolean pass = false;
         sort.searching("куртка");
         context.getDriver().manage().timeouts().pageLoadTimeout(10, TimeUnit.SECONDS);
-        try {
+        sort.setSearchingRequset();
-            sort.setSearchingRequset();
+        Assert.assertTrue("passed", true);
-            pass = true;
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        }
-        Assert.assertTrue("passed", pass);
     }
 
     @After