Skip to content

Remove unused imports and S6 entries #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 8, 2017
Merged

Remove unused imports and S6 entries #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/local.testng.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<suite name="Local">
<test name="LocalTest">
<parameter name="config" value="local.conf.json"/>
<parameter name="environment" value="galaxy_s6"/>
<parameter name="environment" value="galaxy_s7"/>
<classes>
<class name="com.browserstack.LocalTest"/>
</classes>
Expand Down
10 changes: 1 addition & 9 deletions config/parallel.testng.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="Parallel" thread-count="4" parallel="tests">
<test name="SingleTestGalaxyS6">
<parameter name="config" value="parallel.conf.json"/>
<parameter name="environment" value="galaxy_s6"/>
<classes>
<class name="com.browserstack.SingleTest"/>
</classes>
</test>

<suite name="Parallel" thread-count="3" parallel="tests">
<test name="SingleTestPixel">
<parameter name="config" value="parallel.conf.json"/>
<parameter name="environment" value="pixel"/>
Expand Down
2 changes: 1 addition & 1 deletion config/single.testng.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<suite name="Single">
<test name="SingleTest">
<parameter name="config" value="single.conf.json"/>
<parameter name="environment" value="galaxy_s6"/>
<parameter name="environment" value="galaxy_s7"/>
<classes>
<class name="com.browserstack.SingleTest"/>
</classes>
Expand Down
4 changes: 2 additions & 2 deletions config/suite.testng.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="Pool" parallel="tests">
<test name="PoolTestS6" thread-count="3" parallel="classes">
<test name="PoolTestS7" thread-count="3" parallel="classes">
<parameter name="config" value="suite.conf.json"/>
<parameter name="environment" value="galaxy_s6"/>
<parameter name="environment" value="galaxy_s7"/>
<classes>
<class name="com.browserstack.suite.SuiteTest01"/>
<class name="com.browserstack.suite.SuiteTest02"/>
Expand Down
13 changes: 0 additions & 13 deletions src/test/java/com/browserstack/BrowserStackTestNGTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,22 @@
package com.browserstack;
import com.browserstack.local.Local;

import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import java.util.ArrayList;
import java.util.List;
import java.util.Iterator;
import org.json.simple.JSONObject;
import org.json.simple.JSONArray;
import org.json.simple.parser.JSONParser;

import io.appium.java_client.AppiumDriver;
import io.appium.java_client.MobileElement;
import io.appium.java_client.android.AndroidDriver;

import org.openqa.selenium.WebDriver;
import org.openqa.selenium.remote.RemoteWebDriver;
import org.openqa.selenium.remote.DesiredCapabilities;

import org.testng.annotations.BeforeMethod;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
import org.testng.annotations.Parameters;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Factory;
import org.testng.Assert;


public class BrowserStackTestNGTest {
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/conf/local.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
},

"environments": {
"galaxy_s6": {
"device": "Samsung Galaxy S6"
"galaxy_s7": {
"device": "Samsung Galaxy S7"
}
}
}
3 changes: 0 additions & 3 deletions src/test/resources/conf/parallel.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
},

"environments": {
"galaxy_s6": {
"device": "Samsung Galaxy S6"
},
"pixel": {
"device": "Google Pixel"
},
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/conf/single.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
},

"environments": {
"galaxy_s6": {
"device": "Samsung Galaxy S6"
"galaxy_s7": {
"device": "Samsung Galaxy S7"
}
}
}
3 changes: 0 additions & 3 deletions src/test/resources/conf/suite.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
},

"environments": {
"galaxy_s6": {
"device": "Samsung Galaxy S6"
},
"pixel": {
"device": "Google Pixel"
},
Expand Down