code cleaning up

TikhomirovSergey · TikhomirovSergey · commit 50ba57d95c9a · 2016-12-15T18:33:42.000+03:00
diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java
@@ -335,7 +335,7 @@ public void zoom(int x, int y) {
     @Override public String getContext() {
         String contextName =
             String.valueOf(execute(DriverCommand.GET_CURRENT_CONTEXT_HANDLE).getValue());
-        if (contextName.equals("null")) {
+        if ("null".equalsIgnoreCase(String.valueOf(contextName))) {
             return null;
         }
         return contextName;
diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumElementLocator.java
@@ -39,11 +39,11 @@
 
 class AppiumElementLocator implements CacheableLocator {
 
-    final boolean shouldCache;
-    final By by;
-    final TimeOutDuration timeOutDuration;
+    private final boolean shouldCache;
+    private final By by;
+    private final TimeOutDuration timeOutDuration;
     private final TimeOutDuration originalTimeOutDuration;
-    final WebDriver originalWebDriver;
+    private final WebDriver originalWebDriver;
     private final SearchContext searchContext;
     private final WaitingFunction waitingFunction;
     private WebElement cachedElement;
diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java
@@ -149,15 +149,13 @@ protected List<WebElement> proxyForListLocator(ClassLoader ignored,
 
                 Type listType = ((ParameterizedType) genericType).getActualTypeArguments()[0];
 
-                boolean result = false;
                 for (Class<? extends WebElement> webElementClass : availableElementClasses) {
                     if (!webElementClass.equals(listType)) {
                         continue;
                     }
-                    result = true;
-                    break;
+                    return true;
                 }
-                return result;
+                return false;
             }
         };
 
diff --git a/src/main/java/io/appium/java_client/pagefactory/DefaultElementByBuilder.java b/src/main/java/io/appium/java_client/pagefactory/DefaultElementByBuilder.java
@@ -198,7 +198,7 @@ private static By buildMobileBy(LocatorGroupStrategy locatorGroupStrategy, Annot
 
         if (isWindows()) {
             WindowsFindBy[] windowsFindByArray = annotatedElement.getAnnotationsByType(WindowsFindBy.class);
-            result = buildMobileBy(howToUseLocators != null ? howToUseLocators.iOSAutomation() : null,
+            result = buildMobileBy(howToUseLocators != null ? howToUseLocators.windowsAutomation() : null,
                     windowsFindByArray);
         }
 
diff --git a/src/main/java/io/appium/java_client/pagefactory/OverrideWidgetReader.java b/src/main/java/io/appium/java_client/pagefactory/OverrideWidgetReader.java
@@ -74,16 +74,16 @@ static Class<? extends Widget> getMobileNativeWidgetClass(Class<? extends Widget
         String transformedPlatform = String.valueOf(platform).toUpperCase().trim();
         String transformedAutomation = String.valueOf(automation).toUpperCase().trim();
 
-        if (ANDROID.toUpperCase().equals(transformedPlatform) && AutomationName.SELENDROID
-            .toUpperCase().equals(transformedAutomation)) {
+        if (ANDROID.equalsIgnoreCase(transformedPlatform) && AutomationName.SELENDROID
+            .equalsIgnoreCase(transformedAutomation)) {
             return getConvenientClass(declaredClass, annotatedElement, SELENDROID);
         }
 
-        if (ANDROID.toUpperCase().equals(transformedPlatform)) {
+        if (ANDROID.equalsIgnoreCase(transformedPlatform)) {
             return getConvenientClass(declaredClass, annotatedElement, ANDROID_UI_AUTOMATOR);
         }
 
-        if (IOS.toUpperCase().equals(transformedPlatform)) {
+        if (IOS.equalsIgnoreCase(transformedPlatform)) {
             return getConvenientClass(declaredClass, annotatedElement, IOS_UI_AUTOMATION);
         }
 
@@ -105,7 +105,7 @@ private static Constructor<? extends Widget> getConstructorOfAMobileNativeWidget
         return findConvenientConstructor(clazz);
     }
 
-    static Map<ContentType, Constructor<? extends Widget>> read(
+    protected static Map<ContentType, Constructor<? extends Widget>> read(
         Class<? extends Widget> declaredClass, AnnotatedElement annotatedElement, String platform,
         String automation) {
         Map<ContentType, Constructor<? extends Widget>> result = new HashMap<>();
diff --git a/src/main/java/io/appium/java_client/pagefactory/ThrowableUtil.java b/src/main/java/io/appium/java_client/pagefactory/ThrowableUtil.java
@@ -24,7 +24,7 @@
 class ThrowableUtil {
     private static final String INVALID_SELECTOR_PATTERN = "Invalid locator strategy:";
 
-    static boolean isInvalidSelectorRootCause(Throwable e) {
+    protected static boolean isInvalidSelectorRootCause(Throwable e) {
         if (e == null) {
             return false;
         }
@@ -41,7 +41,7 @@ static boolean isInvalidSelectorRootCause(Throwable e) {
         return isInvalidSelectorRootCause(e.getCause());
     }
 
-    static boolean isStaleElementReferenceException(Throwable e) {
+    protected static boolean isStaleElementReferenceException(Throwable e) {
         if (e == null) {
             return false;
         }
@@ -53,7 +53,7 @@ static boolean isStaleElementReferenceException(Throwable e) {
         return isStaleElementReferenceException(e.getCause());
     }
 
-    static Throwable extractReadableException(Throwable e) {
+    protected static Throwable extractReadableException(Throwable e) {
         if (!RuntimeException.class.equals(e.getClass()) && !InvocationTargetException.class
             .equals(e.getClass())) {
             return e;
diff --git a/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java b/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java
@@ -41,7 +41,7 @@
  * - https://code.google.com/p/selenium/wiki/PageFactory
  */
 public abstract class AppiumByBuilder extends AbstractAnnotations {
-    static final Class<?>[] DEFAULT_ANNOTATION_METHOD_ARGUMENTS = new Class<?>[] {};
+    protected static final Class<?>[] DEFAULT_ANNOTATION_METHOD_ARGUMENTS = new Class<?>[] {};
 
     private static final List<String> METHODS_TO_BE_EXCLUDED_WHEN_ANNOTATION_IS_READ =
         new ArrayList<String>() {
diff --git a/src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java b/src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java
@@ -289,7 +289,7 @@ public AppiumServiceBuilder withStartUpTimeOut(long time, TimeUnit timeUnit) {
         return this;
     }
 
-    void checkAppiumJS() {
+    private void checkAppiumJS() {
         if (appiumJS != null) {
             validateNodeStructure(appiumJS);
             return;
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/AndroidPageObjectTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/AndroidPageObjectTest.java
@@ -235,11 +235,11 @@ public class AndroidPageObjectTest extends BaseAndroidTest {
         assertNotEquals(null, mobileElementView.getAttribute("text"));
     }
 
-    @Test public void areMobileElements_FindByTest() {
+    @Test public void areMobileElementsFindByTest() {
         assertNotEquals(0, mobiletextVieWs.size());
     }
 
-    @Test public void isMobileElement_FindByTest() {
+    @Test public void isMobileElementFindByTest() {
         assertNotEquals(null, mobiletextVieW.getAttribute("text"));
     }
 
@@ -259,11 +259,11 @@ public class AndroidPageObjectTest extends BaseAndroidTest {
         assertNotEquals(null, chainElementView.getAttribute("text"));
     }
 
-    @Test public void checkThatElementsWereNotFoundByIOSUIAutomator_Chain() {
+    @Test public void checkThatElementsWereNotFoundByIOSUIAutomatorChain() {
         assertEquals(0, iosChainTextViews.size());
     }
 
-    @Test public void checkThatElementWasNotFoundByIOSUIAutomator_Chain() {
+    @Test public void checkThatElementWasNotFoundByIOSUIAutomatorChain() {
         NoSuchElementException nsee = null;
         try {
             iosChainTextView.getAttribute("text");
@@ -273,11 +273,11 @@ public class AndroidPageObjectTest extends BaseAndroidTest {
         assertNotNull(nsee);
     }
 
-    @Test public void androidOrIOSFindByElementsTest_ChainSearches() {
+    @Test public void androidOrIOSFindByElementsTestChainSearches() {
         assertNotEquals(0, chainAndroidOrIOSUIAutomatorViews.size());
     }
 
-    @Test public void androidOrIOSFindByElementTest_ChainSearches() {
+    @Test public void androidOrIOSFindByElementTestChainSearches() {
         assertNotEquals(null, chainAndroidOrIOSUIAutomatorView.getAttribute("text"));
     }
 
@@ -311,7 +311,7 @@ public class AndroidPageObjectTest extends BaseAndroidTest {
         throw new RuntimeException(NoSuchElementException.class.getName() + " has been expected.");
     }
 
-    @Test public void checkThatTestWillNotBeFailedBecauseOfInvalidFindBy_List() {
+    @Test public void checkThatTestWillNotBeFailedBecauseOfInvalidFindByList() {
         assertEquals(0, elementsWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy.size());
     }
 
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/IOSPageFactoryTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/IOSPageFactoryTest.java
@@ -200,11 +200,11 @@ public class IOSPageFactoryTest extends AppIOSTest {
         assertNotEquals(null, mobileButton.getText());
     }
 
-    @Test public void areMobileElements_FindByTest() {
+    @Test public void areMobileElementsFindByTest() {
         assertNotEquals(0, mobiletFindByButtons.size());
     }
 
-    @Test public void isMobileElement_FindByTest() {
+    @Test public void isMobileElementFindByTest() {
         assertNotEquals(null, mobiletFindByButton.getText());
     }
 
@@ -216,11 +216,11 @@ public class IOSPageFactoryTest extends AppIOSTest {
         assertNotEquals(null, remotetextVieW.getText());
     }
 
-    @Test public void checkThatElementsWereNotFoundByAndroidUIAutomator_Chain() {
+    @Test public void checkThatElementsWereNotFoundByAndroidUIAutomatorChain() {
         assertEquals(0, chainElementViews.size());
     }
 
-    @Test public void checkThatElementWasNotFoundByAndroidUIAutomator_Chain() {
+    @Test public void checkThatElementWasNotFoundByAndroidUIAutomatorChain() {
         NoSuchElementException nsee = null;
         try {
             chainElementView.getText();
@@ -234,7 +234,7 @@ public class IOSPageFactoryTest extends AppIOSTest {
         assertNotEquals(null, iosButton.getText());
     }
 
-    @Test public void areIOSElements_FindByTest() {
+    @Test public void areIOSElementsFindByTest() {
         assertNotEquals(0, iosButtons.size());
     }
 
@@ -257,7 +257,7 @@ public class IOSPageFactoryTest extends AppIOSTest {
         throw new RuntimeException(NoSuchElementException.class.getName() + " has been expected.");
     }
 
-    @Test public void checkThatTestWillNotBeFailedBecauseOfInvalidFindBy_List() {
+    @Test public void checkThatTestWillNotBeFailedBecauseOfInvalidFindByList() {
         assertEquals(0, elementsWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy.size());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ public void zoom(int x, int y) {`
`335`	`335`	`@Override public String getContext() {`
`336`	`336`	`String contextName =`
`337`	`337`	`String.valueOf(execute(DriverCommand.GET_CURRENT_CONTEXT_HANDLE).getValue());`
`338`		`- if (contextName.equals("null")) {`
	`338`	`+ if ("null".equalsIgnoreCase(String.valueOf(contextName))) {`
`339`	`339`	`return null;`
`340`	`340`	`}`
`341`	`341`	`return contextName;`
Original file line number	Diff line number	Diff line change
`@@ -149,15 +149,13 @@ protected List<WebElement> proxyForListLocator(ClassLoader ignored,`
`149`	`149`
`150`	`150`	`Type listType = ((ParameterizedType) genericType).getActualTypeArguments()[0];`
`151`	`151`
`152`		`- boolean result = false;`
`153`	`152`	`for (Class<? extends WebElement> webElementClass : availableElementClasses) {`
`154`	`153`	`if (!webElementClass.equals(listType)) {`
`155`	`154`	`continue;`
`156`	`155`	`}`
`157`		`- result = true;`
`158`		`- break;`
	`156`	`+ return true;`
`159`	`157`	`}`
`160`		`- return result;`
	`158`	`+ return false;`
`161`	`159`	`}`
`162`	`160`	`};`
`163`	`161`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ private static By buildMobileBy(LocatorGroupStrategy locatorGroupStrategy, Annot`
`198`	`198`
`199`	`199`	`if (isWindows()) {`
`200`	`200`	`WindowsFindBy[] windowsFindByArray = annotatedElement.getAnnotationsByType(WindowsFindBy.class);`
`201`		`- result = buildMobileBy(howToUseLocators != null ? howToUseLocators.iOSAutomation() : null,`
	`201`	`+ result = buildMobileBy(howToUseLocators != null ? howToUseLocators.windowsAutomation() : null,`
`202`	`202`	`windowsFindByArray);`
`203`	`203`	`}`
`204`	`204`
Original file line number	Diff line number	Diff line change
`@@ -74,16 +74,16 @@ static Class<? extends Widget> getMobileNativeWidgetClass(Class<? extends Widget`
`74`	`74`	`String transformedPlatform = String.valueOf(platform).toUpperCase().trim();`
`75`	`75`	`String transformedAutomation = String.valueOf(automation).toUpperCase().trim();`
`76`	`76`
`77`		`- if (ANDROID.toUpperCase().equals(transformedPlatform) && AutomationName.SELENDROID`
`78`		`- .toUpperCase().equals(transformedAutomation)) {`
	`77`	`+ if (ANDROID.equalsIgnoreCase(transformedPlatform) && AutomationName.SELENDROID`
	`78`	`+ .equalsIgnoreCase(transformedAutomation)) {`
`79`	`79`	`return getConvenientClass(declaredClass, annotatedElement, SELENDROID);`
`80`	`80`	`}`
`81`	`81`
`82`		`- if (ANDROID.toUpperCase().equals(transformedPlatform)) {`
	`82`	`+ if (ANDROID.equalsIgnoreCase(transformedPlatform)) {`
`83`	`83`	`return getConvenientClass(declaredClass, annotatedElement, ANDROID_UI_AUTOMATOR);`
`84`	`84`	`}`
`85`	`85`
`86`		`- if (IOS.toUpperCase().equals(transformedPlatform)) {`
	`86`	`+ if (IOS.equalsIgnoreCase(transformedPlatform)) {`
`87`	`87`	`return getConvenientClass(declaredClass, annotatedElement, IOS_UI_AUTOMATION);`
`88`	`88`	`}`
`89`	`89`
`@@ -105,7 +105,7 @@ private static Constructor<? extends Widget> getConstructorOfAMobileNativeWidget`
`105`	`105`	`return findConvenientConstructor(clazz);`
`106`	`106`	`}`
`107`	`107`
`108`		`- static Map<ContentType, Constructor<? extends Widget>> read(`
	`108`	`+ protected static Map<ContentType, Constructor<? extends Widget>> read(`
`109`	`109`	`Class<? extends Widget> declaredClass, AnnotatedElement annotatedElement, String platform,`
`110`	`110`	`String automation) {`
`111`	`111`	`Map<ContentType, Constructor<? extends Widget>> result = new HashMap<>();`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`class ThrowableUtil {`
`25`	`25`	`private static final String INVALID_SELECTOR_PATTERN = "Invalid locator strategy:";`
`26`	`26`
`27`		`- static boolean isInvalidSelectorRootCause(Throwable e) {`
	`27`	`+ protected static boolean isInvalidSelectorRootCause(Throwable e) {`
`28`	`28`	`if (e == null) {`
`29`	`29`	`return false;`
`30`	`30`	`}`
`@@ -41,7 +41,7 @@ static boolean isInvalidSelectorRootCause(Throwable e) {`
`41`	`41`	`return isInvalidSelectorRootCause(e.getCause());`
`42`	`42`	`}`
`43`	`43`
`44`		`- static boolean isStaleElementReferenceException(Throwable e) {`
	`44`	`+ protected static boolean isStaleElementReferenceException(Throwable e) {`
`45`	`45`	`if (e == null) {`
`46`	`46`	`return false;`
`47`	`47`	`}`
`@@ -53,7 +53,7 @@ static boolean isStaleElementReferenceException(Throwable e) {`
`53`	`53`	`return isStaleElementReferenceException(e.getCause());`
`54`	`54`	`}`
`55`	`55`
`56`		`- static Throwable extractReadableException(Throwable e) {`
	`56`	`+ protected static Throwable extractReadableException(Throwable e) {`
`57`	`57`	`if (!RuntimeException.class.equals(e.getClass()) && !InvocationTargetException.class`
`58`	`58`	`.equals(e.getClass())) {`
`59`	`59`	`return e;`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ public AppiumServiceBuilder withStartUpTimeOut(long time, TimeUnit timeUnit) {`
`289`	`289`	`return this;`
`290`	`290`	`}`
`291`	`291`
`292`		`- void checkAppiumJS() {`
	`292`	`+ private void checkAppiumJS() {`
`293`	`293`	`if (appiumJS != null) {`
`294`	`294`	`validateNodeStructure(appiumJS);`
`295`	`295`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -235,11 +235,11 @@ public class AndroidPageObjectTest extends BaseAndroidTest {`
`235`	`235`	`assertNotEquals(null, mobileElementView.getAttribute("text"));`
`236`	`236`	`}`
`237`	`237`
`238`		`- @Test public void areMobileElements_FindByTest() {`
	`238`	`+ @Test public void areMobileElementsFindByTest() {`
`239`	`239`	`assertNotEquals(0, mobiletextVieWs.size());`
`240`	`240`	`}`
`241`	`241`
`242`		`- @Test public void isMobileElement_FindByTest() {`
	`242`	`+ @Test public void isMobileElementFindByTest() {`
`243`	`243`	`assertNotEquals(null, mobiletextVieW.getAttribute("text"));`
`244`	`244`	`}`
`245`	`245`
`@@ -259,11 +259,11 @@ public class AndroidPageObjectTest extends BaseAndroidTest {`
`259`	`259`	`assertNotEquals(null, chainElementView.getAttribute("text"));`
`260`	`260`	`}`
`261`	`261`
`262`		`- @Test public void checkThatElementsWereNotFoundByIOSUIAutomator_Chain() {`
	`262`	`+ @Test public void checkThatElementsWereNotFoundByIOSUIAutomatorChain() {`
`263`	`263`	`assertEquals(0, iosChainTextViews.size());`
`264`	`264`	`}`
`265`	`265`
`266`		`- @Test public void checkThatElementWasNotFoundByIOSUIAutomator_Chain() {`
	`266`	`+ @Test public void checkThatElementWasNotFoundByIOSUIAutomatorChain() {`
`267`	`267`	`NoSuchElementException nsee = null;`
`268`	`268`	`try {`
`269`	`269`	`iosChainTextView.getAttribute("text");`
`@@ -273,11 +273,11 @@ public class AndroidPageObjectTest extends BaseAndroidTest {`
`273`	`273`	`assertNotNull(nsee);`
`274`	`274`	`}`
`275`	`275`
`276`		`- @Test public void androidOrIOSFindByElementsTest_ChainSearches() {`
	`276`	`+ @Test public void androidOrIOSFindByElementsTestChainSearches() {`
`277`	`277`	`assertNotEquals(0, chainAndroidOrIOSUIAutomatorViews.size());`
`278`	`278`	`}`
`279`	`279`
`280`		`- @Test public void androidOrIOSFindByElementTest_ChainSearches() {`
	`280`	`+ @Test public void androidOrIOSFindByElementTestChainSearches() {`
`281`	`281`	`assertNotEquals(null, chainAndroidOrIOSUIAutomatorView.getAttribute("text"));`
`282`	`282`	`}`
`283`	`283`
`@@ -311,7 +311,7 @@ public class AndroidPageObjectTest extends BaseAndroidTest {`
`311`	`311`	`throw new RuntimeException(NoSuchElementException.class.getName() + " has been expected.");`
`312`	`312`	`}`
`313`	`313`
`314`		`- @Test public void checkThatTestWillNotBeFailedBecauseOfInvalidFindBy_List() {`
	`314`	`+ @Test public void checkThatTestWillNotBeFailedBecauseOfInvalidFindByList() {`
`315`	`315`	`assertEquals(0, elementsWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy.size());`
`316`	`316`	`}`
`317`	`317`
Original file line number	Diff line number	Diff line change
`@@ -200,11 +200,11 @@ public class IOSPageFactoryTest extends AppIOSTest {`
`200`	`200`	`assertNotEquals(null, mobileButton.getText());`
`201`	`201`	`}`
`202`	`202`
`203`		`- @Test public void areMobileElements_FindByTest() {`
	`203`	`+ @Test public void areMobileElementsFindByTest() {`
`204`	`204`	`assertNotEquals(0, mobiletFindByButtons.size());`
`205`	`205`	`}`
`206`	`206`
`207`		`- @Test public void isMobileElement_FindByTest() {`
	`207`	`+ @Test public void isMobileElementFindByTest() {`
`208`	`208`	`assertNotEquals(null, mobiletFindByButton.getText());`
`209`	`209`	`}`
`210`	`210`
`@@ -216,11 +216,11 @@ public class IOSPageFactoryTest extends AppIOSTest {`
`216`	`216`	`assertNotEquals(null, remotetextVieW.getText());`
`217`	`217`	`}`
`218`	`218`
`219`		`- @Test public void checkThatElementsWereNotFoundByAndroidUIAutomator_Chain() {`
	`219`	`+ @Test public void checkThatElementsWereNotFoundByAndroidUIAutomatorChain() {`
`220`	`220`	`assertEquals(0, chainElementViews.size());`
`221`	`221`	`}`
`222`	`222`
`223`		`- @Test public void checkThatElementWasNotFoundByAndroidUIAutomator_Chain() {`
	`223`	`+ @Test public void checkThatElementWasNotFoundByAndroidUIAutomatorChain() {`
`224`	`224`	`NoSuchElementException nsee = null;`
`225`	`225`	`try {`
`226`	`226`	`chainElementView.getText();`
`@@ -234,7 +234,7 @@ public class IOSPageFactoryTest extends AppIOSTest {`
`234`	`234`	`assertNotEquals(null, iosButton.getText());`
`235`	`235`	`}`
`236`	`236`
`237`		`- @Test public void areIOSElements_FindByTest() {`
	`237`	`+ @Test public void areIOSElementsFindByTest() {`
`238`	`238`	`assertNotEquals(0, iosButtons.size());`
`239`	`239`	`}`
`240`	`240`
`@@ -257,7 +257,7 @@ public class IOSPageFactoryTest extends AppIOSTest {`
`257`	`257`	`throw new RuntimeException(NoSuchElementException.class.getName() + " has been expected.");`
`258`	`258`	`}`
`259`	`259`
`260`		`- @Test public void checkThatTestWillNotBeFailedBecauseOfInvalidFindBy_List() {`
	`260`	`+ @Test public void checkThatTestWillNotBeFailedBecauseOfInvalidFindByList() {`
`261`	`261`	`assertEquals(0, elementsWhenAndroidLocatorIsNotDefinedAndThereIsInvalidFindBy.size());`
`262`	`262`	`}`
`263`	`263`	`}`