From 81eb4b2aee45b7cc335e3eb3611231f1fe5076c7 Mon Sep 17 00:00:00 2001 From: Shabbir Date: Tue, 18 Sep 2018 18:18:59 +0530 Subject: [PATCH] Removed unused imports and resolved compilation issue --- .../browserstack/BrowserStackTestNGTest.java | 30 +++++++++---------- .../test/java/com/browserstack/LocalTest.java | 2 +- .../browserstack/BrowserStackTestNGTest.java | 28 ++++++++--------- .../test/java/com/browserstack/LocalTest.java | 1 - .../java/com/browserstack/SingleTest.java | 6 ++-- .../com/browserstack/suite/SuiteTest01.java | 8 ++--- .../com/browserstack/suite/SuiteTest02.java | 8 ++--- .../com/browserstack/suite/SuiteTest03.java | 8 ++--- .../com/browserstack/suite/SuiteTest04.java | 8 ++--- .../com/browserstack/suite/SuiteTest05.java | 8 ++--- .../com/browserstack/suite/SuiteTest06.java | 8 ++--- .../com/browserstack/suite/SuiteTest07.java | 8 ++--- .../com/browserstack/suite/SuiteTest08.java | 8 ++--- .../com/browserstack/suite/SuiteTest09.java | 8 ++--- .../com/browserstack/suite/SuiteTest10.java | 8 ++--- 15 files changed, 60 insertions(+), 87 deletions(-) diff --git a/android/src/test/java/com/browserstack/BrowserStackTestNGTest.java b/android/src/test/java/com/browserstack/BrowserStackTestNGTest.java index d22f5d1..4648fff 100644 --- a/android/src/test/java/com/browserstack/BrowserStackTestNGTest.java +++ b/android/src/test/java/com/browserstack/BrowserStackTestNGTest.java @@ -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 driver; @@ -32,17 +30,17 @@ public void setUp(String config_file, String environment) throws Exception { DesiredCapabilities capabilities = new DesiredCapabilities(); - Map envCapabilities = (Map) 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 commonCapabilities = (Map) 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()); } @@ -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(new URL("http://"+username+":"+accessKey+"@"+config.get("server")+"/wd/hub"), capabilities); } @AfterMethod(alwaysRun=true) diff --git a/android/src/test/java/com/browserstack/LocalTest.java b/android/src/test/java/com/browserstack/LocalTest.java index bd795e7..68415e7 100644 --- a/android/src/test/java/com/browserstack/LocalTest.java +++ b/android/src/test/java/com/browserstack/LocalTest.java @@ -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; diff --git a/ios/src/test/java/com/browserstack/BrowserStackTestNGTest.java b/ios/src/test/java/com/browserstack/BrowserStackTestNGTest.java index 82cd3da..fb45172 100644 --- a/ios/src/test/java/com/browserstack/BrowserStackTestNGTest.java +++ b/ios/src/test/java/com/browserstack/BrowserStackTestNGTest.java @@ -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; @@ -32,17 +30,17 @@ public void setUp(String config_file, String environment) throws Exception { DesiredCapabilities capabilities = new DesiredCapabilities(); - Map envCapabilities = (Map) 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 commonCapabilities = (Map) 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()); } @@ -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); diff --git a/ios/src/test/java/com/browserstack/LocalTest.java b/ios/src/test/java/com/browserstack/LocalTest.java index 1734928..3ddd79b 100644 --- a/ios/src/test/java/com/browserstack/LocalTest.java +++ b/ios/src/test/java/com/browserstack/LocalTest.java @@ -27,7 +27,6 @@ public void test() throws Exception { WebDriverWait wait = new WebDriverWait(driver, 30); wait.until(new ExpectedCondition() { - @Override public Boolean apply(WebDriver d) { String result = d.findElement(MobileBy.AccessibilityId("ResultBrowserStackLocal")).getAttribute("value"); return result != null && result.length() > 0; diff --git a/ios/src/test/java/com/browserstack/SingleTest.java b/ios/src/test/java/com/browserstack/SingleTest.java index 3111772..641d637 100644 --- a/ios/src/test/java/com/browserstack/SingleTest.java +++ b/ios/src/test/java/com/browserstack/SingleTest.java @@ -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; diff --git a/ios/src/test/java/com/browserstack/suite/SuiteTest01.java b/ios/src/test/java/com/browserstack/suite/SuiteTest01.java index cfdd5bb..506e4eb 100644 --- a/ios/src/test/java/com/browserstack/suite/SuiteTest01.java +++ b/ios/src/test/java/com/browserstack/suite/SuiteTest01.java @@ -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 diff --git a/ios/src/test/java/com/browserstack/suite/SuiteTest02.java b/ios/src/test/java/com/browserstack/suite/SuiteTest02.java index d15fa63..e42909b 100644 --- a/ios/src/test/java/com/browserstack/suite/SuiteTest02.java +++ b/ios/src/test/java/com/browserstack/suite/SuiteTest02.java @@ -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 diff --git a/ios/src/test/java/com/browserstack/suite/SuiteTest03.java b/ios/src/test/java/com/browserstack/suite/SuiteTest03.java index 060a6a4..bb1a6ad 100644 --- a/ios/src/test/java/com/browserstack/suite/SuiteTest03.java +++ b/ios/src/test/java/com/browserstack/suite/SuiteTest03.java @@ -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 diff --git a/ios/src/test/java/com/browserstack/suite/SuiteTest04.java b/ios/src/test/java/com/browserstack/suite/SuiteTest04.java index 7fe8677..5ee3b6b 100644 --- a/ios/src/test/java/com/browserstack/suite/SuiteTest04.java +++ b/ios/src/test/java/com/browserstack/suite/SuiteTest04.java @@ -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 diff --git a/ios/src/test/java/com/browserstack/suite/SuiteTest05.java b/ios/src/test/java/com/browserstack/suite/SuiteTest05.java index 1a7ca45..7f31c28 100644 --- a/ios/src/test/java/com/browserstack/suite/SuiteTest05.java +++ b/ios/src/test/java/com/browserstack/suite/SuiteTest05.java @@ -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 diff --git a/ios/src/test/java/com/browserstack/suite/SuiteTest06.java b/ios/src/test/java/com/browserstack/suite/SuiteTest06.java index 43651e1..0e0eb5f 100644 --- a/ios/src/test/java/com/browserstack/suite/SuiteTest06.java +++ b/ios/src/test/java/com/browserstack/suite/SuiteTest06.java @@ -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 diff --git a/ios/src/test/java/com/browserstack/suite/SuiteTest07.java b/ios/src/test/java/com/browserstack/suite/SuiteTest07.java index 1c18ed6..711ec54 100644 --- a/ios/src/test/java/com/browserstack/suite/SuiteTest07.java +++ b/ios/src/test/java/com/browserstack/suite/SuiteTest07.java @@ -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 diff --git a/ios/src/test/java/com/browserstack/suite/SuiteTest08.java b/ios/src/test/java/com/browserstack/suite/SuiteTest08.java index 262e438..870bc99 100644 --- a/ios/src/test/java/com/browserstack/suite/SuiteTest08.java +++ b/ios/src/test/java/com/browserstack/suite/SuiteTest08.java @@ -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 diff --git a/ios/src/test/java/com/browserstack/suite/SuiteTest09.java b/ios/src/test/java/com/browserstack/suite/SuiteTest09.java index eb04e06..21f0ae4 100644 --- a/ios/src/test/java/com/browserstack/suite/SuiteTest09.java +++ b/ios/src/test/java/com/browserstack/suite/SuiteTest09.java @@ -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 diff --git a/ios/src/test/java/com/browserstack/suite/SuiteTest10.java b/ios/src/test/java/com/browserstack/suite/SuiteTest10.java index 4db9dbe..c0a2654 100644 --- a/ios/src/test/java/com/browserstack/suite/SuiteTest10.java +++ b/ios/src/test/java/com/browserstack/suite/SuiteTest10.java @@ -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