Skip to content

Commit d85a3a6

Browse files
baur100baur100
committed
l14 - MaveSurefile
1 parent 484b99f commit d85a3a6

7 files changed

Lines changed: 75 additions & 9 deletions

File tree

‎JavaCore2.iml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<content url="file://$MODULE_DIR$">
77
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
88
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
9+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
910
<excludeFolder url="file://$MODULE_DIR$/target" />
1011
</content>
1112
<orderEntry type="inheritedJdk" />

‎pom.xml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@
1919
<target>11</target>
2020
</configuration>
2121
</plugin>
22+
<plugin>
23+
<groupId>org.apache.maven.plugins</groupId>
24+
<artifactId>maven-surefire-plugin</artifactId>
25+
<version>3.0.0-M3</version>
26+
<configuration>
27+
<suiteXmlFiles>
28+
<suiteXmlFile>${browser}.xml</suiteXmlFile>
29+
</suiteXmlFiles>
30+
</configuration>
31+
</plugin>
2232
</plugins>
2333
</build>
2434
<dependencies>
@@ -51,7 +61,5 @@
5161
<artifactId>log4j-core</artifactId>
5262
<version>2.13.2</version>
5363
</dependency>
54-
55-
5664
</dependencies>
5765
</project>

‎src/test/java/browserFactory/BrowserFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private static WebDriver getFirefoxDriver() {
4343
FirefoxOptions options = new FirefoxOptions();
4444
options.addArguments("--width=1400");
4545
options.addArguments("--height=1000");
46-
// options.addArguments("--headless");
46+
options.addArguments("--headless");
4747
System.setProperty("webdriver.gecko.driver","geckodriver.exe");
4848
return new FirefoxDriver(options);
4949
}

‎src/test/java/pageObjects/HomePageSelectors.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
public class HomePageSelectors {
44
public static final String homeButtonXpath = "//*[@class='home active']";
55
public static final String plusButtonCssSelector = ".fa.fa-plus-circle";
6-
public static final String newPlaylistFieldXpath = "//*[@class='777create']/*";
6+
public static final String newPlaylistFieldXpath = "//*[@class='create']/*";
77
}

‎src/test/java/tests/BaseTest.java‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,23 @@
77
import org.testng.ITestResult;
88
import org.testng.annotations.AfterMethod;
99
import org.testng.annotations.BeforeMethod;
10+
import org.testng.annotations.Parameters;
1011

1112
public class BaseTest {
1213
protected WebDriver driver;
14+
@Parameters({"browser"})
1315
@BeforeMethod
14-
public void startUp() throws NoSuchMethodException {
15-
driver = BrowserFactory.createWebDriver(BrowserType.CHROME);
16+
public void startUp(String browserName) throws NoSuchMethodException {
17+
BrowserType browser;
18+
switch (browserName){
19+
case "CHROME": browser=BrowserType.CHROME;
20+
break;
21+
case "FIREFOX": browser = BrowserType.FIREFOX;
22+
break;
23+
default: throw new NoSuchMethodException("Browser not defined");
24+
}
25+
26+
driver = BrowserFactory.createWebDriver(browser);
1627
}
1728

1829
@AfterMethod

testng.xml renamed to testngChrome.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88

99
<parameter name="email" value="[email protected]" />
1010
<parameter name="password" value="te$t$tudent02" />
11-
<parameter name="wrong-password" value="*******"></parameter>
12-
<parameter name="playlist" value="zzZZzzZZ"></parameter>
13-
<parameter name="new-playlist" value="newZZZZZZZZZ"></parameter>
11+
<parameter name="wrong-password" value="*******"/>
12+
<parameter name="playlist" value="zzZZzzZZ"/>
13+
<parameter name="new-playlist" value="newZZZZZZZZZ"/>
14+
<parameter name="browser" value="CHROME"/>
1415
<test name="All tests" preserve-order="true">
1516
<classes>
1617
<class name="tests.HomepageTests">

‎testngFirefox.xml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
3+
4+
<suite name="Master Suite" parallel="classes" thread-count="4" verbose="1">
5+
<listeners>
6+
<listener class-name="listeners.Listeners" />
7+
</listeners>
8+
9+
<parameter name="email" value="[email protected]" />
10+
<parameter name="password" value="te$t$tudent02" />
11+
<parameter name="wrong-password" value="*******"/>
12+
<parameter name="playlist" value="zzZZzzZZ"/>
13+
<parameter name="new-playlist" value="newZZZZZZZZZ"/>
14+
<parameter name="browser" value="FIREFOX"/>
15+
16+
<test name="All tests" preserve-order="true">
17+
<classes>
18+
<class name="tests.HomepageTests">
19+
<methods>
20+
<include name="loginTest_createNewPlaylist_newPlaylistCreated" />
21+
<include name="scrollDown" />
22+
</methods>
23+
</class>
24+
<class name="tests.HomepageTests_new">
25+
<methods>
26+
<include name="new_loginTest_createNewPlaylist_newPlaylistCreated" />
27+
<include name="new_scrollDown" />
28+
</methods>
29+
</class>
30+
<class name="tests.LoginTests">
31+
<methods>
32+
<include name="loginTest_correctCredentials_loggedToApp" />
33+
<include name="loginTest_incorrectCredentials_notLoggedToApp" />
34+
<include name="test_Fails" />
35+
</methods>
36+
</class>
37+
<class name="tests.LoginTests_new">
38+
<methods>
39+
<include name="new_loginTest_correctCredentials_loggedToApp" />
40+
<include name="new_loginTest_incorrectCredentials_notLoggedToApp" />
41+
</methods>
42+
</class>
43+
</classes>
44+
</test>
45+
</suite>

0 commit comments

Comments
 (0)