Skip to content

Commit b9b4357

Browse files
kamal-kaur04kamal-kaur04
authored
Merge branch 'master' into change-maven-compiler-version
2 parents e6ce283 + 3342aa0 commit b9b4357

29 files changed

+396
-403
lines changed

‎README.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,14 @@ Master branch contains **Selenium 3** samples, for **Selenium 4 - W3C protocol**
1212

1313
* Clone the repo
1414
* Install dependencies `mvn compile`
15-
* Update `browserstack.conf.json` file inside the `config/` directory with your [BrowserStack Username and Access Key](https://www.browserstack.com/accounts/settings)
15+
* Update `*.conf.json` files inside the `src/test/resources/conf` directory with your [BrowserStack Username and Access Key](https://www.browserstack.com/accounts/settings)
1616

1717
### Running your tests
1818

19-
- To run local tests, run `mvn test -P sample-local-test`
20-
- To run the test suite having cross-platform with parallelization, run `mvn test -P sample-test`
19+
- To run a single test, run `mvn test -P single`
20+
- To run local tests, run `mvn test -P local`
21+
- To run parallel tests, run `mvn test -P parallel`
22+
- To run the test suite, run `mvn test -P suite`
2123

2224
Understand how many parallel sessions you need by using our [Parallel Test Calculator](https://www.browserstack.com/automate/parallel-calculator?ref=github)
2325

@@ -28,12 +30,14 @@ Master branch contains **Selenium 3** samples, for **Selenium 4 - W3C protocol**
2830

2931
* Clone the repo
3032
* Install dependencies `gradle build`
31-
* Update `browserstack.conf.json` file inside the `config/` directory with your [BrowserStack Username and Access Key](https://www.browserstack.com/accounts/settings)
33+
* Update `*.conf.json` files inside the `src/test/resources/conf` directory with your [BrowserStack Username and Access Key](https://www.browserstack.com/accounts/settings)
3234

3335
### Running your tests
3436

35-
- To run local tests, run `gradle sampleLocalTest`
36-
- To run the test suite having cross-platform with parallelization, run `gradle sampleTest`
37+
- To run a single test, run `gradle singleTest`
38+
- To run local tests, run `gradle localTest`
39+
- To run parallel tests, run `gradle parallelTest`
40+
- To run the test suite, run `gradle suiteTest`
3741

3842
Understand how many parallel sessions you need by using our [Parallel Test Calculator](https://www.browserstack.com/automate/parallel-calculator?ref=github)
3943

‎build.gradle

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ plugins {
55
repositories { mavenCentral() }
66

77
dependencies {
8-
implementation 'org.testng:testng:7.4.0'
9-
implementation 'commons-io:commons-io:1.3.2'
10-
implementation 'org.seleniumhq.selenium:selenium-java:3.141.59'
11-
implementation 'com.browserstack:browserstack-local-java:1.0.6'
12-
implementation 'com.googlecode.json-simple:json-simple:1.1.1'
8+
compile 'org.testng:testng:6.9.10'
9+
compile 'commons-io:commons-io:1.3.2'
10+
compile 'org.seleniumhq.selenium:selenium-java:3.12.0'
11+
compile 'com.browserstack:browserstack-local-java:0.1.0'
12+
compile 'com.googlecode.json-simple:json-simple:1.1.1'
1313
}
1414

1515
group = 'com.browserstack'
@@ -21,18 +21,34 @@ tasks.withType(JavaCompile) {
2121
options.encoding = 'UTF-8'
2222
}
2323

24-
task sampleTest(type: Test) {
24+
task singleTest(type: Test) {
2525
useTestNG() {
2626
dependsOn cleanTest
2727
useDefaultListeners = true
28-
suites "config/sample-test.testng.xml"
28+
suites "config/single.testng.xml"
2929
}
3030
}
3131

32-
task sampleLocalTest(type: Test) {
32+
task localTest(type: Test) {
3333
useTestNG() {
3434
dependsOn cleanTest
3535
useDefaultListeners = true
36-
suites "config/sample-local-test.testng.xml"
36+
suites "config/local.testng.xml"
37+
}
38+
}
39+
40+
task parallelTest(type: Test) {
41+
useTestNG() {
42+
dependsOn cleanTest
43+
useDefaultListeners = true
44+
suites "config/parallel.testng.xml"
45+
}
46+
}
47+
48+
task suiteTest(type: Test) {
49+
useTestNG() {
50+
dependsOn cleanTest
51+
useDefaultListeners = true
52+
suites "config/suite.testng.xml"
3753
}
3854
}

‎config/browserstack.conf.json

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎config/sample-local-test.testng.xml renamed to ‎config/local.testng.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
33
<suite name="Local">
4-
<parameter name="profile" value="localprofile"/>
5-
<listeners>
6-
<listener class-name="SuiteClassIntercepter"/>
7-
</listeners>
84
<test name="LocalTest">
9-
<parameter name="platform" value="0"/>
5+
<parameter name="config" value="local.conf.json"/>
6+
<parameter name="environment" value="chrome"/>
107
<classes>
118
<class name="com.browserstack.LocalTest"/>
129
</classes>

‎config/parallel.testng.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
3+
<suite name="Parallel" thread-count="3" parallel="tests">
4+
<test name="SingleTestEnv1">
5+
<parameter name="config" value="parallel.conf.json"/>
6+
<parameter name="environment" value="env1"/>
7+
<classes>
8+
<class name="com.browserstack.SingleTest"/>
9+
</classes>
10+
</test>
11+
12+
<test name="SingleTestEnv2">
13+
<parameter name="config" value="parallel.conf.json"/>
14+
<parameter name="environment" value="env2"/>
15+
<classes>
16+
<class name="com.browserstack.SingleTest"/>
17+
</classes>
18+
</test>
19+
20+
<test name="SingleTestEnv3">
21+
<parameter name="config" value="parallel.conf.json"/>
22+
<parameter name="environment" value="env3"/>
23+
<classes>
24+
<class name="com.browserstack.SingleTest"/>
25+
</classes>
26+
</test>
27+
</suite>

‎config/sample-test.testng.xml

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎config/single.testng.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
3+
<suite name="Single">
4+
<test name="SingleTest">
5+
<parameter name="config" value="single.conf.json"/>
6+
<parameter name="environment" value="chrome"/>
7+
<classes>
8+
<class name="com.browserstack.SingleTest"/>
9+
</classes>
10+
</test>
11+
</suite>

‎config/suite.testng.xml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
3+
<suite name="Pool" parallel="tests">
4+
<test name="PoolTestChrome" thread-count="3" parallel="classes">
5+
<parameter name="config" value="suite.conf.json"/>
6+
<parameter name="environment" value="chrome"/>
7+
<classes>
8+
<class name="com.browserstack.suite.SuiteTest01"/>
9+
<class name="com.browserstack.suite.SuiteTest02"/>
10+
<class name="com.browserstack.suite.SuiteTest03"/>
11+
<class name="com.browserstack.suite.SuiteTest04"/>
12+
<class name="com.browserstack.suite.SuiteTest05"/>
13+
<class name="com.browserstack.suite.SuiteTest06"/>
14+
<class name="com.browserstack.suite.SuiteTest07"/>
15+
<class name="com.browserstack.suite.SuiteTest08"/>
16+
<class name="com.browserstack.suite.SuiteTest09"/>
17+
<class name="com.browserstack.suite.SuiteTest10"/>
18+
</classes>
19+
</test>
20+
21+
<test name="PoolTestFirefox" thread-count="3" parallel="classes">
22+
<parameter name="config" value="suite.conf.json"/>
23+
<parameter name="environment" value="firefox"/>
24+
<classes>
25+
<class name="com.browserstack.suite.SuiteTest01"/>
26+
<class name="com.browserstack.suite.SuiteTest02"/>
27+
<class name="com.browserstack.suite.SuiteTest03"/>
28+
<class name="com.browserstack.suite.SuiteTest04"/>
29+
<class name="com.browserstack.suite.SuiteTest05"/>
30+
<class name="com.browserstack.suite.SuiteTest06"/>
31+
<class name="com.browserstack.suite.SuiteTest07"/>
32+
<class name="com.browserstack.suite.SuiteTest08"/>
33+
<class name="com.browserstack.suite.SuiteTest09"/>
34+
<class name="com.browserstack.suite.SuiteTest10"/>
35+
</classes>
36+
</test>
37+
</suite>

0 commit comments

Comments
 (0)