Skip to content

Commit be93d33

Browse files
cgjangidcgjangid
committed
minor changes made
1 parent 7ec336a commit be93d33

35 files changed

+537
-458
lines changed

‎.idea/vcs.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,4 @@
5757
<scope>provided</scope>
5858
</dependency>
5959
</dependencies>
60-
6160
</project>

‎src/main/java/com/actoJava/qa/pages/HomePage.java

-6
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,10 @@ public String getLoggedInUserName() {
3838
return loggedInUserName.getText();
3939
}
4040

41-
public TablesPage navigateToTablesPage() {
42-
linkForTablesPage.click();
43-
return new TablesPage();
44-
}
45-
4641
public LoginPage logoutFromApp() {
4742
loggedInUserName.click();
4843
logoutLink.click();
4944
logoutButtonInPopup.click();
5045
return new LoginPage();
5146
}
52-
5347
}

‎src/main/java/com/actoJava/qa/pages/LoginPage.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.openqa.selenium.WebElement;
66
import org.openqa.selenium.support.FindBy;
77
import org.openqa.selenium.support.PageFactory;
8-
import org.testng.Reporter;
98

109
public class LoginPage extends BaseTest {
1110

@@ -48,8 +47,8 @@ public HomePage loginToApplication(String email, String pwd) {
4847
return new HomePage();
4948
}
5049
// function to navigate to User Register Page which will return a Register Page
51-
public RegisterPage navigateToRegisterPage() {
50+
public UserRegisterPage navigateToRegisterPage() {
5251
createAccountLink.click();
53-
return new RegisterPage();
52+
return new UserRegisterPage();
5453
}
5554
}

‎src/main/java/com/actoJava/qa/pages/TablesPage.java

-23
This file was deleted.

‎src/main/java/com/actoJava/qa/pages/RegisterPage.java ‎src/main/java/com/actoJava/qa/pages/UserRegisterPage.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.openqa.selenium.support.FindBy;
66
import org.openqa.selenium.support.PageFactory;
77

8-
public class RegisterPage extends BaseTest {
8+
public class UserRegisterPage extends BaseTest {
99

1010
// object repository for register page
1111
@FindBy(xpath = "/html/body/div/div/div/div/div[2]/div/div[1]/h1")
@@ -30,7 +30,7 @@ public class RegisterPage extends BaseTest {
3030
WebElement registerButtonRegister;
3131

3232
// constructor with PageFactory to initiate all the page objects
33-
public RegisterPage() {
33+
public UserRegisterPage() {
3434
PageFactory.initElements(driver, this);
3535
}
3636

‎src/main/java/com/actoJava/qa/util/WebDriverEventListenerImpl.java

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package com.actoJava.qa.util;
22

3-
import com.actoJava.qa.base.BaseTest;
43
import org.openqa.selenium.By;
54
import org.openqa.selenium.OutputType;
65
import org.openqa.selenium.WebDriver;
76
import org.openqa.selenium.WebElement;
87
import org.openqa.selenium.support.events.WebDriverEventListener;
98

10-
public class WebDriverEventListenerImpl extends BaseTest implements WebDriverEventListener {
9+
public class WebDriverEventListenerImpl implements WebDriverEventListener {
1110

1211
// copy this whole class file as it is and it will work for your project
1312
public void beforeNavigateTo(String url, WebDriver driver) {
@@ -77,72 +76,57 @@ public void afterScript(String script, WebDriver driver) {
7776

7877
public void beforeAlertAccept(WebDriver driver) {
7978
// TODO Auto-generated method stub
80-
8179
}
8280

8381
public void afterAlertAccept(WebDriver driver) {
8482
// TODO Auto-generated method stub
85-
8683
}
8784

8885
public void afterAlertDismiss(WebDriver driver) {
8986
// TODO Auto-generated method stub
90-
9187
}
9288

9389
public void beforeAlertDismiss(WebDriver driver) {
9490
// TODO Auto-generated method stub
95-
9691
}
9792

9893
public void beforeNavigateRefresh(WebDriver driver) {
9994
// TODO Auto-generated method stub
100-
10195
}
10296

10397
public void afterNavigateRefresh(WebDriver driver) {
10498
// TODO Auto-generated method stub
105-
10699
}
107100

108101
public void beforeChangeValueOf(WebElement element, WebDriver driver, CharSequence[] keysToSend) {
109102
// TODO Auto-generated method stub
110-
111103
}
112104

113105
public void afterChangeValueOf(WebElement element, WebDriver driver, CharSequence[] keysToSend) {
114106
// TODO Auto-generated method stub
115-
116107
}
117108

118109
public <X> void afterGetScreenshotAs(OutputType<X> arg0, X arg1) {
119110
// TODO Auto-generated method stub
120-
121111
}
122112

123113
public void afterGetText(WebElement arg0, WebDriver arg1, String arg2) {
124114
// TODO Auto-generated method stub
125-
126115
}
127116

128117
public void afterSwitchToWindow(String arg0, WebDriver arg1) {
129118
// TODO Auto-generated method stub
130-
131119
}
132120

133121
public <X> void beforeGetScreenshotAs(OutputType<X> arg0) {
134122
// TODO Auto-generated method stub
135-
136123
}
137124

138125
public void beforeGetText(WebElement arg0, WebDriver arg1) {
139126
// TODO Auto-generated method stub
140-
141127
}
142128

143129
public void beforeSwitchToWindow(String arg0, WebDriver arg1) {
144130
// TODO Auto-generated method stub
145-
146131
}
147-
148132
}

‎src/main/resources/endToEndTestsTestNG.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<test name="Dummy Website End to End TCs">
1010
<classes>
1111
<class name="com.actoJava.qa.endToEndTests.EndToEndTests"></class>
12-
<!--<class name="com.actoJava.qa.featureAbcTests.FailureTest"></class>-->
12+
<class name="com.actoJava.qa.endToEndTests.MultipleTestDataE2ETestExample"></class>
1313
</classes>
1414
</test>
1515
</suite>

‎src/test/java/com/actoJava/qa/endToEndTests/EndToEndTests.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,29 @@
33
import com.actoJava.qa.base.BaseTest;
44
import com.actoJava.qa.pages.HomePage;
55
import com.actoJava.qa.pages.LoginPage;
6-
import com.actoJava.qa.pages.RegisterPage;
6+
import com.actoJava.qa.pages.UserRegisterPage;
77
import org.testng.Assert;
88
import org.testng.Reporter;
99
import org.testng.annotations.Test;
1010

1111
public class EndToEndTests extends BaseTest {
1212

13+
// this test uses hardcoded test data
14+
// another class is created which uses parameterised test data from Excel
1315
@Test(priority = 1, enabled = true)
1416
public void testNewUserRegisterAndLogin() {
1517
Reporter.log("======Open application======", true);
1618
LoginPage loginPage = new LoginPage();
1719

1820
Reporter.log("======Navigate to User Register page======", true);
19-
RegisterPage registerPage = loginPage.navigateToRegisterPage();
21+
UserRegisterPage userRegisterPage = loginPage.navigateToRegisterPage();
2022

2123
Reporter.log("======Verify that Register Page is displayed======", true);
22-
Assert.assertTrue(registerPage.isRegisterPageDisplayed(), "Register Page is displayed");
24+
Assert.assertTrue(userRegisterPage.isRegisterPageDisplayed(), "Register Page is displayed");
2325

24-
if (registerPage.isRegisterPageDisplayed()) {
26+
if (userRegisterPage.isRegisterPageDisplayed()) {
2527
Reporter.log("======Register a User with test data======", true);
26-
registerPage.registerUser("firstName", "lastName", "[email protected]", "password");
28+
userRegisterPage.registerUser("firstName", "lastName", "[email protected]", "password");
2729

2830
Reporter.log("======Verify that Login Page is displayed======", true);
2931
Assert.assertTrue(loginPage.isLoginPageDisplayed(), "Login Page is displayed");

‎src/test/java/com/actoJava/qa/endToEndTests/MultipleTestDataE2ETestExample.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.actoJava.qa.base.BaseTest;
44
import com.actoJava.qa.pages.HomePage;
55
import com.actoJava.qa.pages.LoginPage;
6-
import com.actoJava.qa.pages.RegisterPage;
6+
import com.actoJava.qa.pages.UserRegisterPage;
77
import com.actoJava.qa.util.ExcelUtility;
88
import org.testng.Assert;
99
import org.testng.Reporter;
@@ -12,20 +12,21 @@
1212

1313
public class MultipleTestDataE2ETestExample extends BaseTest {
1414

15-
@Test(priority = 1, enabled = true, dataProvider = "getUserData")
15+
// this test uses test data from dataProvider which fetches data from excel
16+
@Test(priority = 2, enabled = true, dataProvider = "getUserData")
1617
public void testNewUserMultipleTestData(String firstName, String lastName, String email, String pwd) {
1718
Reporter.log("======Open application======", true);
1819
LoginPage loginPage = new LoginPage();
1920

2021
Reporter.log("======Navigate to User Register page======", true);
21-
RegisterPage registerPage = loginPage.navigateToRegisterPage();
22+
UserRegisterPage userRegisterPage = loginPage.navigateToRegisterPage();
2223

2324
Reporter.log("======Verify that Register Page is displayed======", true);
24-
Assert.assertTrue(registerPage.isRegisterPageDisplayed(), "Register Page is displayed");
25+
Assert.assertTrue(userRegisterPage.isRegisterPageDisplayed(), "Register Page is displayed");
2526

26-
if (registerPage.isRegisterPageDisplayed()) {
27+
if (userRegisterPage.isRegisterPageDisplayed()) {
2728
Reporter.log("======Register a User with test data======", true);
28-
registerPage.registerUser(firstName, lastName, email, pwd);
29+
userRegisterPage.registerUser(firstName, lastName, email, pwd);
2930

3031
Reporter.log("======Verify that Login Page is displayed======", true);
3132
Assert.assertTrue(loginPage.isLoginPageDisplayed(), "Login Page is displayed");

‎src/test/java/com/actoJava/qa/featureAbcTests/FailureTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.actoJava.qa.base.BaseTest;
44
import com.actoJava.qa.pages.HomePage;
55
import com.actoJava.qa.pages.LoginPage;
6-
import com.actoJava.qa.pages.RegisterPage;
6+
import com.actoJava.qa.pages.UserRegisterPage;
77
import org.testng.Assert;
88
import org.testng.Reporter;
99
import org.testng.annotations.Test;
@@ -16,14 +16,14 @@ public void registerUserFailedTest() {
1616
LoginPage loginPage = new LoginPage();
1717

1818
Reporter.log("======Navigate to User Register page======", true);
19-
RegisterPage registerPage = loginPage.navigateToRegisterPage();
19+
UserRegisterPage userRegisterPage = loginPage.navigateToRegisterPage();
2020

2121
Reporter.log("======Verify that Register Page is displayed======", true);
22-
Assert.assertTrue(registerPage.isRegisterPageDisplayed(), "Register Page is displayed");
22+
Assert.assertTrue(userRegisterPage.isRegisterPageDisplayed(), "Register Page is displayed");
2323

24-
if (registerPage.isRegisterPageDisplayed()) {
24+
if (userRegisterPage.isRegisterPageDisplayed()) {
2525
Reporter.log("======Register a User with test data======", true);
26-
LoginPage loginPage1 = registerPage.registerUser("firstName", "lastName", "[email protected]", "password1");
26+
LoginPage loginPage1 = userRegisterPage.registerUser("firstName", "lastName", "[email protected]", "password1");
2727

2828
Reporter.log("======Verify that Login Page is displayed======", true);
2929
Assert.assertTrue(loginPage1.isLoginPageDisplayed(), "Login Page is displayed");

‎target/classes/com/actoJava/qa/pages/HomePage.class

-192 Bytes
Binary file not shown.

‎target/classes/com/actoJava/qa/pages/LoginPage.class

8 Bytes
Binary file not shown.

‎target/classes/com/actoJava/qa/pages/TablesPage.class

-833 Bytes
Binary file not shown.

‎target/classes/com/actoJava/qa/pages/RegisterPage.class ‎target/classes/com/actoJava/qa/pages/UserRegisterPage.class

1.9 KB
Binary file not shown.

‎target/classes/com/actoJava/qa/util/WebDriverEventListenerImpl.class

-35 Bytes
Binary file not shown.

‎target/classes/endToEndTestsTestNG.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<test name="Dummy Website End to End TCs">
1010
<classes>
1111
<class name="com.actoJava.qa.endToEndTests.EndToEndTests"></class>
12-
<!--<class name="com.actoJava.qa.featureAbcTests.FailureTest"></class>-->
12+
<class name="com.actoJava.qa.endToEndTests.MultipleTestDataE2ETestExample"></class>
1313
</classes>
1414
</test>
1515
</suite>

‎target/test-classes/com/actoJava/qa/endToEndTests/EndToEndTests.class

16 Bytes
Binary file not shown.

‎target/test-classes/com/actoJava/qa/endToEndTests/MultipleTestDataE2ETestExample.class

21 Bytes
Binary file not shown.

‎target/test-classes/com/actoJava/qa/featureAbcTests/FailureTest.class

16 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)