Skip to content

Commit 3342aa0

Browse files
kamal-kaur04francisf
kamal-kaur04
authored and
francisf
committed
Revert "added cross-platform parallelization"
1 parent 7dbee43 commit 3342aa0

28 files changed

Lines changed: 376 additions & 383 deletions

‎README.md‎

Lines changed: 8 additions & 4 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 a single test, run `mvn test -P single`
1920
- To run local tests, run `mvn test -P local`
20-
- To run the test suite having cross-platform with parallelization, run `mvn test -P parallel`
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

37+
- To run a single test, run `gradle singleTest`
3538
- To run local tests, run `gradle localTest`
36-
- To run the test suite having cross-platform with parallelization, run `gradle parallelTest`
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: 23 additions & 7 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,11 +21,11 @@ tasks.withType(JavaCompile) {
2121
options.encoding = 'UTF-8'
2222
}
2323

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

@@ -36,3 +36,19 @@ task localTest(type: Test) {
3636
suites "config/local.testng.xml"
3737
}
3838
}
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"
53+
}
54+
}

‎config/browserstack.conf.json‎

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

‎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: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,27 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
3-
<suite name="Cross-Platform" thread-count="3" parallel="tests">
4-
<listeners>
5-
<listener class-name="AlterSuiteClassInterceptor"/>
6-
<listener class-name="SuiteClassIntercepter"/>
7-
</listeners>
8-
<test name="PoolTest0">
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"/>
97
<classes>
10-
<class name="com.browserstack.suite.SuiteTest01" />
11-
<class name="com.browserstack.suite.SuiteTest02" />
8+
<class name="com.browserstack.SingleTest"/>
129
</classes>
1310
</test>
14-
<test name="PoolTest1">
11+
12+
<test name="SingleTestEnv2">
13+
<parameter name="config" value="parallel.conf.json"/>
14+
<parameter name="environment" value="env2"/>
1515
<classes>
16-
<class name="com.browserstack.suite.SuiteTest03" />
17-
<class name="com.browserstack.suite.SuiteTest04" />
16+
<class name="com.browserstack.SingleTest"/>
1817
</classes>
1918
</test>
20-
<test name="PoolTest2">
19+
20+
<test name="SingleTestEnv3">
21+
<parameter name="config" value="parallel.conf.json"/>
22+
<parameter name="environment" value="env3"/>
2123
<classes>
22-
<class name="com.browserstack.suite.SuiteTest05" />
23-
<class name="com.browserstack.suite.SuiteTest06" />
24-
</classes>
25-
</test>
26-
<test name="PoolTest3">
27-
<classes>
28-
<class name="com.browserstack.suite.SuiteTest07" />
29-
<class name="com.browserstack.suite.SuiteTest08" />
30-
</classes>
31-
</test>
32-
<test name="PoolTest4">
33-
<classes>
34-
<class name="com.browserstack.suite.SuiteTest09" />
35-
<class name="com.browserstack.suite.SuiteTest10" />
24+
<class name="com.browserstack.SingleTest"/>
3625
</classes>
3726
</test>
3827
</suite>

‎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>

‎pom.xml‎

Lines changed: 43 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,17 @@
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<maven.compiler.source>1.6</maven.compiler.source>
1616
<maven.compiler.target>1.6</maven.compiler.target>
17-
<testng.version>7.4.0</testng.version>
1817
<surefire.version>2.19.1</surefire.version>
19-
<selenium.version>3.141.59</selenium.version>
20-
<json-simple.version>1.1.1</json-simple.version>
21-
<browserstack-local-java.version>1.0.6</browserstack-local-java.version>
22-
<config.file>config/local.testng.xml</config.file>
18+
19+
<test.file></test.file>
20+
<config.file>default</config.file>
2321
</properties>
2422

2523
<dependencies>
2624
<dependency>
2725
<groupId>org.testng</groupId>
2826
<artifactId>testng</artifactId>
29-
<version>${testng.version}</version>
27+
<version>6.9.10</version>
3028
</dependency>
3129
<dependency>
3230
<groupId>commons-io</groupId>
@@ -36,17 +34,17 @@
3634
<dependency>
3735
<groupId>org.seleniumhq.selenium</groupId>
3836
<artifactId>selenium-java</artifactId>
39-
<version>${selenium.version}</version>
37+
<version>3.12.0</version>
4038
</dependency>
4139
<dependency>
4240
<groupId>com.browserstack</groupId>
4341
<artifactId>browserstack-local-java</artifactId>
44-
<version>${browserstack-local-java.version}</version>
42+
<version>1.0.3</version>
4543
</dependency>
4644
<dependency>
4745
<groupId>com.googlecode.json-simple</groupId>
4846
<artifactId>json-simple</artifactId>
49-
<version>${json-simple.version}</version>
47+
<version>1.1.1</version>
5048
</dependency>
5149
</dependencies>
5250

@@ -55,25 +53,29 @@
5553
<plugin>
5654
<groupId>org.apache.maven.plugins</groupId>
5755
<artifactId>maven-surefire-plugin</artifactId>
58-
<version>${surefire.version}</version>
59-
<configuration>
60-
<suiteXmlFiles>
61-
<suiteXmlFile>${config.file}</suiteXmlFile>
62-
</suiteXmlFiles>
63-
</configuration>
64-
</plugin>
65-
<plugin>
66-
<groupId>org.apache.maven.plugins</groupId>
67-
<artifactId>maven-compiler-plugin</artifactId>
68-
<configuration>
69-
<source>1.8</source>
70-
<target>1.8</target>
71-
</configuration>
56+
<version>2.18.1</version>
7257
</plugin>
7358
</plugins>
7459
</build>
7560

7661
<profiles>
62+
<profile>
63+
<id>single</id>
64+
<build>
65+
<plugins>
66+
<plugin>
67+
<groupId>org.apache.maven.plugins</groupId>
68+
<artifactId>maven-surefire-plugin</artifactId>
69+
<configuration>
70+
<suiteXmlFiles>
71+
<suiteXmlFile>config/single.testng.xml</suiteXmlFile>
72+
</suiteXmlFiles>
73+
</configuration>
74+
</plugin>
75+
</plugins>
76+
</build>
77+
</profile>
78+
7779
<profile>
7880
<id>local</id>
7981
<build>
@@ -107,5 +109,23 @@
107109
</plugins>
108110
</build>
109111
</profile>
112+
113+
<profile>
114+
<id>suite</id>
115+
<build>
116+
<plugins>
117+
<plugin>
118+
<groupId>org.apache.maven.plugins</groupId>
119+
<artifactId>maven-surefire-plugin</artifactId>
120+
<configuration>
121+
<suiteXmlFiles>
122+
<suiteXmlFile>config/suite.testng.xml</suiteXmlFile>
123+
</suiteXmlFiles>
124+
</configuration>
125+
</plugin>
126+
</plugins>
127+
</build>
128+
</profile>
110129
</profiles>
130+
111131
</project>

0 commit comments

Comments
 (0)