Skip to content

Commit f79f426

Browse files
committed
uupdate tests
uupdate tests
1 parent e78c905 commit f79f426

31 files changed

+1694
-455
lines changed

src/test/java/com/w2a/Utilities/ExcelReader.java

Lines changed: 516 additions & 0 deletions
Large diffs are not rendered by default.

src/test/java/com/w2a/base/TestBase.java

Lines changed: 78 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -12,102 +12,101 @@
1212
import org.openqa.selenium.chrome.ChromeDriver;
1313
import org.openqa.selenium.firefox.FirefoxDriver;
1414
import org.openqa.selenium.ie.InternetExplorerDriver;
15+
import org.openqa.selenium.support.ui.WebDriverWait;
1516
import org.testng.annotations.AfterSuite;
1617
import org.testng.annotations.BeforeSuite;
1718
import org.testng.log4testng.Logger;
19+
20+
import com.w2a.Utilities.ExcelReader;
21+
1822
public class TestBase {
1923

20-
/*Webdriver - done
21-
porperties - done
22-
logs - log4j jar file
23-
Db
24-
excel
25-
mail
26-
extentreports
27-
*/
28-
24+
/*
25+
* Webdriver - done porperties - done logs - log4j jar file Db excel mail
26+
* extentreports
27+
*/
28+
2929
public static WebDriver driver;
3030
public static Properties config = new Properties();
3131
public static Properties OR = new Properties();
3232
public static FileInputStream fis;
3333
public static org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger("devpinoylogger");
34-
35-
34+
public static ExcelReader excel = new ExcelReader(
35+
System.getProperty("user.dir") + "\\src\\test\\resources\\excel\\testdata.xlsx");
36+
public static WebDriverWait wait;
37+
3638
@BeforeSuite
37-
public void setUp()
38-
{
39-
if(driver==null)
40-
{
41-
42-
try {
43-
fis = new FileInputStream(System.getProperty("user.dir")+"\\src\\test\\resources\\properties\\config.properties");
44-
} catch (FileNotFoundException e) {
45-
// TODO Auto-generated catch block
46-
e.printStackTrace();
47-
}
48-
try {
49-
config.load(fis);
50-
log.debug("config file laoded");
51-
} catch (IOException e1) {
52-
// TODO Auto-generated catch block
53-
e1.printStackTrace();
54-
}
55-
56-
try {
57-
fis = new FileInputStream(System.getProperty("user.dir")+"\\src\\test\\resources\\properties\\OR.properties");
58-
} catch (FileNotFoundException e) {
59-
// TODO Auto-generated catch block
60-
e.printStackTrace();
61-
}
62-
try {
63-
OR.load(fis);
64-
} catch (IOException e) {
65-
// TODO Auto-generated catch block
66-
e.printStackTrace();
67-
}
68-
69-
if(config.getProperty("browser").equals("firefox")) {
70-
driver = new FirefoxDriver();
71-
}
72-
else if(config.getProperty("browser").equals("chrome"))
73-
{
74-
System.setProperty("webdriver.chrome.driver", System.getProperty("user.dir")+"\\src\\test\\resources\\executables\\chromedriver.exe");
75-
driver = new ChromeDriver();
76-
log.debug("Chrome launched");
77-
}
78-
else if(config.getProperty("browser").equals("ie"))
79-
{
80-
System.setProperty("webdriver.ie.driver", System.getProperty("user.dir")+"\\src\\test\\resources\\executables\\iedriver.exe");
81-
driver = new InternetExplorerDriver();
39+
public void setUp() {
40+
if (driver == null) {
41+
42+
try {
43+
fis = new FileInputStream(
44+
System.getProperty("user.dir") + "\\src\\test\\resources\\properties\\Config.properties");
45+
} catch (FileNotFoundException e) {
46+
// TODO Auto-generated catch block
47+
e.printStackTrace();
48+
}
49+
try {
50+
config.load(fis);
51+
log.debug("config file laoded");
52+
} catch (IOException e1) {
53+
// TODO Auto-generated catch block
54+
e1.printStackTrace();
55+
}
56+
57+
try {
58+
fis = new FileInputStream(
59+
System.getProperty("user.dir") + "\\src\\test\\resources\\properties\\OR.properties");
60+
} catch (FileNotFoundException e) {
61+
// TODO Auto-generated catch block
62+
e.printStackTrace();
63+
}
64+
try {
65+
OR.load(fis);
66+
} catch (IOException e) {
67+
// TODO Auto-generated catch block
68+
e.printStackTrace();
69+
}
70+
71+
if (config.getProperty("browser").equals("firefox")) {
72+
driver = new FirefoxDriver();
73+
} else if (config.getProperty("browser").equals("chrome")) {
74+
System.setProperty("webdriver.chrome.driver",
75+
System.getProperty("user.dir") + "\\src\\test\\resources\\executables\\chromedriver.exe");
76+
driver = new ChromeDriver();
77+
log.debug("Chrome launched");
78+
} else if (config.getProperty("browser").equals("ie")) {
79+
System.setProperty("webdriver.ie.driver",
80+
System.getProperty("user.dir") + "\\src\\test\\resources\\executables\\iedriver.exe");
81+
driver = new InternetExplorerDriver();
82+
}
83+
84+
driver.get(config.getProperty("testsiteurl"));
85+
driver.manage().window().maximize();
86+
driver.manage().timeouts().implicitlyWait(Integer.parseInt(config.getProperty("implicit.wait")),
87+
TimeUnit.SECONDS);
88+
wait = new WebDriverWait(driver, 5);
8289
}
83-
84-
driver.get(config.getProperty("testsiteurl"));
85-
driver.manage().window().maximize();
86-
driver.manage().timeouts().implicitlyWait(Integer.parseInt(config.getProperty("implicit.wait")), TimeUnit.SECONDS);
87-
}
88-
89-
90-
90+
9191
}
92-
92+
9393
public boolean isElementpresent(By by) {
94-
try {
95-
96-
driver.findElement(by);
97-
return true;
98-
99-
}catch(NoSuchElementException e) {
100-
return false;
101-
}
94+
try {
95+
96+
driver.findElement(by);
97+
return true;
98+
99+
} catch (NoSuchElementException e) {
100+
return false;
101+
}
102102
}
103+
103104
@AfterSuite
104-
public void tearDown()
105-
{
106-
if(driver!=null) {
107-
driver.quit();
105+
public void tearDown() {
106+
if (driver != null) {
107+
driver.quit();
108108
}
109109
log.debug("test execution completed");
110110
}
111-
112-
111+
113112
}
Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,52 @@
11
package com.w2a.testcases;
22

3+
import java.util.Hashtable;
4+
5+
import org.openqa.selenium.Alert;
6+
import org.openqa.selenium.By;
7+
import org.openqa.selenium.support.ui.ExpectedConditions;
8+
import org.testng.Assert;
39
import org.testng.annotations.DataProvider;
410
import org.testng.annotations.Test;
511

6-
public class AddCustomerTest {
7-
@Test(dataProvider="getData")
8-
public void addCustomer(String firstName,String lastName, String postCode)
9-
{
10-
12+
import com.w2a.base.TestBase;
13+
14+
public class AddCustomerTest extends TestBase {
15+
16+
@Test(dataProvider = "getData")
17+
public void addCustomer(String firstName, String lastName, String postCode, String alerttext)
18+
throws InterruptedException {
19+
driver.findElement(By.cssSelector(OR.getProperty("addCustbtn"))).click();
20+
driver.findElement(By.cssSelector(OR.getProperty("firstName"))).sendKeys(firstName);
21+
driver.findElement(By.cssSelector(OR.getProperty("lastName"))).sendKeys(lastName);
22+
driver.findElement(By.cssSelector(OR.getProperty("postCode"))).sendKeys(postCode);
23+
driver.findElement(By.cssSelector(OR.getProperty("addBtn"))).click();
24+
Alert alert = wait.until(ExpectedConditions.alertIsPresent());
25+
Assert.assertTrue(alert.getText().contains(alerttext));
26+
27+
alert.accept();
28+
1129
}
12-
30+
1331
@DataProvider
14-
public Object[][] getData()
15-
{
16-
32+
public Object[][] getData() {
33+
String sheetName = "AddCustomerTest";
34+
int rows = excel.getRowCount(sheetName);
35+
int cols = excel.getColumnCount(sheetName);
36+
37+
Object[][] data = new Object[rows - 1][cols];
38+
39+
for (int rowNum = 2; rowNum <= rows; rowNum++) { // 2
40+
// start reading data from row 2
41+
42+
for (int colNum = 0; colNum < cols; colNum++) {
43+
44+
// data[0][0]
45+
46+
data[rowNum - 2][colNum] = excel.getCellData(sheetName, colNum, rowNum);
47+
}
48+
}
49+
return data;
1750
}
51+
1852
}

src/test/java/com/w2a/testcases/BankManagerLoginTest.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@
66

77
import com.w2a.base.TestBase;
88

9-
public class BankManagerLoginTest extends TestBase{
9+
public class BankManagerLoginTest extends TestBase {
1010

11-
1211
@Test
13-
public void loginAsbankManager() throws InterruptedException
14-
{
12+
public void loginAsbankManager() throws InterruptedException {
1513
log.debug("Login test");
1614
driver.findElement(By.cssSelector(OR.getProperty("bmlBtn"))).click();
1715
Thread.sleep(3000);
18-
Assert.assertTrue(isElementpresent(By.cssSelector(OR.getProperty("addCustbtn"))),"login not succesfull");
19-
16+
Assert.assertTrue(isElementpresent(By.cssSelector(OR.getProperty("addCustbtn"))), "login not succesfull");
17+
2018
log.debug("log sucessfull");
2119
}
22-
20+
2321
}
388 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)