Commit Graph

158 Commits

Author SHA1 Message Date
Nick Kralevich
3dc050e0eb fix IPv6 loopback pattern
In /proc/net/udp6 and /proc/net/tcp6, the addresses stored
in that file are in network byte order.  As a result, the IPv6
loopback address, ::1, is stored as
00000000000000000000000001000000 NOT
00000000000000000000000000000001

Bug: 5473686
Change-Id: I73098d52c981c48d82423c8ce99b6b20d11a5568
2011-10-25 11:27:24 -07:00
android-htc-contribute
56f62ef149 am e54f4889: am bb1ababe: am 0c292bb1: Data call establish time is related to network condition which can’t be controlled by the device. Extend the time limitation to 30 seconds to cover most of the cases.
* commit 'e54f4889f65df9955e22a8adbbb8c1527220103e':
  Data call establish time is related to network condition which can’t be controlled by the device. Extend the time limitation to 30 seconds to cover most of the cases.
2011-10-10 12:42:58 -07:00
android-htc-contribute
e54f4889f6 am bb1ababe: am 0c292bb1: Data call establish time is related to network condition which can’t be controlled by the device. Extend the time limitation to 30 seconds to cover most of the cases.
* commit 'bb1ababef8fd8f0ba3e671b426ccc0d26f115ff7':
  Data call establish time is related to network condition which can’t be controlled by the device. Extend the time limitation to 30 seconds to cover most of the cases.
2011-10-10 12:41:03 -07:00
android-htc-contribute
0c292bb117 Data call establish time is related to network condition which can’t be controlled by the device.
Extend the time limitation to 30 seconds to cover most of the cases.

Change-Id: I522f7eb23baa9a652fb3fd633d200cd6307180c8
2011-10-10 12:27:36 -07:00
Steve Block
ed5e67c5fd Merge "Add tests for SslError" 2011-10-06 09:18:06 -07:00
Steve Block
19ad949076 Add tests for SslError
Bug: 5416594
Change-Id: Iebbc9d02088ea986246a8c7e9d4f9b2b84dd8116
2011-10-05 22:53:41 +01:00
Nick Kralevich
9f937dbff7 am 77d823cf: am 739152d2: am 8670b1c2: ListeningPortsTest: Make error message more useful.
* commit '77d823cf78174f7c9d373303b4aa821ba1d24b44':
  ListeningPortsTest: Make error message more useful.
2011-10-05 10:54:09 -07:00
Nick Kralevich
77d823cf78 am 739152d2: am 8670b1c2: ListeningPortsTest: Make error message more useful.
* commit '739152d27899821227e7cc07670d1f47a9a4e39d':
  ListeningPortsTest: Make error message more useful.
2011-10-05 10:51:21 -07:00
Nick Kralevich
8670b1c23f ListeningPortsTest: Make error message more useful.
- Add UID of listener to error message.
- Convert hex port number to decimal for easier reading by humans.

Change-Id: I0b8edcf14ebd0c039b936055a265f4706558f9fe
2011-10-05 10:43:01 -07:00
Brian Muramatsu
a3b6f08cf8 Merge remote branch 'goog/honeycomb-mr2'
Conflicts:
	apps/CtsVerifier/AndroidManifest.xml
	apps/CtsVerifier/res/values/strings.xml
	apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
	tests/core/runner/src/android/test/InstrumentationCtsTestRunner.java
	tests/expectations/knownfailures-3.0_r1.txt
	tests/expectations/knownfailures.txt
	tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java
	tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
	tests/tests/os/src/android/os/cts/BuildVersionTest.java
	tools/host/src/com/android/cts/Version.java

Change-Id: If9da4508f8eee25351538e3118e6ae990be49c60
2011-08-30 17:56:00 -07:00
Brian Muramatsu
68f66bffff Fix for ConnectivityManagerTest
Bug 5178134

Some network types can throw SecurityExceptions and depend on the
build configuration. Don't fail the test if those throw exceptions.

Change-Id: I5365f85280a348ef1777d05ce50b2dff17a1312f
2011-08-17 16:14:29 -07:00
Brian Muramatsu
2f9310c000 resolved conflicts for merge of b5d1b8d9 to master
Change-Id: I27437b34ee8792334b18f3d888092b28b16c0b33
2011-07-11 16:51:59 -07:00
Brian Muramatsu
b5d1b8d9c0 am 21bfd26f: am 111f5e92: Merge remote branch \'goog/honeycomb-mr1\' into manualmerge
* commit '21bfd26fd69ac180ae35bf727dc8500fc56289ea':
  Add test to ensure data/drm directory exists for drm process to write the certificate files. For bug 4950503.
  Update Test Expectations for HC
  Fix DeviceAdminReceiverTest NPE
  Add a header for string.h for strerror and memset
  Fix Screen Lock Test for HC
  Update CTS Version to 3.0_r3
  Fix webkit flakiness when waiting for results
  Increase HDPI/XHDPI Non-XLarge Min Memory to 32
  Use Uri.encode with HTML that contains special characters
  Fix view tests to account for alternate actionbars
  Bug fix for b/4491376 CTS failure in CtsAccessibilityServiceTestCases. Changed to holo.notitle theme and test code.
  Add a case for density 213, which is used for some tv devices. The memory requirements are set to be the same as high and xhigh dpi
  Fixes AudioRecorderTest and MediaRecorderTest when there are no mics or cameras present
2011-07-08 11:48:10 -07:00
Brian Muramatsu
1fb779d832 Merge remote branch 'goog/honeycomb' into manualmerge
Conflicts:
	tools/host/src/com/android/cts/Version.java

Change-Id: I059dc4b100504988ab3b1ccbd0a0bd61c1b05787
2011-06-29 18:13:57 -07:00
Brian Muramatsu
b8ddbd082a Merge remote branch 'goog/gingerbread' into manualmerge 2011-06-29 15:58:54 -07:00
Brian Muramatsu
e5ed9f7d8a am b44dd720: am 952fb86a: am c2e543dc: Merge "Test for Apache HttpClient" into gingerbread
* commit 'b44dd720f7289c67ff31b15fae4f1dace30f03c6':
  Test for Apache HttpClient
2011-06-27 14:43:47 -07:00
Brian Muramatsu
b44dd720f7 am 952fb86a: am c2e543dc: Merge "Test for Apache HttpClient" into gingerbread
* commit '952fb86af1e1cb4714ee3aa03fa5b36a6ad204d4':
  Test for Apache HttpClient
2011-06-27 14:37:15 -07:00
Brian Muramatsu
a18b717579 Test for Apache HttpClient
Bug 4554251

This test launches multiple downloads at once to check that the
device can open up multiple sockets without OOMing. One test
tries to use wifi if available and the other tries to use
mobile by disconnecting wifi.

The CtsTestServer was modified to handle responses in separate
threads to test concurrent downloads.

Change-Id: Ifa1a11f409c69c1ae3ce621bf0542e0be56b50e0
2011-06-22 18:18:26 -07:00
Brian Muramatsu
1ae190ce77 Fix NetworkInfo_DetailedStateTest Again
Change-Id: I07d6a0ee21039859991a9594cd8b4e11ac4eecb6
2011-06-22 15:35:43 -07:00
Brian Muramatsu
36b6639763 Fix for NetworkInfo_DetailedStateTest
Update the test to support a new enum value.
Once the SignatureTest is fixed to check enums there
shouldn't be any need for these enum checking tests.

Change-Id: I85d75e86453c37a35f8be9e15d99dd47c690f6ea
2011-06-07 13:53:47 -07:00
The Android Open Source Project
25634666f4 Reconcile with gingerbread-release
Change-Id: I48801e3af5b90f6207f9468d3cabe8c3f7945b82
2011-05-20 12:55:43 -07:00
The Android Automerger
1a6fb764ac merge in gingerbread-release history after reset to gingerbread 2011-05-13 14:27:42 -07:00
Brian Muramatsu
d664911394 am 916dd596: am 244f1a3a: am 8128f7fa: Merge remote branch \'goog/gingerbread\' into manualmerge
* commit '916dd5960fc0e572415e3526ac0d9029c3b7d576':
  Backport from HC to Fix NetworkInfoTest
2011-04-27 15:23:36 -07:00
Brian Muramatsu
244f1a3a42 am 8128f7fa: Merge remote branch \'goog/gingerbread\' into manualmerge
* commit '8128f7facef4648320b7ea4f93f27014ea153ac9':
  Backport from HC to Fix NetworkInfoTest
  Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well.
  Farewell Magnetometer Test
2011-04-27 14:47:17 -07:00
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
cf5f6fa087 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-22 13:34:49 -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
e821709d86 am d6ad59ae: am 6389fa31: am 68cb323d: Merge remote branch \'goog/gingerbread\' into manualmerge
* commit 'd6ad59ae43591b025a2ed7a438120aa970204a0d':
2011-04-18 03:17:47 -07:00
Brian Muramatsu
6389fa316d am 68cb323d: Merge remote branch \'goog/gingerbread\' into manualmerge
* commit '68cb323d1bbfc26fab0fb77d8de289a9cc02efd6':
  Parallelize Test Description Generalization
  Remove RequiredFeatures Annotation
  Server thread may not update the current value immediately after request url on testAccessLoadsImagesAutomatically case. Solution: Add one second delay before assert function.
  EGL Config Test
  Allow saving log files in different directory
  StartPreview only after setting fps range paramters
  Fix for the handling of SMS Delivery Report in case of CDMA network
  Fix WifiInfoTest
  Remove Unused Spec Progress Tool
  Fix Build
  Fix CtsTelephonyTestCases:PhoneNumberUtilsTest--testCallMethods fails due to PhoneNumberUtils MIN_MATCH set to 11 for China region ship
  Added sleep within testGetAndSetMasterSyncAutomatically.
2011-04-15 15:30:13 -07:00
Brian Muramatsu
68cb323d1b Merge remote branch 'goog/gingerbread' into manualmerge 2011-04-15 14:57:34 -07:00
Brian Muramatsu
22f7fba623 am 5a1b76b8: am a6e507ee: am 1ebfc31a: Merge "Fix WifiInfoTest" into gingerbread
* commit '5a1b76b822420df5baf69701f1da1bfecc16cae0':
  Fix WifiInfoTest
2011-04-11 17:32:52 -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
a76e6617fe am 4d2f2058: Merge remote branch \'goog/gingerbread\' into manualmerge
* commit '4d2f2058ddeb36c8d6c96a277b58cdef897ddf88':
  Fix WifiInfoTest
  Update NO_DELIVERY_REPORTS list.
  Update Expectations File
  Remove Test Annotation Related Tools
  Clean Up VideoViewTest
  CTS: Fixes a possible "out of memory" exception
2011-04-07 11:46:59 -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
fa28dcf658 resolved conflicts for merge of e704a78b to honeycomb-mr1
Change-Id: I099148d3d9006dc3dbd78f3397ea186ef568ceeb
2011-03-31 15:53:16 -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
6fb75865a0 resolved conflicts for merge of 978cc18d to honeycomb-mr1
Change-Id: Ic571fe4fda9d299b6b5d5e100b43fa8cc46e2ce6
2011-03-08 16:02:14 -08: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