Merge "Fix TimePickerTest#testOnSaveInstanceStateAndOnRestoreInstanceState." into froyo
diff --git a/tests/tests/database/src/android/database/cts/AbstractCursorTest.java b/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
index e20bee1..2927a13 100644
--- a/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
+++ b/tests/tests/database/src/android/database/cts/AbstractCursorTest.java
@@ -409,7 +409,6 @@
)
})
public void testGetWindow() {
- assertNull(mDatabaseCursor.getWindow());
CursorWindow window = new CursorWindow(false);
assertEquals(0, window.getNumRows());
// fill window from position 0
diff --git a/tests/tests/database/src/android/database/sqlite/cts/SQLiteCursorTest.java b/tests/tests/database/src/android/database/sqlite/cts/SQLiteCursorTest.java
index ac72141..ae5b9d4 100644
--- a/tests/tests/database/src/android/database/sqlite/cts/SQLiteCursorTest.java
+++ b/tests/tests/database/src/android/database/sqlite/cts/SQLiteCursorTest.java
@@ -200,12 +200,11 @@
final String DELETE_1 = DELETE + "1;";
final String DELETE_2 = DELETE + "2;";
+ mDatabase.execSQL(DELETE_1);
+ // when cursor is created, it refreshes CursorWindow and populates cursor count
SQLiteCursor cursor = getCursor();
MockObserver observer = new MockObserver();
cursor.registerDataSetObserver(observer);
-
- mDatabase.execSQL(DELETE_1);
- // first time run getCount, it will refresh CursorWindow.
assertEquals(TEST_COUNT - 1, cursor.getCount());
assertFalse(observer.hasChanged());
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java b/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
index 7c1f850..40c6c93 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
@@ -179,7 +179,7 @@
return webChromeClient.hadOnCreateWindow();
}
}.run();
- assertTrue(webChromeClient.hadOnRequestFocus());
+ assertFalse(webChromeClient.hadOnRequestFocus());
new DelayedCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
@@ -449,6 +449,8 @@
public boolean onCreateWindow(WebView view, boolean dialog, boolean userGesture,
Message resultMsg) {
WebView childView = new WebView(getActivity());
+ final WebSettings settings = childView.getSettings();
+ settings.setJavaScriptEnabled(true);
childView.setWebChromeClient(this);
WebView.WebViewTransport transport = (WebView.WebViewTransport) resultMsg.obj;
transport.setWebView(childView);
diff --git a/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutTest.java b/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutTest.java
index e1db2ca..e5569c4 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsoluteLayoutTest.java
@@ -93,21 +93,6 @@
new AbsoluteLayout(mActivity);
new AbsoluteLayout(mActivity, attrs);
new AbsoluteLayout(mActivity, attrs, 0);
-
- new AbsoluteLayout(null);
-
- try {
- new AbsoluteLayout(null, attrs);
- fail("should throw NullPointerException");
- } catch (NullPointerException e) {
- }
-
- try {
- new AbsoluteLayout(null, attrs, 1);
- fail("should throw NullPointerException");
- } catch (NullPointerException e) {
- }
-
new AbsoluteLayout(mActivity, null, 1);
new AbsoluteLayout(mActivity, attrs, -1);
}
diff --git a/tests/tests/widget/src/android/widget/cts/ImageViewTest.java b/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
index 2bf064c..5214b50 100644
--- a/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
@@ -478,10 +478,10 @@
public void testClearColorFilter() {
MockDrawable drawable = new MockDrawable();
ColorFilter cf = new ColorFilter();
- drawable.setColorFilter(cf);
ImageView imageView = new ImageView(mActivity);
imageView.setImageDrawable(drawable);
+ imageView.setColorFilter(cf);
imageView.clearColorFilter();
assertNull(drawable.getColorFilter());