Merge pull request appium#377 from TikhomirovSergey/SrinivasanTarget-defect_fix

TikhomirovSergey · TikhomirovSergey · commit 6acb09f540c9 · 2016-05-01T19:54:34.000+03:00
Srinivasan target defect fix
diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java b/src/main/java/io/appium/java_client/pagefactory/AppiumFieldDecorator.java
@@ -184,7 +184,7 @@ private Object decorateWidget(Field field) {
             return null;
         }
 
-        Class<? extends Widget> widgetType;
+        Class<? extends Widget> widgetType = null;
         boolean isAlist = false;
         if (List.class.isAssignableFrom(type)) {
             isAlist = true;
@@ -199,11 +199,15 @@ private Object decorateWidget(Field field) {
                 listType = ((ParameterizedType) listType).getRawType();
             }
 
-            if (!Widget.class.isAssignableFrom((Class) listType)) {
+            if (listType instanceof Class) {
+                if (!Widget.class.isAssignableFrom((Class) listType)) {
+                    return null;
+                }
+                widgetType = Class.class.cast(listType);
+            } else {
                 return null;
             }
 
-            widgetType = Class.class.cast(listType);
         } else {
             widgetType = (Class<? extends Widget>) field.getType();
         }
diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/GenericTest.java b/src/test/java/io/appium/java_client/pagefactory_tests/GenericTest.java
@@ -0,0 +1,99 @@
+package io.appium.java_client.pagefactory_tests;
+
+
+import io.appium.java_client.pagefactory.AppiumFieldDecorator;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.PageFactory;
+
+import java.util.List;
+import java.util.Set;
+
+public class GenericTest {
+
+    static class TempGenericPage<T> {
+
+        public List<T> items;
+
+        public List<T> getItems() {
+            return items;
+        }
+    }
+
+    static class MockWebDriver implements WebDriver {
+
+        @Override
+        public void get(String url) {
+
+        }
+
+        @Override
+        public String getCurrentUrl() {
+            return null;
+        }
+
+        @Override
+        public String getTitle() {
+            return null;
+        }
+
+        @Override
+        public List<WebElement> findElements(By by) {
+            return null;
+        }
+
+        @Override
+        public WebElement findElement(By by) {
+            return null;
+        }
+
+        @Override
+        public String getPageSource() {
+            return null;
+        }
+
+        @Override
+        public void close() {
+
+        }
+
+        @Override
+        public void quit() {
+
+        }
+
+        @Override
+        public Set<String> getWindowHandles() {
+            return null;
+        }
+
+        @Override
+        public String getWindowHandle() {
+            return null;
+        }
+
+        @Override
+        public TargetLocator switchTo() {
+            return null;
+        }
+
+        @Override
+        public Navigation navigate() {
+            return null;
+        }
+
+        @Override
+        public Options manage() {
+            return null;
+        }
+    }
+
+    @Test
+    public void genericTestCse() {
+        PageFactory
+                .initElements(new AppiumFieldDecorator(new MockWebDriver()),
+                        new TempGenericPage<>());
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ private Object decorateWidget(Field field) {`
`184`	`184`	`return null;`
`185`	`185`	`}`
`186`	`186`
`187`		`- Class<? extends Widget> widgetType;`
	`187`	`+ Class<? extends Widget> widgetType = null;`
`188`	`188`	`boolean isAlist = false;`
`189`	`189`	`if (List.class.isAssignableFrom(type)) {`
`190`	`190`	`isAlist = true;`
`@@ -199,11 +199,15 @@ private Object decorateWidget(Field field) {`
`199`	`199`	`listType = ((ParameterizedType) listType).getRawType();`
`200`	`200`	`}`
`201`	`201`
`202`		`- if (!Widget.class.isAssignableFrom((Class) listType)) {`
	`202`	`+ if (listType instanceof Class) {`
	`203`	`+ if (!Widget.class.isAssignableFrom((Class) listType)) {`
	`204`	`+ return null;`
	`205`	`+ }`
	`206`	`+ widgetType = Class.class.cast(listType);`
	`207`	`+ } else {`
`203`	`208`	`return null;`
`204`	`209`	`}`
`205`	`210`
`206`		`- widgetType = Class.class.cast(listType);`
`207`	`211`	`} else {`
`208`	`212`	`widgetType = (Class<? extends Widget>) field.getType();`
`209`	`213`	`}`