Changed all the scenarios with JUnit and did some tweaks on the code …

…so that all tests are independent

pom.xml

@@ -146,14 +146,6 @@
       <version>4.20.0</version>
     </dependency>
 
-    <!-- https://mvnrepository.com/artifact/org.testng/testng -->
-    <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <version>7.9.0</version>
-      <scope>test</scope>
-    </dependency>
-
     <!-- https://mvnrepository.com/artifact/org.uncommons/reportng -->
     <dependency>
       <groupId>org.uncommons</groupId>

src/test/java/selenium/TestBase.java

@@ -1,5 +1,7 @@
 package selenium;
 
+import org.junit.After;
+import org.junit.Before;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -9,9 +11,6 @@
 import org.openqa.selenium.edge.EdgeOptions;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.firefox.FirefoxOptions;
-import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
 
 import java.io.FileReader;
 import java.io.IOException;
@@ -37,7 +36,7 @@ public class TestBase {
 
 	public static FileReader frInput;
 
-	@BeforeMethod
+	@Before
 	public void setUp() throws IOException {
 		String userDirectory = System.getProperty("user.dir");
 		String basePath = "\\src\\test\\java\\selenium\\config\\";
@@ -86,12 +85,11 @@ public void setUp() throws IOException {
 		WebElement welcomePhoto = driver.findElement(By.className(locators.getProperty("welcomePhoto")));
 		String ActualWelcomePhotoSrc = welcomePhoto.getAttribute("src");
 		String expectedWelcomePhoto = tap.getProperty("welcomePhoto");
-		Assert.assertEquals(ActualWelcomePhotoSrc, expectedWelcomePhoto);
+		org.junit.Assert.assertEquals(ActualWelcomePhotoSrc, expectedWelcomePhoto);
 	}
 
-	@AfterMethod
+	@After
 	public void tearDown() {
 		driver.quit();
 	}
-
 }

src/test/java/selenium/pages/ListOwnersPage.java

@@ -10,9 +10,10 @@
 import java.util.List;
 import java.util.Properties;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+
 
 public class ListOwnersPage extends TestBase {
 
@@ -35,15 +36,15 @@ public void tableAppearance() {
 		assertTrue(tableElement.isDisplayed(), "Table is displayed");
 		assertEquals(rows.size(), 6, "Expected 6 rows in the table");
 
-		String owner1 = tap.getProperty("Owner1");
-		String owner2 = tap.getProperty("Owner2");
+		String owner1 = driver.findElement(By.xpath("(//tr)[2]")).getText();
+		String owner2 = driver.findElement(By.xpath("(//tr)[3]")).getText();
 
 		assertEquals(rows.get(1).getText(), owner1, "Incorrect data in row 1");
 		assertEquals(rows.get(2).getText(), owner2, "Incorrect data in row 2");
 	}
 
-	public void clickOnNameFromTable() {
-		WebElement firstRow = rows.get(1);
+	public void clickOnNameFromTable(int row) {
+		WebElement firstRow = rows.get(row);
 		List<WebElement> name = firstRow.findElements(By.tagName("td"));
 		WebElement firstName = name.get(0);
 		String firstNameText = firstName.getText();

src/test/java/selenium/scenarios/TS02AddOwnerTest.java → src/test/java/selenium/scenarios/AddOwnerTest.java

@@ -1,26 +1,22 @@
 package selenium.scenarios;
 
-import jdk.jfr.Description;
-import org.jetbrains.annotations.NotNull;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import org.junit.Before;
+import org.junit.Test;
 import selenium.TestBase;
 import selenium.pages.AddOwnerPage;
 import selenium.pages.FindOwnersPage;
 import selenium.pages.ListOwnersPage;
 import selenium.pages.OwnerPage;
 
-import static org.testng.AssertJUnit.*;
+import static org.junit.Assert.*;
 
-public class TS02AddOwnerTest extends TestBase {
+public class AddOwnerTest extends TestBase {
 
 	private AddOwnerPage addOwnerPage;
-
 	private OwnerPage ownerPage;
-
 	private FindOwnersPage findOwnersPage;
 
-	@BeforeMethod
+	@Before
 	public void setObjects() {
 		addOwnerPage = new AddOwnerPage(driver, locators);
 		ownerPage = new OwnerPage(driver, locators);
@@ -32,8 +28,8 @@ public void navigateToAddOwner() {
 		findOwnersPage.clickOnAddOwnerButton();
 	}
 
-	public void addOrEditAnOwner(@NotNull String action, String firstName, String lastName, String address, String city,
-			String telephone) {
+	public void addOrEditAnOwner(String action, String firstName, String lastName, String address, String city,
+								 String telephone) {
 		String firstNameText = input.getProperty(firstName);
 		String lastNameText = input.getProperty(lastName);
 		String addressText = input.getProperty(address);
@@ -43,14 +39,12 @@ public void addOrEditAnOwner(@NotNull String action, String firstName, String la
 		addOwnerPage.setTextInFields(firstNameText, lastNameText, addressText, cityText, telephoneText);
 		if (action.equalsIgnoreCase("add")) {
 			addOwnerPage.clickingOnAddOwnerButton();
-		}
-		else if (action.equalsIgnoreCase("update")) {
+		} else if (action.equalsIgnoreCase("update")) {
 			addOwnerPage.clickOnUpdateOwnerButton();
 		}
 	}
 
 	@Test
-	@Description("Validate successfully adding an owner")
 	public void testAddingAnOwner() {
 		navigateToAddOwner();
 		addOrEditAnOwner("add", "firstName", "lastName", "address", "city", "telephone");
@@ -59,8 +53,7 @@ public void testAddingAnOwner() {
 		assertTrue(ownerPage.isLastNameDisplayed(input.getProperty("lastName")));
 	}
 
-	@Test(priority = 1)
-	@Description("Validate adding an owner without filling any of the fields")
+	@Test
 	public void testEmptyFields() {
 		navigateToAddOwner();
 		addOwnerPage.clickingOnAddOwnerButton();
@@ -69,9 +62,8 @@ public void testEmptyFields() {
 		assertTrue(addOwnerPage.isErrorMessageDisplayedForEmptyFields(expectedErrorMessage));
 	}
 
-	// User is still created - REPORT DEFECT!!!
-	@Test(priority = 2)
-	@Description("Validate if an owner is added after putting numbers in the name fields")
+	// User is still created after putting numbers in the name fields - REPORT DEFECT!!!
+	@Test
 	public void testNumbersInNameFields() {
 		navigateToAddOwner();
 
@@ -81,8 +73,7 @@ public void testNumbersInNameFields() {
 	}
 
 	// You can add the same owner twice - REPORT DEFECT!!!
-	@Test(priority = 3)
-	@Description("Validate if you can add the same owner twice")
+	@Test
 	public void testCreateSameOwnerTwice() {
 		navigateToAddOwner();
 
@@ -93,46 +84,43 @@ public void testCreateSameOwnerTwice() {
 		assertFalse("Message should not be visible", ownerPage.isSuccessMessageDisplayed());
 	}
 
-	@Test(priority = 4)
-	@Description("Validate if an owner is added after putting text in the 'Telephone' field")
+	@Test
 	public void testTextInTelephoneField() {
 		navigateToAddOwner();
 
 		addOrEditAnOwner("add", "firstName", "lastName", "address", "city", "textInTelephoneField");
 
 		String expectedErrorMessage = tap.getProperty("errorMessageTelephoneField");
 		assertTrue("Error message should be displayed for invalid telephone number",
-				addOwnerPage.isErrorMessageDisplayedForTextInTelephoneField(expectedErrorMessage));
+			addOwnerPage.isErrorMessageDisplayedForTextInTelephoneField(expectedErrorMessage));
 	}
 
-	@Test(priority = 5)
-	@Description("Validate updating an owner")
+	@Test
 	public void testUpdateOwner() {
 		findOwnersPage.navigateToFindOwnersPage();
 		findOwnersPage.clickOnFindOwnerButton();
 
 		ListOwnersPage listOwnersPage = new ListOwnersPage(driver, locators);
-		listOwnersPage.clickOnNameFromTable();
+		listOwnersPage.clickOnNameFromTable(2);
 
 		ownerPage.clickOnEditOwnerButton();
 		addOwnerPage.clearFields();
 
 		addOrEditAnOwner("update", "updateFirstName", "updateLastName", "updateAddress", "updateCity",
-				"updateTelephone");
+			"updateTelephone");
 
 		assertTrue(ownerPage.isUpdateMessageDisplayed());
 		assertTrue(ownerPage.isLastNameDisplayed(input.getProperty("updateLastName")));
 	}
 
 	// User can still be updated - REPORT DEFECT!!!
-	@Test(priority = 6)
-	@Description("Validate updating an owner with the details of an already existing owner")
-	public void testUpdateOwnerWithExistingDetails() {
+	@Test
+	public void testUpdateOwnerWithSameDetailsFromOtherOwner() {
 		findOwnersPage.navigateToFindOwnersPage();
 		findOwnersPage.clickOnFindOwnerButton();
 
 		ListOwnersPage listOwnersPage = new ListOwnersPage(driver, locators);
-		listOwnersPage.clickOnNameFromTable();
+		listOwnersPage.clickOnNameFromTable(3);
 
 		ownerPage.clickOnEditOwnerButton();
 		addOwnerPage.clearFields();
@@ -142,8 +130,7 @@ public void testUpdateOwnerWithExistingDetails() {
 		assertFalse("Error message is not displayed", ownerPage.isUpdateMessageDisplayed());
 	}
 
-	@Test(priority = 7)
-	@Description("Validate if a newly added owner can be updated")
+	@Test
 	public void testUpdateNewlyAddedOwner() {
 		navigateToAddOwner();
 		addOrEditAnOwner("add", "firstName3", "lastName3", "address3", "city3", "telephone3");
@@ -152,10 +139,9 @@ public void testUpdateNewlyAddedOwner() {
 		addOwnerPage.clearFields();
 
 		addOrEditAnOwner("update", "updateFirstName2", "updateLastName2", "updateAddress2", "updateCity2",
-				"updateTelephone2");
+			"updateTelephone2");
 
 		assertTrue(ownerPage.isUpdateMessageDisplayed());
 		assertTrue(ownerPage.isLastNameDisplayed(input.getProperty("updateLastName2")));
 	}
-
 }