Skip to content

Removed unused imports and resolved compilation issue #15

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed unused imports and resolved compilation issue #15

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
30 changes: 14 additions & 16 deletions android/src/test/java/com/browserstack/BrowserStackTestNGTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
package com.browserstack;
import com.browserstack.local.Local;

import java.io.FileReader;
import java.net.URL;
import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
import java.io.FileReader;
import java.util.Map;

import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.openqa.selenium.remote.DesiredCapabilities;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;

import com.browserstack.local.Local;

import io.appium.java_client.android.AndroidDriver;
import io.appium.java_client.android.AndroidElement;

import org.openqa.selenium.remote.DesiredCapabilities;

import org.testng.annotations.BeforeMethod;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Parameters;


public class BrowserStackTestNGTest {
public AndroidDriver<AndroidElement> driver;
Expand All @@ -32,17 +30,17 @@ public void setUp(String config_file, String environment) throws Exception {

DesiredCapabilities capabilities = new DesiredCapabilities();

Map<String, String> envCapabilities = (Map<String, String>) envs.get(environment);
Iterator it = envCapabilities.entrySet().iterator();
Map<?, ?> envCapabilities = (Map<?, ?>) envs.get(environment);
Iterator<?> it = envCapabilities.entrySet().iterator();
while (it.hasNext()) {
Map.Entry pair = (Map.Entry)it.next();
Map.Entry<?,?> pair = (Map.Entry<?,?>)it.next();
capabilities.setCapability(pair.getKey().toString(), pair.getValue().toString());
}

Map<String, String> commonCapabilities = (Map<String, String>) config.get("capabilities");
Map<?, ?> commonCapabilities = (Map<?, ?>) config.get("capabilities");
it = commonCapabilities.entrySet().iterator();
while (it.hasNext()) {
Map.Entry pair = (Map.Entry)it.next();
Map.Entry<?,?> pair = (Map.Entry<?,?>)it.next();
if(capabilities.getCapability(pair.getKey().toString()) == null){
capabilities.setCapability(pair.getKey().toString(), pair.getValue().toString());
}
Expand Down Expand Up @@ -70,7 +68,7 @@ public void setUp(String config_file, String environment) throws Exception {
l.start(options);
}

driver = new AndroidDriver(new URL("http://"+username+":"+accessKey+"@"+config.get("server")+"/wd/hub"), capabilities);
driver = new AndroidDriver<AndroidElement>(new URL("http://"+username+":"+accessKey+"@"+config.get("server")+"/wd/hub"), capabilities);
}

@AfterMethod(alwaysRun=true)
Expand Down
2 changes: 1 addition & 1 deletion android/src/test/java/com/browserstack/LocalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public void test() throws Exception {
AndroidElement searchElement = (AndroidElement) new WebDriverWait(driver, 30).until(
ExpectedConditions.elementToBeClickable(MobileBy.id("com.example.android.basicnetworking:id/test_action")));
searchElement.click();
AndroidElement insertTextElement = (AndroidElement) new WebDriverWait(driver, 30).until(
new WebDriverWait(driver, 30).until(
ExpectedConditions.elementToBeClickable(MobileBy.className("android.widget.TextView")));

AndroidElement testElement = null;
Expand Down
28 changes: 13 additions & 15 deletions ios/src/test/java/com/browserstack/BrowserStackTestNGTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
package com.browserstack;
import com.browserstack.local.Local;

import java.io.FileReader;
import java.net.URL;
import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
import java.io.FileReader;
import java.util.Map;

import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;

import org.openqa.selenium.remote.DesiredCapabilities;

import org.testng.annotations.BeforeMethod;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Parameters;
import org.testng.annotations.BeforeMethod;

import com.browserstack.local.Local;

import io.appium.java_client.ios.IOSDriver;
import io.appium.java_client.ios.IOSElement;
Expand All @@ -32,17 +30,17 @@ public void setUp(String config_file, String environment) throws Exception {

DesiredCapabilities capabilities = new DesiredCapabilities();

Map<String, String> envCapabilities = (Map<String, String>) envs.get(environment);
Iterator it = envCapabilities.entrySet().iterator();
Map<?, ?> envCapabilities = (Map<?, ?>) envs.get(environment);
Iterator<?> it = envCapabilities.entrySet().iterator();
while (it.hasNext()) {
Map.Entry pair = (Map.Entry)it.next();
Map.Entry<?,?> pair = (Map.Entry<?,?>)it.next();
capabilities.setCapability(pair.getKey().toString(), pair.getValue().toString());
}
Map<String, String> commonCapabilities = (Map<String, String>) config.get("capabilities");

Map<?, ?> commonCapabilities = (Map<?, ?>) config.get("capabilities");
it = commonCapabilities.entrySet().iterator();
while (it.hasNext()) {
Map.Entry pair = (Map.Entry)it.next();
Map.Entry<?,?> pair = (Map.Entry<?,?>)it.next();
if(capabilities.getCapability(pair.getKey().toString()) == null){
capabilities.setCapability(pair.getKey().toString(), pair.getValue().toString());
}
Expand All @@ -57,7 +55,7 @@ public void setUp(String config_file, String environment) throws Exception {
if(accessKey == null) {
accessKey = (String) config.get("key");
}

String app = System.getenv("BROWSERSTACK_APP_ID");
if(app != null && !app.isEmpty()) {
capabilities.setCapability("app", app);
Expand Down
1 change: 0 additions & 1 deletion ios/src/test/java/com/browserstack/LocalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public void test() throws Exception {

WebDriverWait wait = new WebDriverWait(driver, 30);
wait.until(new ExpectedCondition<Boolean>() {
@Override
public Boolean apply(WebDriver d) {
String result = d.findElement(MobileBy.AccessibilityId("ResultBrowserStackLocal")).getAttribute("value");
return result != null && result.length() > 0;
Expand Down
6 changes: 2 additions & 4 deletions ios/src/test/java/com/browserstack/SingleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package com.browserstack;

import java.util.List;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import org.testng.Assert;
import org.testng.annotations.Test;

import org.openqa.selenium.support.ui.WebDriverWait;
import org.openqa.selenium.support.ui.ExpectedConditions;

import io.appium.java_client.MobileBy;
import io.appium.java_client.ios.IOSElement;

Expand Down
8 changes: 3 additions & 5 deletions ios/src/test/java/com/browserstack/suite/SuiteTest01.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package com.browserstack.suite;

import java.util.List;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import org.testng.Assert;
import org.testng.annotations.Test;

import org.openqa.selenium.support.ui.WebDriverWait;
import org.openqa.selenium.support.ui.ExpectedConditions;
import com.browserstack.BrowserStackTestNGTest;

import io.appium.java_client.MobileBy;
import io.appium.java_client.ios.IOSElement;

import com.browserstack.BrowserStackTestNGTest;

public class SuiteTest01 extends BrowserStackTestNGTest {

@Test
Expand Down
8 changes: 3 additions & 5 deletions ios/src/test/java/com/browserstack/suite/SuiteTest02.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package com.browserstack.suite;

import java.util.List;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import org.testng.Assert;
import org.testng.annotations.Test;

import org.openqa.selenium.support.ui.WebDriverWait;
import org.openqa.selenium.support.ui.ExpectedConditions;
import com.browserstack.BrowserStackTestNGTest;

import io.appium.java_client.MobileBy;
import io.appium.java_client.ios.IOSElement;

import com.browserstack.BrowserStackTestNGTest;

public class SuiteTest02 extends BrowserStackTestNGTest {

@Test
Expand Down
8 changes: 3 additions & 5 deletions ios/src/test/java/com/browserstack/suite/SuiteTest03.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package com.browserstack.suite;

import java.util.List;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import org.testng.Assert;
import org.testng.annotations.Test;

import org.openqa.selenium.support.ui.WebDriverWait;
import org.openqa.selenium.support.ui.ExpectedConditions;
import com.browserstack.BrowserStackTestNGTest;

import io.appium.java_client.MobileBy;
import io.appium.java_client.ios.IOSElement;

import com.browserstack.BrowserStackTestNGTest;

public class SuiteTest03 extends BrowserStackTestNGTest {

@Test
Expand Down
8 changes: 3 additions & 5 deletions ios/src/test/java/com/browserstack/suite/SuiteTest04.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package com.browserstack.suite;

import java.util.List;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import org.testng.Assert;
import org.testng.annotations.Test;

import org.openqa.selenium.support.ui.WebDriverWait;
import org.openqa.selenium.support.ui.ExpectedConditions;
import com.browserstack.BrowserStackTestNGTest;

import io.appium.java_client.MobileBy;
import io.appium.java_client.ios.IOSElement;

import com.browserstack.BrowserStackTestNGTest;

public class SuiteTest04 extends BrowserStackTestNGTest {

@Test
Expand Down
8 changes: 3 additions & 5 deletions ios/src/test/java/com/browserstack/suite/SuiteTest05.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package com.browserstack.suite;

import java.util.List;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import org.testng.Assert;
import org.testng.annotations.Test;

import org.openqa.selenium.support.ui.WebDriverWait;
import org.openqa.selenium.support.ui.ExpectedConditions;
import com.browserstack.BrowserStackTestNGTest;

import io.appium.java_client.MobileBy;
import io.appium.java_client.ios.IOSElement;

import com.browserstack.BrowserStackTestNGTest;

public class SuiteTest05 extends BrowserStackTestNGTest {

@Test
Expand Down
8 changes: 3 additions & 5 deletions ios/src/test/java/com/browserstack/suite/SuiteTest06.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package com.browserstack.suite;

import java.util.List;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import org.testng.Assert;
import org.testng.annotations.Test;

import org.openqa.selenium.support.ui.WebDriverWait;
import org.openqa.selenium.support.ui.ExpectedConditions;
import com.browserstack.BrowserStackTestNGTest;

import io.appium.java_client.MobileBy;
import io.appium.java_client.ios.IOSElement;

import com.browserstack.BrowserStackTestNGTest;

public class SuiteTest06 extends BrowserStackTestNGTest {

@Test
Expand Down
8 changes: 3 additions & 5 deletions ios/src/test/java/com/browserstack/suite/SuiteTest07.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package com.browserstack.suite;

import java.util.List;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import org.testng.Assert;
import org.testng.annotations.Test;

import org.openqa.selenium.support.ui.WebDriverWait;
import org.openqa.selenium.support.ui.ExpectedConditions;
import com.browserstack.BrowserStackTestNGTest;

import io.appium.java_client.MobileBy;
import io.appium.java_client.ios.IOSElement;

import com.browserstack.BrowserStackTestNGTest;

public class SuiteTest07 extends BrowserStackTestNGTest {

@Test
Expand Down
8 changes: 3 additions & 5 deletions ios/src/test/java/com/browserstack/suite/SuiteTest08.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package com.browserstack.suite;

import java.util.List;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import org.testng.Assert;
import org.testng.annotations.Test;

import org.openqa.selenium.support.ui.WebDriverWait;
import org.openqa.selenium.support.ui.ExpectedConditions;
import com.browserstack.BrowserStackTestNGTest;

import io.appium.java_client.MobileBy;
import io.appium.java_client.ios.IOSElement;

import com.browserstack.BrowserStackTestNGTest;

public class SuiteTest08 extends BrowserStackTestNGTest {

@Test
Expand Down
8 changes: 3 additions & 5 deletions ios/src/test/java/com/browserstack/suite/SuiteTest09.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package com.browserstack.suite;

import java.util.List;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import org.testng.Assert;
import org.testng.annotations.Test;

import org.openqa.selenium.support.ui.WebDriverWait;
import org.openqa.selenium.support.ui.ExpectedConditions;
import com.browserstack.BrowserStackTestNGTest;

import io.appium.java_client.MobileBy;
import io.appium.java_client.ios.IOSElement;

import com.browserstack.BrowserStackTestNGTest;

public class SuiteTest09 extends BrowserStackTestNGTest {

@Test
Expand Down
8 changes: 3 additions & 5 deletions ios/src/test/java/com/browserstack/suite/SuiteTest10.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package com.browserstack.suite;

import java.util.List;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import org.testng.Assert;
import org.testng.annotations.Test;

import org.openqa.selenium.support.ui.WebDriverWait;
import org.openqa.selenium.support.ui.ExpectedConditions;
import com.browserstack.BrowserStackTestNGTest;

import io.appium.java_client.MobileBy;
import io.appium.java_client.ios.IOSElement;

import com.browserstack.BrowserStackTestNGTest;

public class SuiteTest10 extends BrowserStackTestNGTest {

@Test
Expand Down