diff --git a/StartUsingWebDriver.iml b/StartUsingWebDriver.iml new file mode 100644 index 0000000..36d8056 --- /dev/null +++ b/StartUsingWebDriver.iml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 523a4c3..1af3c2f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,9 +26,9 @@ - junit - junit - 4.12 + org.testng + testng + 6.11 org.seleniumhq.selenium diff --git a/src/main/java/com/itnove/trainings/junit/startUsingWebDriver/App.java b/src/main/java/com/itnove/trainings/testng/startUsingWebDriver/App.java similarity index 63% rename from src/main/java/com/itnove/trainings/junit/startUsingWebDriver/App.java rename to src/main/java/com/itnove/trainings/testng/startUsingWebDriver/App.java index 4fc06ec..f7b41a0 100644 --- a/src/main/java/com/itnove/trainings/junit/startUsingWebDriver/App.java +++ b/src/main/java/com/itnove/trainings/testng/startUsingWebDriver/App.java @@ -1,4 +1,4 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; /** * Hello world! diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/BasicAuth.java b/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/BasicAuth.java deleted file mode 100644 index 36990e5..0000000 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/BasicAuth.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.itnove.trainings.junit.startUsingWebDriver; - -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.ResultsPage; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.SearchPage; -import org.junit.Assert; -import org.junit.Test; - - -/** - * Unit test for simple App. - */ -public class BasicAuth extends BaseTest { - - @Test - public void testApp() throws InterruptedException { - driver.navigate().to("https://admin:admin@the-internet.herokuapp.com/basic_auth"); - Thread.sleep(5000); - - } -} diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/AlertsTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/AlertsTest.java similarity index 94% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/AlertsTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/AlertsTest.java index de0aad6..a42f915 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/AlertsTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/AlertsTest.java @@ -1,16 +1,14 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; - - -import org.junit.Test; import org.openqa.selenium.Alert; import org.openqa.selenium.By; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; +import org.testng.annotations.Test; /** - * Unit test for simple App. + * Alerts Test from The Internet */ public class AlertsTest extends BaseTest { diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/AppTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/AppTest.java similarity index 65% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/AppTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/AppTest.java index e9fdc53..f515ffe 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/AppTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/AppTest.java @@ -1,13 +1,13 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.ResultsPage; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.SearchPage; -import org.junit.Assert; -import org.junit.Test; +import com.itnove.trainings.testng.startUsingWebDriver.pages.searchPage.ResultsPage; +import com.itnove.trainings.testng.startUsingWebDriver.pages.searchPage.SearchPage; +import org.testng.Assert; +import org.testng.annotations.Test; /** - * Unit test for simple App. + * Initial example appTest */ public class AppTest extends BaseTest { diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/BaseTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/BaseTest.java similarity index 86% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/BaseTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/BaseTest.java index c4dc57b..3308c6b 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/BaseTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/BaseTest.java @@ -1,15 +1,13 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; + -import org.junit.After; -import org.junit.Before; import org.openqa.selenium.JavascriptExecutor; -import org.openqa.selenium.WebDriver; import org.openqa.selenium.chrome.ChromeDriver; -import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.remote.RemoteWebDriver; -import org.openqa.selenium.support.ui.WebDriverWait; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; import java.io.File; import java.io.IOException; @@ -26,7 +24,7 @@ public class BaseTest { public static LocalRemoteWebDriverWait wait; public static JavascriptExecutor jse; - @Before + @BeforeMethod public void setUp() throws IOException { DesiredCapabilities capabilities = DesiredCapabilities.chrome(); System.setProperty("webdriver.chrome.driver", "src" + File.separator + "main" + File.separator + "resources" + File.separator + "chromedriver-linux"); @@ -45,7 +43,7 @@ public class BaseTest { driver.manage().timeouts().implicitlyWait(timeOut, TimeUnit.SECONDS); } - @After + @AfterMethod public void tearDown() { driver.quit(); } diff --git a/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/BasicAuth.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/BasicAuth.java new file mode 100644 index 0000000..1367512 --- /dev/null +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/BasicAuth.java @@ -0,0 +1,17 @@ +package com.itnove.trainings.testng.startUsingWebDriver; + +import org.testng.annotations.Test; + + +/** + * Basic Auth from the Internet + */ +public class BasicAuth extends BaseTest { + + @Test + public void testApp() throws InterruptedException { + driver.navigate().to("https://admin:admin@the-internet.herokuapp.com/basic_auth"); + Thread.sleep(5000); + + } +} diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/ChallengingDomTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/ChallengingDomTest.java similarity index 71% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/ChallengingDomTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/ChallengingDomTest.java index 3d4bf0e..a80ebd0 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/ChallengingDomTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/ChallengingDomTest.java @@ -1,9 +1,6 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.ResultsPage; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.SearchPage; -import org.junit.Assert; -import org.junit.Test; +import org.testng.annotations.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; @@ -11,7 +8,7 @@ import java.util.List; /** - * Unit test for simple App. + * Challengin Dom from the Internet Heroku App */ public class ChallengingDomTest extends BaseTest { diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/CheckBoxesTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/CheckBoxesTest.java similarity index 66% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/CheckBoxesTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/CheckBoxesTest.java index b9047ac..c8da675 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/CheckBoxesTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/CheckBoxesTest.java @@ -1,18 +1,15 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.ResultsPage; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.SearchPage; -import org.junit.Assert; -import org.junit.Test; +import org.testng.annotations.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import static junit.framework.TestCase.assertTrue; -import static org.junit.Assert.assertNull; +import static org.testng.Assert.assertTrue; +import static org.testng.AssertJUnit.assertNull; /** - * Unit test for simple App. + * Checkboxes from the Internet Heroku App */ public class CheckBoxesTest extends BaseTest { diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/DisappearingElementsTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/DisappearingElementsTest.java similarity index 65% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/DisappearingElementsTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/DisappearingElementsTest.java index bb4afcf..5c0ff25 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/DisappearingElementsTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/DisappearingElementsTest.java @@ -1,17 +1,12 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.ResultsPage; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.SearchPage; -import org.junit.Assert; -import org.junit.Test; +import org.testng.annotations.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import java.util.List; - /** - * Unit test for simple App. + * Disappearing Elements from The Internet HerokuApp */ public class DisappearingElementsTest extends BaseTest { diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/DragAndDropTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/DragAndDropTest.java similarity index 81% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/DragAndDropTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/DragAndDropTest.java index ed7df38..a0c6162 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/DragAndDropTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/DragAndDropTest.java @@ -1,16 +1,13 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.ResultsPage; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.SearchPage; -import org.junit.Assert; -import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; +import org.testng.annotations.Test; /** - * Unit test for simple App. + * Drag and Drop test from Compendium Dev */ public class DragAndDropTest extends BaseTest { diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/DropdownTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/DropdownTest.java similarity index 69% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/DropdownTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/DropdownTest.java index 9eb0732..3bd9c8c 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/DropdownTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/DropdownTest.java @@ -1,9 +1,6 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.ResultsPage; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.SearchPage; -import org.junit.Assert; -import org.junit.Test; +import org.testng.annotations.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; @@ -11,7 +8,7 @@ import java.util.List; /** - * Unit test for simple App. + * Drop Down from the Internet Heroku App */ public class DropdownTest extends BaseTest { diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/DynamicContentTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/DynamicContentTest.java similarity index 76% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/DynamicContentTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/DynamicContentTest.java index 9f80c62..0463e2e 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/DynamicContentTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/DynamicContentTest.java @@ -1,17 +1,14 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.ResultsPage; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.SearchPage; -import org.junit.Assert; -import org.junit.Test; +import org.testng.annotations.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import static junit.framework.TestCase.assertFalse; +import static org.testng.Assert.assertFalse; /** - * Unit test for simple App. + * Dynamic Content from The Internet Heroku App */ public class DynamicContentTest extends BaseTest { diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/FramesTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/FramesTest.java similarity index 80% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/FramesTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/FramesTest.java index 92ded1e..77fc651 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/FramesTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/FramesTest.java @@ -1,9 +1,6 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.ResultsPage; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.SearchPage; -import org.junit.Assert; -import org.junit.Test; +import org.testng.annotations.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/HoverMenuTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/HoverMenuTest.java similarity index 89% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/HoverMenuTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/HoverMenuTest.java index c577672..813f6ad 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/HoverMenuTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/HoverMenuTest.java @@ -1,16 +1,14 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; -import org.junit.Test; +import org.testng.annotations.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; -import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.ExpectedConditions; -import org.openqa.selenium.support.ui.WebDriverWait; import java.util.List; -import static junit.framework.TestCase.assertTrue; +import static org.testng.Assert.assertTrue; /** diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/JWPlayer.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/JWPlayer.java similarity index 99% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/JWPlayer.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/JWPlayer.java index 61d3716..29484cc 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/JWPlayer.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/JWPlayer.java @@ -1,4 +1,4 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/JsExecutorTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/JsExecutorTest.java similarity index 95% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/JsExecutorTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/JsExecutorTest.java index b7e7874..0e18226 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/JsExecutorTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/JsExecutorTest.java @@ -1,9 +1,9 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; -import org.junit.Test; +import org.testng.annotations.Test; import org.openqa.selenium.*; -import static org.junit.Assert.assertTrue; +import static org.testng.Assert.assertTrue; /** @@ -11,7 +11,6 @@ import static org.junit.Assert.assertTrue; */ public class JsExecutorTest extends BaseTest { - @Test public void testVideoAvanzado() throws Exception { driver.get("http://www.ccma.cat/tv3/directe-avancat/324/"); diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/LocalNavigationActions.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/LocalNavigationActions.java similarity index 99% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/LocalNavigationActions.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/LocalNavigationActions.java index 7fdc102..f691515 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/LocalNavigationActions.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/LocalNavigationActions.java @@ -1,4 +1,4 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; import org.openqa.selenium.*; import org.openqa.selenium.interactions.Actions; diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/LocalRemoteWebDriverWait.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/LocalRemoteWebDriverWait.java similarity index 99% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/LocalRemoteWebDriverWait.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/LocalRemoteWebDriverWait.java index a976fe0..b34bd31 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/LocalRemoteWebDriverWait.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/LocalRemoteWebDriverWait.java @@ -1,4 +1,4 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/Locators.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/Locators.java similarity index 91% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/Locators.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/Locators.java index df96839..a82ff96 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/Locators.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/Locators.java @@ -1,4 +1,4 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; import org.openqa.selenium.By; diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/RegisterTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/RegisterTest.java similarity index 79% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/RegisterTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/RegisterTest.java index 9f8e307..5491f0e 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/RegisterTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/RegisterTest.java @@ -1,15 +1,12 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.ResultsPage; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.SearchPage; -import org.junit.Assert; -import org.junit.Test; +import org.testng.annotations.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.ui.ExpectedConditions; -import static junit.framework.TestCase.assertTrue; +import static org.testng.Assert.assertTrue; /** diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/SearchTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/SearchTest.java similarity index 90% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/SearchTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/SearchTest.java index 53dae57..199d575 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/SearchTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/SearchTest.java @@ -1,14 +1,13 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; -import org.junit.Test; +import org.testng.annotations.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.ui.ExpectedConditions; import java.util.List; -import static junit.framework.TestCase.assertTrue; +import static org.testng.Assert.assertTrue; /** diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/TestABTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/TestABTest.java similarity index 72% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/TestABTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/TestABTest.java index 2891358..46c3085 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/TestABTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/TestABTest.java @@ -1,13 +1,10 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.ResultsPage; -import com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage.SearchPage; -import org.junit.Assert; -import org.junit.Test; +import org.testng.annotations.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import static junit.framework.TestCase.assertTrue; +import static org.testng.Assert.assertTrue; /** diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/UploadTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/UploadTest.java similarity index 81% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/UploadTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/UploadTest.java index 212a5b6..73077c0 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/UploadTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/UploadTest.java @@ -1,15 +1,13 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; -import org.junit.Test; +import org.testng.annotations.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.ExpectedConditions; import java.io.File; -import java.util.List; -import static junit.framework.TestCase.assertTrue; +import static org.testng.Assert.assertTrue; /** diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/iFramesTest.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/iFramesTest.java similarity index 91% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/iFramesTest.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/iFramesTest.java index 7b74fe6..1336285 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/iFramesTest.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/iFramesTest.java @@ -1,6 +1,6 @@ -package com.itnove.trainings.junit.startUsingWebDriver; +package com.itnove.trainings.testng.startUsingWebDriver; -import org.junit.Test; +import org.testng.annotations.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/pages/searchPage/ResultsPage.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/pages/searchPage/ResultsPage.java similarity index 90% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/pages/searchPage/ResultsPage.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/pages/searchPage/ResultsPage.java index 5657fd0..22061bd 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/pages/searchPage/ResultsPage.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/pages/searchPage/ResultsPage.java @@ -1,4 +1,4 @@ -package com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage; +package com.itnove.trainings.testng.startUsingWebDriver.pages.searchPage; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/pages/searchPage/SearchPage.java b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/pages/searchPage/SearchPage.java similarity index 90% rename from src/test/java/com/itnove/trainings/junit/startUsingWebDriver/pages/searchPage/SearchPage.java rename to src/test/java/com/itnove/trainings/testng/startUsingWebDriver/pages/searchPage/SearchPage.java index 81097f1..edc09f3 100644 --- a/src/test/java/com/itnove/trainings/junit/startUsingWebDriver/pages/searchPage/SearchPage.java +++ b/src/test/java/com/itnove/trainings/testng/startUsingWebDriver/pages/searchPage/SearchPage.java @@ -1,4 +1,4 @@ -package com.itnove.trainings.junit.startUsingWebDriver.pages.searchPage; +package com.itnove.trainings.testng.startUsingWebDriver.pages.searchPage; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement;