Commit Graph

127 Commits

Author SHA1 Message Date
Brian Muramatsu
8128f7face Merge remote branch 'goog/gingerbread' into manualmerge
Conflicts:
	tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
	tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
	tests/tests/net/src/android/net/cts/NetworkInfoTest.java

Change-Id: Ia16b95167e5c023cc977ea9d6bf2323d5c6cbf71
2011-04-27 13:51:31 -07:00
Xia Wang
4a88b709cc Backport from HC to Fix NetworkInfoTest
Bug 4322307

Fixed some other assertions that didn't check for
either CONNECTING or CONNECTED. Cleaned up some
code and removed some extraneous checks.

Original description:
"Fix cts tests for Wi-Fi only devices.

For Wi-Fi only device,
startUsingNetworkFeature() returns Phone.APN_TYPE_NOT_AVAILABLE
stopUsingNetworkFeature() return 1;

In NetworkInfoTest:
cm.getAllNetworkInfo() returns an array of NetworkInfo.
But the index is not based on network type."

Change-Id: I0b5e3d0cfe5fac18bca0a5ca2ce4cc73bc4dfa16
2011-04-21 17:46:29 -07:00
Brian Muramatsu
68cb323d1b Merge remote branch 'goog/gingerbread' into manualmerge 2011-04-15 14:57:34 -07:00
Brian Muramatsu
a6e507ee6a am 1ebfc31a: Merge "Fix WifiInfoTest" into gingerbread
* commit '1ebfc31a62d1096b5e07d23c8f50da8dc7402b00':
  Fix WifiInfoTest
2011-04-07 15:03:45 -07:00
Brian Muramatsu
4d2f2058dd Merge remote branch 'goog/gingerbread' into manualmerge
Conflicts:
	tests/expectations/knownfailures.txt

Change-Id: I9db887535ef970eef0209251460c13b367f23779
2011-04-07 11:30:45 -07:00
Irfan Sheriff
5c990cd714 Fix WifiInfoTest
Do not listen to supplicant state change for wifi disable action,
instead depend on wifi state changed action

Bug: 4242273
Change-Id: Ie53ff42d5e51bbc9f28d93a435fa3315611d342e
2011-04-07 11:13:45 -07:00
Irfan Sheriff
f108edaa63 Fix WifiInfoTest
Do not listen to supplicant state change for wifi disable action,
instead depend on wifi state changed action

Bug: 4242273
Change-Id: Ie53ff42d5e51bbc9f28d93a435fa3315611d342e
2011-04-06 10:26:32 -07:00
Brian Muramatsu
e704a78bf7 Merge remote branch 'goog/gingerbread' into manualmerge
Conflicts:
	tests/tests/app/src/android/app/cts/InstrumentationTest.java
	tests/tests/content/src/android/content/cts/ContextTest.java
	tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java
	tests/tests/os/src/android/os/cts/BuildVersionTest.java
	tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
	tests/tests/util/src/android/util/cts/EventLogTest.java
	tests/tests/view/src/android/view/cts/WindowTest.java
	tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
	tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
	tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
	tools/host/src/com/android/cts/TestDevice.java

Change-Id: Ic4ee072b6c82f97ba256b25a71db153195c958b9
2011-03-31 15:29:51 -07:00
Xia Wang
a89c9170d2 Fix cts tests for Wi-Fi only devices.
For Wi-Fi only device,
startUsingNetworkFeature() returns Phone.APN_TYPE_NOT_AVAILABLE
stopUsingNetworkFeature() return 1;

In NetworkInfoTest:
cm.getAllNetworkInfo() returns an array of NetworkInfo.
But the index is not based on network type.

bug#: 3513630

