#846: fixing out issues

appium · Apr 9, 2018 · 3dd8fce · 3dd8fce
1 parent 7bc4917
commit 3dd8fce
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java
@@ -66,7 +66,7 @@ class AppiumElementLocator implements CacheableLocator {
      * @deprecated This constructor is going to be removed. Use {@link #AppiumElementLocator(SearchContext, By,
      * boolean, Duration)} instead.
      */
-
+    @Deprecated
     public AppiumElementLocator(SearchContext searchContext, By by, boolean shouldCache,
         TimeOutDuration duration) {
         this(searchContext, by, shouldCache,

diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java
@@ -66,11 +66,11 @@ public class AppiumFieldDecorator implements FieldDecorator {
     private static final List<Class<? extends WebElement>> availableElementClasses = ImmutableList.of(WebElement.class,
             RemoteWebElement.class, MobileElement.class, AndroidElement.class,
             IOSElement.class, WindowsElement.class);
-    public static Duration DEFAULT_WAITING_TIMEOUT = ofSeconds(1);
+    public static final Duration DEFAULT_WAITING_TIMEOUT = ofSeconds(1);
     @Deprecated
-    public static long DEFAULT_TIMEOUT = 1;
+    public static final long DEFAULT_TIMEOUT = 1;
     @Deprecated
-    public static TimeUnit DEFAULT_TIMEUNIT = TimeUnit.SECONDS;
+    public static final TimeUnit DEFAULT_TIMEUNIT = TimeUnit.SECONDS;
     private final WebDriver webDriver;
     private final DefaultFieldDecorator defaultElementFieldDecoracor;
     private final AppiumElementLocatorFactory widgetLocatorFactory;

diff --git a/src/test/java/io/appium/java_client/android/BaseAndroidTest.java b/src/test/java/io/appium/java_client/android/BaseAndroidTest.java
@@ -48,7 +48,7 @@ public class BaseAndroidTest {
         File appDir = new File("src/test/java/io/appium/java_client");
         File app = new File(appDir, "ApiDemos-debug.apk");
         DesiredCapabilities capabilities = new DesiredCapabilities();
-        capabilities.setCapability(MobileCapabilityType.AUTOMATION_NAME, AutomationName.APPIUM);
+        capabilities.setCapability(MobileCapabilityType.AUTOMATION_NAME, AutomationName.ANDROID_UIAUTOMATOR2);
         capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
         capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
         driver = new AndroidDriver<>(service.getUrl(), capabilities);

diff --git a/src/test/java/io/appium/java_client/events/WebDriverEventListenerCompatibilityTest.java b/src/test/java/io/appium/java_client/events/WebDriverEventListenerCompatibilityTest.java
@@ -1,21 +1,16 @@
 package io.appium.java_client.events;
 
-import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsCollectionContaining.hasItems;
 import static org.junit.Assert.assertThat;
 
 import io.appium.java_client.events.listeners.AppiumListener;
 import io.appium.java_client.events.listeners.SingleListeners;
-import io.appium.java_client.events.listeners.TestListener;
 import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 import org.openqa.selenium.Alert;
-import org.openqa.selenium.Dimension;
-import org.openqa.selenium.Point;
-import org.openqa.selenium.WebDriver;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class WebDriverEventListenerCompatibilityTest extends BaseListenerTest {