diff --git a/htmlelements-all/pom.xml b/htmlelements-all/pom.xml index e50cafc7..2b59cf16 100644 --- a/htmlelements-all/pom.xml +++ b/htmlelements-all/pom.xml @@ -22,11 +22,6 @@ htmlelements-matchers ${project.version} - - ru.sbtqa.htmlelements - htmlelements-thucydides - ${project.version} - diff --git a/htmlelements-java/pom.xml b/htmlelements-java/pom.xml index 96479e9f..8fc8124e 100644 --- a/htmlelements-java/pom.xml +++ b/htmlelements-java/pom.xml @@ -36,7 +36,7 @@ org.mockito - mockito-core + mockito-all ${mockito.version} test diff --git a/htmlelements-matchers/pom.xml b/htmlelements-matchers/pom.xml index 598c99ba..140533af 100644 --- a/htmlelements-matchers/pom.xml +++ b/htmlelements-matchers/pom.xml @@ -28,15 +28,10 @@ org.mockito - mockito-core + mockito-all ${mockito.version} test - - org.mockito - mockito-junit-jupiter - ${mockito.version} - diff --git a/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/ActionMatcherDecoratorTest.java b/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/ActionMatcherDecoratorTest.java index 7308d8ee..0d18dfae 100644 --- a/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/ActionMatcherDecoratorTest.java +++ b/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/ActionMatcherDecoratorTest.java @@ -5,7 +5,7 @@ import org.junit.runner.RunWith; import org.mockito.InOrder; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.runners.MockitoJUnitRunner; import ru.yandex.qatools.htmlelements.matchers.decorators.Action; import static org.hamcrest.Matchers.equalTo; diff --git a/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/ConditionMatcherDecoratorTest.java b/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/ConditionMatcherDecoratorTest.java index d1c12430..b4771b16 100644 --- a/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/ConditionMatcherDecoratorTest.java +++ b/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/ConditionMatcherDecoratorTest.java @@ -5,7 +5,7 @@ import org.junit.runner.RunWith; import org.mockito.InOrder; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.runners.MockitoJUnitRunner; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/NotSatisfiedConditionMatcherDecoratorTest.java b/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/NotSatisfiedConditionMatcherDecoratorTest.java index 4fc14006..08429d95 100644 --- a/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/NotSatisfiedConditionMatcherDecoratorTest.java +++ b/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/NotSatisfiedConditionMatcherDecoratorTest.java @@ -9,7 +9,7 @@ import org.junit.runner.RunWith; import org.junit.runners.model.Statement; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.runners.MockitoJUnitRunner; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; diff --git a/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/RefreshPageMatcherDecoratorTest.java b/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/RefreshPageMatcherDecoratorTest.java index 61adb166..3667c372 100644 --- a/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/RefreshPageMatcherDecoratorTest.java +++ b/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/RefreshPageMatcherDecoratorTest.java @@ -5,7 +5,7 @@ import org.junit.runner.RunWith; import org.mockito.InOrder; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.runners.MockitoJUnitRunner; import org.openqa.selenium.WebDriver; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/WaiterMatcherDecoratorTest.java b/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/WaiterMatcherDecoratorTest.java index 85babe5b..cb89b5a5 100644 --- a/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/WaiterMatcherDecoratorTest.java +++ b/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/WaiterMatcherDecoratorTest.java @@ -5,7 +5,7 @@ import org.junit.runner.RunWith; import org.mockito.InOrder; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.runners.MockitoJUnitRunner; import ru.yandex.qatools.htmlelements.matchers.decorators.Waiter; import static org.hamcrest.Matchers.equalTo; diff --git a/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/mockfactory/MockFactory.java b/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/mockfactory/MockFactory.java index 7645a52b..0aea7259 100644 --- a/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/mockfactory/MockFactory.java +++ b/htmlelements-matchers/src/test/java/ru/yandex/qatools/htmlelements/matchers/mockfactory/MockFactory.java @@ -5,7 +5,7 @@ import ru.yandex.qatools.htmlelements.element.Select; import ru.yandex.qatools.htmlelements.element.TextInput; -import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/htmlelements-thucydides/pom.xml b/htmlelements-thucydides/pom.xml deleted file mode 100644 index 70bf4762..00000000 --- a/htmlelements-thucydides/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - ru.sbtqa.htmlelements - htmlelements - 1.21.0-SNAPSHOT - - 4.0.0 - - htmlelements-thucydides - Yandex QATools HtmlElements Thucydides Integration - - - 2.0.30 - - - - - ru.sbtqa.htmlelements - htmlelements-java - ${project.version} - - - org.mockito - mockito-core - ${mockito.version} - test - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.3 - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.3 - true - - ossrh - https://oss.sonatype.org/ - true - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - attach-javadocs - - jar - - - - - - - - \ No newline at end of file diff --git a/htmlelements-thucydides/src/main/java/ru/yandex/qatools/htmlelements/thucydides/BlockPageObject.java b/htmlelements-thucydides/src/main/java/ru/yandex/qatools/htmlelements/thucydides/BlockPageObject.java deleted file mode 100644 index 621557ae..00000000 --- a/htmlelements-thucydides/src/main/java/ru/yandex/qatools/htmlelements/thucydides/BlockPageObject.java +++ /dev/null @@ -1,23 +0,0 @@ -package ru.yandex.qatools.htmlelements.thucydides; - -import net.thucydides.core.pages.PageObject; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.support.PageFactory; -import ru.yandex.qatools.htmlelements.loader.decorator.HtmlElementDecorator; -import ru.yandex.qatools.htmlelements.loader.decorator.HtmlElementLocatorFactory; - -/** - * @author Artem Eroshenko eroshenkoam - * 5/6/13, 6:02 PM - */ -public class BlockPageObject extends PageObject { - - public BlockPageObject(final WebDriver driver) { - super(driver, pageObject -> { - PageFactory.initElements( - new HtmlElementDecorator( - new HtmlElementLocatorFactory(driver)), pageObject); - return true; - }); - } -} diff --git a/htmlelements-thucydides/src/test/java/ru/yandex/qatools/htmlelements/thucydides/BlockPageTest.java b/htmlelements-thucydides/src/test/java/ru/yandex/qatools/htmlelements/thucydides/BlockPageTest.java deleted file mode 100644 index aa3fe37b..00000000 --- a/htmlelements-thucydides/src/test/java/ru/yandex/qatools/htmlelements/thucydides/BlockPageTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package ru.yandex.qatools.htmlelements.thucydides; - -import org.junit.Before; -import org.junit.Test; -import org.openqa.selenium.By; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -/** - * @author Artem Eroshenko eroshenkoam - * 5/6/13, 6:13 PM - */ -public class BlockPageTest { - - WebDriver driver = mock(WebDriver.class); - - @Before - public void initDriver() { - WebElement blockElement = mock(WebElement.class); - WebElement innerElement = mock(WebElement.class); - when(blockElement.findElement(By.className("element"))).thenReturn(innerElement); - when(driver.findElement(By.className("block"))).thenReturn(blockElement); - } - - @Test - public void blockPageWithBlockElementShouldInitialise() { - SomePage page = new SomePage(driver); - assertThat(page, not(nullValue())); - assertThat(page.blockElement, not(nullValue())); - assertThat(page.blockElement.innerElement, not(nullValue())); - } -} diff --git a/htmlelements-thucydides/src/test/java/ru/yandex/qatools/htmlelements/thucydides/SomeBlockElement.java b/htmlelements-thucydides/src/test/java/ru/yandex/qatools/htmlelements/thucydides/SomeBlockElement.java deleted file mode 100644 index 731fb72d..00000000 --- a/htmlelements-thucydides/src/test/java/ru/yandex/qatools/htmlelements/thucydides/SomeBlockElement.java +++ /dev/null @@ -1,15 +0,0 @@ -package ru.yandex.qatools.htmlelements.thucydides; - -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; -import ru.yandex.qatools.htmlelements.element.HtmlElement; - -/** - * @author Artem Eroshenko eroshenkoam - * 5/6/13, 6:12 PM - */ -public class SomeBlockElement extends HtmlElement { - - @FindBy(className = "element") - public WebElement innerElement; -} diff --git a/htmlelements-thucydides/src/test/java/ru/yandex/qatools/htmlelements/thucydides/SomePage.java b/htmlelements-thucydides/src/test/java/ru/yandex/qatools/htmlelements/thucydides/SomePage.java deleted file mode 100644 index e3d44088..00000000 --- a/htmlelements-thucydides/src/test/java/ru/yandex/qatools/htmlelements/thucydides/SomePage.java +++ /dev/null @@ -1,18 +0,0 @@ -package ru.yandex.qatools.htmlelements.thucydides; - -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.support.FindBy; - -/** - * @author Artem Eroshenko eroshenkoam - * 5/6/13, 6:11 PM - */ -public class SomePage extends BlockPageObject { - - @FindBy(className = "block") - public SomeBlockElement blockElement; - - public SomePage(WebDriver driver) { - super(driver); - } -} diff --git a/pom.xml b/pom.xml index 5a211a24..8690f721 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ https://github.com/yandex-qatools/htmlelements/ - 5.1.1 + 1.10.19 4.8.1 UTF-8 1.8 @@ -64,7 +64,6 @@ htmlelements-java htmlelements-matchers - htmlelements-thucydides htmlelements-all