Change-Id: Ied0684a9fe2152dae242d779efe3dffd6c9c0609
2011-03-07 12:25:18 -08:00
Brian Muramatsu
6f4ad1df4e am e0e64bd8: Merge "Merge remote branch \'korg/froyo\' into froyomerge" into gingerbread
* commit 'e0e64bd8301cee40c88c2d453799e0d13f08656a': (33 commits)
  Using different filenames for testRecorderVideo and testRecorderCamera.
  Remove Reference to Internal Phone Constant
  Change test string without a space character
  The test branches to alphabetic or numeric one
  Add key strokes in case of using 12-key keyboad
  Appends a space instead of using POUND key
  Update startcts Script
  Add QHD to the supported ScreenConfiguration list
  Add wait to testCacheFile.
  Adding waitForIdleSync in testTouchMode.
  Fix OpenGlEsVersionTest
  Fix OpenGlEsVersionTest
  Stop WifiManagerTest from disabling current network.
  Verify preinstalled apps don't have debuggable set.
  Remove isWatchingCursor Assertion
  Backport TelephonyManagerTest Enhancements
  FileSystemPermissionTest Eclair Backport
  Eclair CTS Version Increment to 2.1_r5
  Fix Eclair ARMEABI Test
  Read Log Permission Test Fixes
  ...
2011-02-28 18:55:52 -08:00
Brian Muramatsu
e0e64bd830 Merge "Merge remote branch 'korg/froyo' into froyomerge" into gingerbread 2011-02-28 18:39:01 -08:00
Brian Muramatsu
456706e3e1 Merge remote branch 'korg/froyo' into froyomerge
Conflicts:
	tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
	tests/tests/view/src/android/view/cts/WindowTest.java

Change-Id: Ibf7651011e4e594d0173c90f6341f75a9e71d45b
2011-02-28 18:25:14 -08:00
Brian Muramatsu
8eac64e5b2 Merge "Merge remote branch 'korg/eclair' into eclairmerge" into froyo 2011-02-28 18:00:59 -08:00
Brian Muramatsu
74a90c286b Merge remote branch 'korg/eclair' into eclairmerge
Conflicts:
	tests/AndroidManifest.xml
	tests/jni/Android.mk
	tests/res/layout/focus_finder_layout.xml
	tests/res/values/strings.xml
	tests/src/android/opengl/cts/OpenGlEsVersionStubActivity.java
	tests/src/android/os/cts/CpuFeatures.java
	tests/src/android/view/cts/FocusFinderStubActivity.java
	tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
	tests/tests/os/src/android/os/cts/BuildTest.java
	tests/tests/permission/src/android/permission/cts/DebuggableTest.java
	tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
	tools/host/src/com/android/cts/TestDevice.java
	tools/host/src/com/android/cts/TestSessionLog.java
	tools/host/src/com/android/cts/Version.java
	tools/host/src/res/cts_result.xsl

Change-Id: If7cd43b18be79a062d23d5536a3ff3a91c635f0b
2011-02-28 17:50:11 -08:00
Brian Muramatsu
b5066bfde7 Merge "Remove Reference to Internal Phone Constant" into froyo 2011-02-28 15:26:40 -08:00
Brian Muramatsu
f3336d71e9 Remove Reference to Internal Phone Constant
Use the constant defined in the test instead.

Change-Id: Ia4c85a56663df0c79910395aaae534407952aaf6
2011-02-28 15:21:42 -08:00
Jean-Baptiste Queru
19d91d3db9 am 556d3504: Reconcile gingerbread variants
* commit '556d3504cb726e8e04e6f2aa92dd6eb7f6d18c4f':
2011-02-28 13:41:43 -08:00
Jean-Baptiste Queru
556d3504cb Reconcile gingerbread variants
Change-Id: I5e68fbe90331f2d9278196a62b97d3ccd2fb7cfa
2011-02-28 13:17:54 -08:00
Brian Muramatsu
5db0e9f147 am 006494e5: Merge "Fix Broken PaintTest#testBreakText1" into gingerbread
* commit '006494e5183fa3fef09b6fa463a4bdaca677e059':
  Fix Broken PaintTest#testBreakText1
  Test startUsingNetworkFeature TYPE_MOBILE_HIPRI
  Increase height and width of the status bar to accommodate higher resolution devices
  Update BuildVersionTest for 2.2.2
  Update BuildVersionTest for 2.2 and 2.2.1
  Fix DX Tests Compilation Script
  Changing the delay time from 250ms to 3000ms, because avoiding a race condition in testOnReceivedIcon.
  CTS test is not considering the case when the devcie get into SILENT mode by volume down key.
  Revert "fix keytests for azerty keyboard"
2011-02-28 09:38:04 -08:00
Brian Muramatsu
46699fe6b5 Merge "Merge remote branch 'korg/froyo' into manualmerge" into gingerbread 2011-02-16 15:31:46 -08:00
Brian Muramatsu
636c31ade5 Merge remote branch 'korg/froyo' into manualmerge
Conflicts:
	tests/tests/os/src/android/os/cts/BuildVersionTest.java
	tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java

Change-Id: I1befa31b0cce0a72a6d71760d18cae1bb97ca937
2011-02-16 14:28:49 -08:00
Brian Muramatsu
3642f69cc2 Merge "Test startUsingNetworkFeature TYPE_MOBILE_HIPRI" into froyo 2011-02-15 13:05:28 -08:00
Brian Muramatsu
76e1414be8 Test startUsingNetworkFeature TYPE_MOBILE_HIPRI
Bug 3307293

Change-Id: I03b3e11e1de20333ece772e3448937c61ca0fe91
2011-02-15 13:03:55 -08:00
Brian Muramatsu
8c8408fe57 am e3d0c34c: Merge "Change SSLCertificateSocketFactoryTest.testCreateSocket host" into gingerbread
* commit 'e3d0c34cbcd29814492878e54b1c16ea6412f072':
  Change SSLCertificateSocketFactoryTest.testCreateSocket host
2011-02-10 15:57:31 -08:00
Brian Carlstrom
3bd4323ce4 Change SSLCertificateSocketFactoryTest.testCreateSocket host
The test may be flaky because it depends on a live server.
Switch to a different server that may be more reliable.

Bug: 3188260
Change-Id: Ibba872489650914db8ddd9a117529556787f66ec
2011-02-10 15:41:48 -08:00
Brian Muramatsu
f1d59d0bad am 10cf2ff3: Merge "Merge remote branch \'korg/froyo\' into manualmerge" into gingerbread
* commit '10cf2ff3ef8972c0056344db9be33e3d201ec510':
  fix NoCallPermission tests for non-telephony devices
  Huawei fix for receive message tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices
  fix sms testcases for non-telephony devices
  Huawei fix for call function tests failing on Mobile Internet Devices, Personal Media Players and other non-phone devices
  DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices
  fix test for non-telephony devices
  Use Vogar Expectations to Clean Up Remaining Tests
  fix keytests for azerty keyboard
  The layout height should be the value scaled by the density.
  Set ChromeClient to webview to gurantee the getprogress() value
  100ms does not gurantee trigerring the audio. the test always passed with 200ms
  Remove Broken NoActivityRelatedPermissionTest
  fix WQVGA resolution
2011-01-20 15:28:35 -08:00
Brian Muramatsu
10cf2ff3ef Merge "Merge remote branch 'korg/froyo' into manualmerge" into gingerbread 2011-01-20 15:19:16 -08:00
Brian Muramatsu
cda6b3d881 Merge remote branch 'korg/froyo' into manualmerge
Conflicts:
	tests/tests/permission/src/android/permission/cts/NoActivityRelatedPermissionTest.java
	tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java

Change-Id: Ie74c678a6ae142d9861b6965a8ca89ff58ebfa83
2011-01-20 15:03:31 -08:00
Jean-Baptiste Queru
c02749936f reconcile froyo CTS variants
Change-Id: I3500118d665df5045d800d2e1d70107b47b52baf
2011-01-20 12:24:40 -08:00
Brian Muramatsu
19b684137a am ec004f1d: (-s ours) Merge "DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices" into froyo
* commit 'ec004f1d40ddfd829584d596d91eef4d2db78db2':
  DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices
2011-01-19 18:29:32 -08:00
Brian Muramatsu
ec004f1d40 Merge "DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices" into froyo 2011-01-19 18:11:48 -08:00
Madan Ankapura
328b217e58 DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices
Device can still have a valid networkId even after disconnection
if it was associated with AP, getWifiState is a better check to
get valid state.

