Skip to content

Commit be7b484

Browse files
kamal-kaur04kamal-kaur04
committed
removed sensitive info
1 parent b1b74e7 commit be7b484

17 files changed

+76
-346
lines changed

‎README.md

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

1313
* Clone the repo
1414
* Install dependencies `mvn compile`
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)
15+
* Update `browserstack.conf.json` file inside the `config/` 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`
2019
- 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 having cross-platform with parallelization, run `mvn test -P cross`
20+
- To run the test suite having cross-platform with parallelization, run `mvn test -P parallel`
2321

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

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

3129
* Clone the repo
3230
* Install dependencies `gradle build`
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)
31+
* Update `browserstack.conf.json` file inside the `config/` directory with your [BrowserStack Username and Access Key](https://www.browserstack.com/accounts/settings)
3432

3533
### Running your tests
3634

37-
- To run a single test, run `gradle singleTest`
3835
- To run local tests, run `gradle localTest`
39-
- To run parallel tests, run `gradle parallelTest`
40-
- To run the test suite having cross-platform with parallelization, run `gradle crossTest`
36+
- To run the test suite having cross-platform with parallelization, run `gradle parallelTest`
4137

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

‎build.gradle

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,6 @@ tasks.withType(JavaCompile) {
2121
options.encoding = 'UTF-8'
2222
}
2323

24-
task singleTest(type: Test) {
25-
useTestNG() {
26-
dependsOn cleanTest
27-
useDefaultListeners = true
28-
suites "config/single.testng.xml"
29-
}
30-
}
31-
32-
task localTest(type: Test) {
33-
useTestNG() {
34-
dependsOn cleanTest
35-
useDefaultListeners = true
36-
suites "config/local.testng.xml"
37-
}
38-
}
39-
4024
task parallelTest(type: Test) {
4125
useTestNG() {
4226
dependsOn cleanTest
@@ -45,18 +29,10 @@ task parallelTest(type: Test) {
4529
}
4630
}
4731

48-
task suiteTest(type: Test) {
32+
task localTest(type: Test) {
4933
useTestNG() {
5034
dependsOn cleanTest
5135
useDefaultListeners = true
52-
suites "config/suite.testng.xml"
53-
}
54-
}
55-
56-
task crossTest(type: Test) {
57-
useTestNG() {
58-
dependsOn cleanTest
59-
useDefaultListeners = true
60-
suites "config/cross.testng.xml"
36+
suites "config/local.testng.xml"
6137
}
6238
}

‎src/test/resources/conf/cross.conf.json renamed to ‎config/browserstack.conf.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@
55

66
"capabilities": {
77
"build": "browserstack-build-1",
8-
"name": "cross_platform_test",
8+
"name": "sample_test",
99
"browserstack.debug": "true"
1010
},
1111

12+
"profiles": {
13+
"localprofile": {
14+
"browserstack.local": "true"
15+
}
16+
},
17+
1218
"platforms": [
1319
{
1420
"os": "OS X",

‎config/cross.testng.xml

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

‎config/local.testng.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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="config" value="local.conf.json"/>
4+
<parameter name="profile" value="localprofile"/>
55
<listeners>
66
<listener class-name="SuiteClassIntercepter"/>
77
</listeners>

‎config/parallel.testng.xml

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,38 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
3-
<suite name="Parallel" thread-count="3" parallel="tests">
4-
<parameter name="config" value="parallel.conf.json"/>
3+
<suite name="Cross-Platform" thread-count="3" parallel="tests">
54
<listeners>
5+
<listener class-name="AlterSuiteClassInterceptor"/>
66
<listener class-name="SuiteClassIntercepter"/>
77
</listeners>
8-
<test name="SingleTestEnv1">
9-
<parameter name="platform" value="0"/>
8+
<test name="PoolTest0">
109
<classes>
11-
<class name="com.browserstack.SingleTest"/>
10+
<class name="com.browserstack.suite.SuiteTest01" />
11+
<class name="com.browserstack.suite.SuiteTest02" />
1212
</classes>
1313
</test>
14-
15-
<test name="SingleTestEnv2">
16-
<parameter name="platform" value="1"/>
14+
<test name="PoolTest1">
1715
<classes>
18-
<class name="com.browserstack.SingleTest"/>
16+
<class name="com.browserstack.suite.SuiteTest03" />
17+
<class name="com.browserstack.suite.SuiteTest04" />
1918
</classes>
2019
</test>
21-
22-
<test name="SingleTestEnv3">
23-
<parameter name="platform" value="2"/>
20+
<test name="PoolTest2">
2421
<classes>
25-
<class name="com.browserstack.SingleTest"/>
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" />
2636
</classes>
2737
</test>
2838
</suite>

‎config/single.testng.xml

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

‎config/suite.testng.xml

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

‎pom.xml

Lines changed: 6 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
<selenium.version>3.141.59</selenium.version>
2020
<json-simple.version>1.1.1</json-simple.version>
2121
<browserstack-local-java.version>1.0.6</browserstack-local-java.version>
22-
<test.file/>
23-
<config.file>default</config.file>
22+
<config.file>config/local.testng.xml</config.file>
2423
</properties>
2524

2625
<dependencies>
@@ -57,6 +56,11 @@
5756
<groupId>org.apache.maven.plugins</groupId>
5857
<artifactId>maven-surefire-plugin</artifactId>
5958
<version>${surefire.version}</version>
59+
<configuration>
60+
<suiteXmlFiles>
61+
<suiteXmlFile>${config.file}</suiteXmlFile>
62+
</suiteXmlFiles>
63+
</configuration>
6064
</plugin>
6165
<plugin>
6266
<groupId>org.apache.maven.plugins</groupId>
@@ -70,23 +74,6 @@
7074
</build>
7175

7276
<profiles>
73-
<profile>
74-
<id>single</id>
75-
<build>
76-
<plugins>
77-
<plugin>
78-
<groupId>org.apache.maven.plugins</groupId>
79-
<artifactId>maven-surefire-plugin</artifactId>
80-
<configuration>
81-
<suiteXmlFiles>
82-
<suiteXmlFile>config/single.testng.xml</suiteXmlFile>
83-
</suiteXmlFiles>
84-
</configuration>
85-
</plugin>
86-
</plugins>
87-
</build>
88-
</profile>
89-
9077
<profile>
9178
<id>local</id>
9279
<build>
@@ -120,45 +107,5 @@
120107
</plugins>
121108
</build>
122109
</profile>
123-
<profile>
124-
<id>suite</id>
125-
<build>
126-
<plugins>
127-
<plugin>
128-
<groupId>org.apache.maven.plugins</groupId>
129-
<artifactId>maven-surefire-plugin</artifactId>
130-
<configuration>
131-
<suiteXmlFiles>
132-
<suiteXmlFile>config/suite.testng.xml</suiteXmlFile>
133-
</suiteXmlFiles>
134-
</configuration>
135-
</plugin>
136-
</plugins>
137-
</build>
138-
</profile>
139-
<profile>
140-
<id>cross</id>
141-
<build>
142-
<plugins>
143-
<plugin>
144-
<groupId>org.apache.maven.plugins</groupId>
145-
<artifactId>maven-surefire-plugin</artifactId>
146-
<version>2.19.1</version>
147-
<configuration>
148-
<suiteXmlFiles>
149-
<suiteXmlFile>config/cross.testng.xml</suiteXmlFile>
150-
</suiteXmlFiles>
151-
</configuration>
152-
<dependencies>
153-
<dependency>
154-
<groupId>org.aspectj</groupId>
155-
<artifactId>aspectjweaver</artifactId>
156-
<version>1.9.6</version>
157-
</dependency>
158-
</dependencies>
159-
</plugin>
160-
</plugins>
161-
</build>
162-
</profile>
163110
</profiles>
164111
</project>

‎src/test/java/AlterSuiteClassInterceptor.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ public void alter(List<XmlSuite> suites) {
2121
suites.forEach(suite -> {
2222
int platformLength = 0;
2323
JSONArray platforms;
24-
String configFile = suite.getParameter("config");
2524
try {
26-
JSONObject config = (JSONObject) parser.parse(new FileReader("src/test/resources/conf/" + configFile));
25+
JSONObject config = (JSONObject) parser.parse(new FileReader("config/browserstack.conf.json"));
2726
if (!config.isEmpty()) {
2827
platforms = (JSONArray) config.get("platforms");
2928
platformLength = platforms.size();
@@ -34,7 +33,6 @@ public void alter(List<XmlSuite> suites) {
3433
int finalPlatformLength = platformLength;
3534
modifySuiteXML(suite, finalPlatformLength);
3635
});
37-
3836
}
3937

4038
private static void modifySuiteXML(XmlSuite suite, int numberOfPlatforms) {

0 commit comments

Comments
 (0)