fixed issue with findElements method for elements in the specific state

README.md

@@ -12,17 +12,6 @@ We use interfaces where is possible, so you can implement your own version of ta
 
 1. To start work with this package, simply add the dependency to your pom.xml:
 ```
-<repositories>
-        <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </repository>
-        <repository>
-            <id>ossrh</id>
-            <url>https://repo1.maven.org/maven2/</url>
-        </repository>
-    </repositories>
-
 <dependency>
     <groupId>com.github.aquality-automation</groupId>
     <artifactId>aquality-selenium</artifactId>
@@ -39,24 +28,29 @@ Browser browser = BrowserManager.getBrowser();
 ```java
 browser.maximize();
 browser.goTo("https://wikipedia.org");
-browser.waitForPageToLoad()
+browser.waitForPageToLoad();
 ```
 
 4. Use ElementFactory class's methods to get an instance of each element.
 ```java
-ITextBox txbEmail = new ElementFactory().getTextBox(By.id("email_create"), "Email");
+ElementFactory elementFactory = new ElementFactory();
+ITextBox txbSearch = elementFactory.getTextBox(By.id("searchInput"), "Search");
+txbSearch.submit();
+browser.waitForPageToLoad();
 ```
 
 5. Call element's methods to perform action with element: 
 ```java