Change-Id: I31a8ca38f304fbf639e1f3111be4b5ed406e3b3c
2011-01-19 18:09:45 -08:00
Jean-Baptiste Queru
76aa79e534 Merge from open-source gingerbread
Change-Id: Ia24060add81186960781229089e8b3eee1390935
2011-01-19 08:24:40 -08:00
Brian Muramatsu
9b7ea4afac Merge "Merge remote branch 'korg/froyo' into gingerbread" into gingerbread 2011-01-18 10:47:50 -08:00
Brian Muramatsu
d9aec36188 Merge remote branch 'korg/froyo' into gingerbread
Change-Id: Ieea971689f21c7a010c49d85818ef4ac089f3202
2011-01-14 14:18:22 -08:00
Brian Muramatsu
1c62779738 am 5766f495: Merge "Test requestRouteToHost() except TYPE_WIFI" into froyo
* commit '5766f49549275c02f9a513aae82bcfa867cb551b':
  Test requestRouteToHost() except TYPE_WIFI
2011-01-14 11:58:32 -08:00
Masanori Ogino
d2488d6ffd Test requestRouteToHost() except TYPE_WIFI
If the device is set Wifi-ON, then testRequestRouteToHost always fails.

Change-Id: Ie487773552e8f6f1d4838755cc39e23c5aa57c1d
2011-01-13 15:52:34 +09:00
Jean-Baptiste Queru
5e9814b99e reconcile with open-source gingerbread CTS
Change-Id: I48668c65b9c0f0921954d309b4b53e026af3a86f
2011-01-10 12:23:47 -08:00
Brian Muramatsu
b511c888ec Nuke TrafficStatsTest#testTrafficStatsWithHost...
Bug 3189208

Removing this test due to potential problems with GB. This will need to
be brought back and investigated.

Change-Id: Ifeafdf44464c652b063edfb51c5f7931624b6973
2011-01-07 15:19:18 -08:00
Nick Kralevich
553ae9a71a still seeing flakyness. Increase retries.
Change-Id: I988afa2922dc503bcdff455822088ad22c854d97
2010-12-13 14:02:45 -08:00
Nick Kralevich
26c4fe935f Make ListeningPortsTest less flaky.
When a DNS lookup occurs, a new listening UDP socket will be
created to receive the DNS response.  This listening socket is
only temporary, and shouldn't count as a permanent open
socket.

Bug: 3276283

Change-Id: I45090c0e07d9b360cc26f4bce23833db8c399507
2010-12-13 12:52:34 -08:00
Brian Muramatsu
f074f02bc1 am 19b68add: am 8c329055: Merge "Fix Build" into froyo
* commit '19b68add2857e75ab9303c4e32f1abe987d7186d':
  Fix Build
2010-11-29 14:41:38 -08:00
Brian Muramatsu
8c32905516 Merge "Fix Build" into froyo 2010-11-29 14:31:18 -08:00
Brian Muramatsu
5822cf4427 Fix Build
Didn't have the right javac set in my environment... :-(

Change-Id: I951a11460eafeb75c081a4a07787aaf320b48b31
2010-11-29 14:28:39 -08:00
Brian Muramatsu
358cf19274 am 6873bf0f: am 91d0b1ea: Merge "Fix android.net.cts.ProxyTest" into froyo
* commit '6873bf0fd29a0537ba8e44459a0674fb77e9029d':
  Fix android.net.cts.ProxyTest
2010-11-29 14:06:01 -08:00
Brian Muramatsu
91d0b1ea9b Merge "Fix android.net.cts.ProxyTest" into froyo 2010-11-29 13:57:54 -08:00
Brian Muramatsu
c11e42329b am 69c69f15: am a89ee93f: Merge "Stop WifiManagerTest from disabling current network." into froyo
* commit '69c69f156bebe834cfbb13eb7f93dc9e25ee723b':
  Stop WifiManagerTest from disabling current network.
2010-11-29 13:00:44 -08:00
Brian Muramatsu
5f78c57fc5 Fix android.net.cts.ProxyTest
Bug 3188260

Remove the code that was trying to write to secure settings
and take off the BrokenTest annotation.

Change-Id: I0759db38225a9822b25c987e66a7590c555b5e9e
2010-11-29 12:57:14 -08:00
Brian Muramatsu
5d2d97902a Merge "Stop WifiManagerTest from disabling current network." into eclair 2010-11-29 12:31:44 -08:00
Brett Chabot
9e410175ba Stop WifiManagerTest from disabling current network.
Bug 3181376

Change-Id: Ia8d12a10f4ed0c46325e76f1dffeef93412a55e5
2010-11-29 12:21:20 -08:00