Merge "Flip condition in ApacheHttpClientTest" into jb-dev
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index 04fae71..e5af74a 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -47,11 +47,14 @@
$(cts_support_packages) \
$(cts_external_packages)
+# Temporarily blacklisted packages
+# CtsAccessibilityServiceTestCases \
+# CtsWebkitSecurityTestCases \
+
# Test packages that require an associated test package XML.
cts_test_packages := \
CtsAccelerationTestCases \
CtsAccountManagerTestCases \
- CtsAccessibilityServiceTestCases \
CtsAccessibilityTestCases \
CtsAdminTestCases \
CtsAnimationTestCases \
@@ -94,7 +97,6 @@
CtsUtilTestCases \
CtsViewTestCases \
CtsWebkitTestCases \
-# CtsWebkitSecurityTestCases \
CtsWidgetTestCases
# All APKs that need to be scanned by the coverage utilities.
diff --git a/tests/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java b/tests/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java
index 9732117..28e26eb 100644
--- a/tests/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java
+++ b/tests/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java
@@ -20,6 +20,7 @@
import android.app.Service;
import android.content.pm.ServiceInfo;
import android.cts.util.PollingCheck;
+import android.provider.Settings;
import android.test.AndroidTestCase;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
@@ -44,9 +45,17 @@
private AccessibilityManager mAccessibilityManager;
@Override
- public void setUp() {
+ public void setUp() throws Exception {
mAccessibilityManager = (AccessibilityManager)
getContext().getSystemService(Service.ACCESSIBILITY_SERVICE);
+
+ assertEquals("Accessibility should have been enabled by the test runner.",
+ 1, Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.ACCESSIBILITY_ENABLED));
+
+ assertEquals("Touch exploration should have been enabled by the test runner.",
+ 1, Settings.Secure.getInt(mContext.getContentResolver(),
+ Settings.Secure.TOUCH_EXPLORATION_ENABLED));
}
public void testAddAndRemoveAccessibilityStateChangeListener() throws Exception {
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
index 1a8b3a8..e8e32ee 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BasicAdapterTest.java
@@ -31,8 +31,8 @@
* BluetoothAdapter}.
*/
public class BasicAdapterTest extends AndroidTestCase {
- private static final int DISABLE_TIMEOUT = 20000; // ms timeout for BT disable
- private static final int ENABLE_TIMEOUT = 20000; // ms timeout for BT enable
+ private static final int DISABLE_TIMEOUT = 60000; // ms timeout for BT disable
+ private static final int ENABLE_TIMEOUT = 60000; // ms timeout for BT enable
private static final int POLL_TIME = 400; // ms to poll BT state
private boolean mHasBluetooth;
diff --git a/tests/tests/view/src/android/view/cts/ViewTest.java b/tests/tests/view/src/android/view/cts/ViewTest.java
index e636451..ac88713 100644
--- a/tests/tests/view/src/android/view/cts/ViewTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTest.java
@@ -2250,8 +2250,6 @@
// it passes the touch screen motion event down to itself even if it is not the target view.
assertTrue(mockView2.hasCalledOnTouchEvent());
- assertFalse(mockView1.dispatchTouchEvent(null));
-
mockView1.reset();
OnTouchListenerImpl listener = new OnTouchListenerImpl();
mockView1.setOnTouchListener(listener);