-txbEmail.type("email@domain.com");
+txbSearch.type("quality assurance");
 ```
 
 6. Quit browser at the end
 ```
 browser.quit();
 ```
 
+See full example [here](./src/test/java/tests/usecases/QuickStartExample.java)
+
 ### Documentation
 To get more details please look at documentation:
 - [In English](./Documentation.en.md)

azure-pipelines.yml

@@ -10,6 +10,9 @@ pool:
   vmImage: 'windows-latest'
 
 steps:
+- task: ScreenResolutionUtility@1
+  inputs:
+    displaySettings: 'optimal'
 - task: Maven@3
   inputs:
     mavenPomFile: 'pom.xml'
@@ -19,4 +22,4 @@ steps:
     jdkArchitectureOption: 'x64'
     publishJUnitResults: true
     testResultsFiles: '**/surefire-reports/TEST-*.xml'
-    goals: 'clean test'
+    goals: 'clean test -DdriverSettings.chrome.webDriverVersion=75.0.3770.140 -Dprofile=local'

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.aquality-automation</groupId>
     <artifactId>aquality-selenium</artifactId>
-    <version>1.1</version>
+    <version>1.1.1</version>
     <packaging>jar</packaging>
 
     <name>Aquality Selenium</name>
@@ -45,8 +45,24 @@
 
     <developers>
         <developer>
-            <id>aquality-automation</id>
-            <name>aquality-automation</name>
+            <id>DmitryBogatko</id>
+            <name>Dmitry Bogatko</name>
+        </developer>
+        <developer>
+            <id>pavelanihimovsky</id>
+            <name>Pavel Anihimovsky</name>
+        </developer>
+        <developer>
+            <id>Nikikuzi</id>
+            <name>Nikita Kuznetsov</name>
+        </developer>
+        <developer>
+            <id>mialeska</id>
+            <name>Alaksiej Mialeška</name>
+        </developer>
+        <developer>
+            <id>sunigos</id>
+            <name>Igor Sontsa</name>
         </developer>
     </developers>
 
@@ -147,12 +163,10 @@
                         <version>2.20</version>
                         <configuration>
                             <argLine>${surefireArgLine} -Dfile.encoding=UTF-8</argLine>
-                            <parallel>methods</parallel>
-                            <forkCount>10</forkCount>
                             <reuseForks>false</reuseForks>
-                            <includes>
-                                <include>**/*Test*.java</include>
-                            </includes>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>src/test/resources/TestSuite.xml</suiteXmlFile>
+                            </suiteXmlFiles>
                         </configuration>
                     </plugin>
                     <plugin>

src/main/java/aquality/selenium/elements/ElementFactory.java

@@ -4,6 +4,7 @@
 import aquality.selenium.browser.BrowserManager;
 import aquality.selenium.browser.JavaScript;
 import aquality.selenium.configuration.Configuration;
+import aquality.selenium.configuration.ITimeoutConfiguration;
 import aquality.selenium.elements.interfaces.*;
 import aquality.selenium.localization.LocalizationManager;
 import aquality.selenium.logger.Logger;
@@ -101,18 +102,21 @@ private  <T extends IElement> List<T> findElementsCore(By locator, IElementSuppl
         List<T> elements = new ArrayList<>();
         switch (count) {
             case ZERO:
+                ConditionalWait.waitFor(driver -> driver.findElements(locator).stream()
+                                .noneMatch(webElement -> state == ElementState.EXISTS_IN_ANY_STATE || webElement.isDisplayed()),
+                        String.format(LocalizationManager.getInstance().getValue("loc.elements.found.but.should.not"),
+                                locator.toString()));
                 break;
             case MORE_THEN_ZERO:
                 ConditionalWait.waitFor(driver -> !driver.findElements(locator).isEmpty(),
-                        String.format(LocalizationManager.getInstance().getValue("loc.no.elements.found.in.state"),
-                                locator.toString(),
-                                state.toString(),
-                                Configuration.getInstance().getTimeoutConfiguration().getCondition()));
+                        String.format(LocalizationManager.getInstance().getValue("loc.no.elements.found.by.locator"),
+                                locator.toString()));
                 break;
             default:
                 throw new IllegalArgumentException("No such expected value:".concat(count.toString()));
         }
-        List<WebElement> webElements = getBrowser().getDriver().findElements(locator);
+
+        List<WebElement> webElements = ElementFinder.getInstance().findElements(locator, getTimeoutConfig().getCondition(), state);
         int index = 1;
         for (WebElement webElement : webElements) {
             try {
@@ -180,5 +184,9 @@ private Type convertElementClassToType(Class<? extends IElement> clazz){
     private Browser getBrowser(){
         return BrowserManager.getBrowser();
     }
+
+    private ITimeoutConfiguration getTimeoutConfig(){
+        return Configuration.getInstance().getTimeoutConfiguration();
+    }
 }
 

src/main/resources/localization/en.json

@@ -63,5 +63,6 @@
   "loc.waitnotexists" : "Wait until element does not exist in DOM during %1$s seconds",
   "loc.no.elements.found.in.state" : "no elements with locator '%1$s' found in state '%2$s' during %3$s seconds",
   "loc.no.elements.found.by.locator" : "No elements were found by locator '%1$s'",
-  "loc.elements.were.found.but.not.in.state" :  "Elements were found by locator '%1$s'. But %2$s"
+  "loc.elements.were.found.but.not.in.state" :  "Elements were found by locator '%1$s' but not in desired state. %2$s",
+  "loc.elements.found.but.should.not": "No elements should be found by locator '%1$s'"
 }

src/main/resources/localization/ru.json

@@ -63,5 +63,6 @@
   "loc.waitnotexists" : "Ожидаем исчезновения элемента из DOM в течении %1$s",
   "loc.no.elements.found.in.state" : "не удалось найти элементов по локатору '%1$s' в состоянии '%2$s' на протяжении %3$s секунд",
   "loc.no.elements.found.by.locator" : "Не удалось найти элементов по локатору '%1$s'",
-  "loc.elements.were.found.but.not.in.state" :  "Удалось найти элементы по локатору '%1$s'. Но %2$s"
+  "loc.elements.were.found.but.not.in.state" :  "Удалось найти элементы по локатору '%1$s',но они не в желаемом состоянии. %2$s",
+  "loc.elements.found.but.should.not": "Не должно быть найдено элементов по локатору '%1$s'"
 }

src/test/java/aquality/selenium/utils/ElementActionRetrierTests.java

@@ -1,24 +1,31 @@
 package aquality.selenium.utils;
 
 import aquality.selenium.configuration.Configuration;
+import aquality.selenium.logger.Logger;
+import org.apache.commons.lang3.time.StopWatch;
 import org.openqa.selenium.InvalidArgumentException;
 import org.openqa.selenium.InvalidElementStateException;
 import org.openqa.selenium.StaleElementReferenceException;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
+import utils.Timer;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Date;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
 
 public class ElementActionRetrierTests {
 
-    private static final int attemptsCount = Configuration.getInstance().getRetryConfiguration().getNumber();
+    private static final int retriesCount = Configuration.getInstance().getRetryConfiguration().getNumber();
     private static final long pollingInterval = Configuration.getInstance().getRetryConfiguration().getPollingInterval();
 
+
     @DataProvider
     private Object[][] handledExceptions() {
         return new Object[][] {
@@ -36,16 +43,20 @@ public void testRetrierShouldWorkOnceIfMethodSucceeded() {
 
     @Test(dataProvider = "handledExceptions")
     public void testRetrierShouldWaitPollingTimeBetweenMethodsCall(RuntimeException handledException) {
-        Date startTime = new Date();
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
         AtomicBoolean isThrowException = new AtomicBoolean(true);
         ElementActionRetrier.doWithRetry(() -> {
             if (isThrowException.get()) {
                 isThrowException.set(false);
                 throw handledException;
             }
         });
-        long duration = new Date().getTime() - startTime.getTime();
-        assertTrue(duration >= pollingInterval && duration < 2 * pollingInterval);
+        stopWatch.stop();
+
+        long duration = stopWatch.getTime(TimeUnit.MILLISECONDS);
+        assertTrue(duration >= pollingInterval, "duration should be more than polling interval. actual is " + duration + " milliseconds");
+        assertTrue(duration <= 2 * pollingInterval, "duration should be less than doubled polling interval. actual is " + duration + " milliseconds");
     }
 
     @Test(expectedExceptions = InvalidArgumentException.class)
@@ -57,16 +68,16 @@ public void testRetrierShouldThrowUnhandledException() {
 
     @Test(dataProvider = "handledExceptions")
     public void testRetrierShouldWorkCorrectTimes(RuntimeException handledException) {
-        Date startTime = new Date();
+        AtomicInteger actualAttempts = new AtomicInteger(0);
         try {
             ElementActionRetrier.doWithRetry(() -> {
+                Logger.getInstance().info("current attempt is " + actualAttempts.incrementAndGet());
                 throw handledException;
             });
         } catch (RuntimeException e) {
             assertTrue(handledException.getClass().isInstance(e));
         }
-        long duration = new Date().getTime() - startTime.getTime();
-        assertTrue(duration >= pollingInterval * attemptsCount && duration < pollingInterval * (attemptsCount + 1));
+        assertEquals(actualAttempts.get(), retriesCount + 1, "actual attempts count is not match to expected");
     }
 
     @Test(expectedExceptions = IllegalAccessException.class)

src/test/java/automationpractice/forms/ProductListForm.java

@@ -28,16 +28,23 @@ public List<ILabel> getProductContainerLabels(){
         return getElementFactory().findElements(By.xpath(XPATH_PRODUCT_CONTAINER), ElementType.LABEL, ElementState.DISPLAYED, ElementsCount.MORE_THEN_ZERO);
     }
 
-    public ILabel getLblFirstProduct(){
+    private ILabel getLblFirstProduct(){
         return getElementFactory().getLabel(By.xpath(XPATH_PRODUCT.concat("[1]")), "First product");
     }
 
     public ILabel getLblLastProduct(){
         return getElementFactory().getLabel(By.id("homefeatured"), "home featured").findChildElement(By.xpath("//li".concat("[last()]")), ILabel.class);
     }
 
-    public IButton getBtnLastProductMore(){
-        return getLblLastProduct().findChildElement(By.xpath(".//a[contains(@class, 'lnk_view')]"), ElementType.BUTTON);
+    public IButton getBtnLastProductMoreFocused() {
+        getLblFirstProduct().getMouseActions().moveMouseToElement();
+        getLblLastProduct().getMouseActions().moveMouseToElement();
+        IButton btnLastProductMore = getLblLastProduct().findChildElement(By.xpath(".//a[contains(@class, 'lnk_view')]"), ElementType.BUTTON);
+        if(!btnLastProductMore.state().isDisplayed()) {
+            getLblLastProduct().getMouseActions().moveMouseFromElement();
+            getLblLastProduct().getMouseActions().moveMouseToElement();
+        }
+        return btnLastProductMore;
     }
 
     public void addToCardRandomProduct(){

src/test/java/tests/integration/ActionTests.java

@@ -43,39 +43,29 @@ public void testScrollIntoView() {
 
     @Test
     public void testMoveMouseToElement() {
-        ProductListForm productListForm = new ProductListForm();
-        productListForm.getLblFirstProduct().getMouseActions().moveMouseToElement();
-        productListForm.getLblLastProduct().getMouseActions().moveMouseToElement();
-        IButton button = productListForm.getBtnLastProductMore();
+        IButton button = new ProductListForm().getBtnLastProductMoreFocused();
         Assert.assertTrue(button.getText().contains("More"), "element is not focused after moveMouseToElement()");
     }
 
     @Test
     public void testMoveMouseFromElement() {
         ProductListForm productListForm = new ProductListForm();
-        productListForm.getLblLastProduct().getMouseActions().moveMouseToElement();
-        IButton button = productListForm.getBtnLastProductMore();
+        IButton button = productListForm.getBtnLastProductMoreFocused();
         Assert.assertTrue(button.getText().contains("More"), "element is not focused after moveMouseToElement()");
         productListForm.getLblLastProduct().getMouseActions().moveMouseFromElement();
         Assert.assertFalse(button.state().isDisplayed(), "element is still focused after moveMouseFromElement()");
     }
 
     @Test
     public void testGetElementText() {
-        ProductListForm productListForm = new ProductListForm();
-        productListForm.getLblFirstProduct().getMouseActions().moveMouseToElement();
-        productListForm.getLblLastProduct().getMouseActions().moveMouseToElement();
-        IButton button = productListForm.getBtnLastProductMore();
+        IButton button = new ProductListForm().getBtnLastProductMoreFocused();
         Assert.assertEquals(button.getText().trim(), button.getJsActions().getElementText().trim(),
                 "element text got via JsActions is not match to expected");
     }
 
     @Test
     public void testSetFocus() {
-        ProductListForm productListForm = new ProductListForm();
-        productListForm.getLblFirstProduct().getMouseActions().moveMouseToElement();
-        productListForm.getLblLastProduct().getMouseActions().moveMouseToElement();
-        productListForm.getBtnLastProductMore().getJsActions().clickAndWait();
+        new ProductListForm().getBtnLastProductMoreFocused().getJsActions().clickAndWait();
 
         ITextBox txbQuantity = new ProductForm().getTxbQuantity();
         txbQuantity.getJsActions().setFocus();
@@ -87,10 +77,7 @@ public void testSetFocus() {
 
     @Test
     public void testSetValue() {
-        ProductListForm productListForm = new ProductListForm();
-        productListForm.getLblFirstProduct().getMouseActions().moveMouseToElement();
-        productListForm.getLblLastProduct().getMouseActions().moveMouseToElement();
-        productListForm.getBtnLastProductMore().getJsActions().clickAndWait();
+        new ProductListForm().getBtnLastProductMoreFocused().getJsActions().clickAndWait();
 
         ProductForm productForm = new ProductForm();
         ITextBox txbQuantity = productForm.getTxbQuantity();