Merge pull request RobotiumTech#31 from ilzar/master

Fix java.lang.VerifyError
tonkex · Oct 17, 2012 · 91f5bc6 · 91f5bc6
2 parents 51faf63 + 45d3b82
commit 91f5bc6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/robotium-solo/src/main/java/com/jayway/android/robotium/solo/Setter.java b/robotium-solo/src/main/java/com/jayway/android/robotium/solo/Setter.java
@@ -4,7 +4,6 @@
 import android.widget.ProgressBar;
 import android.widget.SlidingDrawer;
 import android.widget.TimePicker;
-import android.widget.NumberPicker;
 
 
 /**

diff --git a/robotium-solo/src/main/java/com/jayway/android/robotium/solo/Solo.java b/robotium-solo/src/main/java/com/jayway/android/robotium/solo/Solo.java
@@ -16,7 +16,6 @@
 import android.widget.GridView;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.NumberPicker;
 import android.widget.ProgressBar;
 import android.widget.RadioButton;
 import android.widget.ScrollView;
@@ -1812,8 +1811,17 @@ public ArrayList<TimePicker> getCurrentTimePickers() {
 	 *
 	 */
 
-	public ArrayList<NumberPicker> getCurrentNumberPickers() {
-		return viewFetcher.getCurrentViews(NumberPicker.class);
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+    public ArrayList getCurrentNumberPickers() {
+	    try {
+	        Class numberPickerClass = Class.forName("android.widget.NumberPicker");
+	        if (numberPickerClass != null) {
+	            return viewFetcher.getCurrentViews(numberPickerClass);
+	        }
+	    } catch(ClassNotFoundException cnfe) {
+	        cnfe.printStackTrace();
+	    }
+	    return null;
 	}
 
 	/**