Skip to content

Commit 9c14a11

Browse files
author
Matécsa Dániel
committed
before and after methods moved to TestBase
1 parent c3ad323 commit 9c14a11

4 files changed

Lines changed: 30 additions & 37 deletions

File tree

points.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ advanced:
207207
link: "https://www.selenium.dev/documentation/webdriver/browsers/"
208208

209209
dockerized_execution: # 4 pts | once
210-
done: false
210+
done: true
211211
description: "Run tests inside a Docker container (e.g. using docker-compose with Selenium Grid)"
212212
link: "https://www.selenium.dev/documentation/grid/getting_started/"
213213

tests/mytests/src/test/java/tests/DependencyTest.java

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
package tests;
22

3-
import org.openqa.selenium.chrome.*;
4-
import org.openqa.selenium.remote.RemoteWebDriver;
5-
import java.net.URL;
6-
import java.util.HashMap;
7-
import java.util.Map;
83
import java.net.MalformedURLException;
94

105
import org.testng.annotations.*;
116
import org.testng.*;
127

138
import pages.LoginPage;
149
import pages.MainPage;
15-
import utils.ConfigReader;
1610

1711
public class DependencyTest extends TestBase {
1812

@@ -21,14 +15,7 @@ public class DependencyTest extends TestBase {
2115
@BeforeClass
2216
public void Setup() throws MalformedURLException
2317
{
24-
final Map<String, Object> chromePrefs = new HashMap<>();
25-
chromePrefs.put("profile.password_manager_leak_detection", false);
26-
27-
ChromeOptions options = new ChromeOptions();
28-
options.setExperimentalOption("prefs", chromePrefs);
29-
30-
this.driver = new RemoteWebDriver(new URL(ConfigReader.get("selenium_url")), options);
31-
this.driver.manage().window().maximize();
18+
before();
3219
}
3320

3421
@Test
@@ -53,9 +40,7 @@ public void logoutTest() {
5340

5441
@AfterClass
5542
public void close() {
56-
if (this.driver != null) {
57-
this.driver.quit();
58-
}
43+
after();
5944
}
6045

6146
}

tests/mytests/src/test/java/tests/TestBase.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
package tests;
22

3+
import java.util.HashMap;
4+
35
import org.openqa.selenium.*;
6+
import org.openqa.selenium.chrome.*;
7+
import org.openqa.selenium.remote.RemoteWebDriver;
8+
import java.net.URL;
9+
import java.util.Map;
10+
import java.net.MalformedURLException;
411

512
import pages.LoginPage;
613
import utils.ConfigReader;
@@ -9,6 +16,23 @@ public class TestBase {
916

1017
protected WebDriver driver;
1118

19+
protected void before() throws MalformedURLException {
20+
final Map<String, Object> chromePrefs = new HashMap<>();
21+
chromePrefs.put("profile.password_manager_leak_detection", false);
22+
23+
ChromeOptions options = new ChromeOptions();
24+
options.setExperimentalOption("prefs", chromePrefs);
25+
26+
this.driver = new RemoteWebDriver(new URL(ConfigReader.get("selenium_url")), options);
27+
this.driver.manage().window().maximize();
28+
}
29+
30+
protected void after() {
31+
if (this.driver != null) {
32+
this.driver.quit();
33+
}
34+
}
35+
1236
protected LoginPage login(LoginPage loginPage) {
1337
loginPage = new LoginPage(this.driver, ConfigReader.get("moodle_url"));
1438

tests/mytests/src/test/java/tests/MySeleniumTest.java renamed to tests/mytests/src/test/java/tests/WebsiteTest.java

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
package tests;
22

33
import org.openqa.selenium.*;
4-
import org.openqa.selenium.chrome.*;
5-
import org.openqa.selenium.remote.RemoteWebDriver;
6-
import java.net.URL;
7-
import java.util.HashMap;
8-
import java.util.Map;
94
import java.util.List;
105
import java.util.Random;
116
import java.net.MalformedURLException;
@@ -14,24 +9,15 @@
149
import org.testng.*;
1510

1611
import pages.*;
17-
import utils.ConfigReader;
1812

19-
public class MySeleniumTest extends TestBase {
13+
public class WebsiteTest extends TestBase {
2014

2115
@BeforeMethod
2216
public void Setup() throws MalformedURLException
2317
{
24-
final Map<String, Object> chromePrefs = new HashMap<>();
25-
chromePrefs.put("profile.password_manager_leak_detection", false);
26-
27-
ChromeOptions options = new ChromeOptions();
28-
options.setExperimentalOption("prefs", chromePrefs);
29-
30-
this.driver = new RemoteWebDriver(new URL(ConfigReader.get("selenium_url")), options);
31-
this.driver.manage().window().maximize();
18+
before();
3219
}
3320

34-
3521
@Test
3622
public void courseCreation() {
3723
LoginPage loginPage = null;
@@ -88,9 +74,7 @@ public void cookieHandling() {
8874

8975
@AfterMethod
9076
public void close() {
91-
if (this.driver != null) {
92-
this.driver.quit();
93-
}
77+
after();
9478
}
9579

9680
}

0 commit comments

Comments
 (0)