535 Commits

Author SHA1 Message Date
Guang Zhu
ecae28bc3e am 1cdb55aa: Merge change 27457 into eclair
Merge commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5' into eclair-plus-aosp

* commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5':
  Added code style fix that actually did not get submitted in 2nd patch of previous change.
2009-09-28 10:14:47 -07:00
Android (Google) Code Review
1cdb55aa97 Merge change 27457 into eclair
* changes:
  Added code style fix that actually did not get submitted in 2nd patch of previous change.
2009-09-28 12:56:02 -04:00
Guang Zhu
56a3693217 Added code style fix that actually did not get submitted in 2nd patch of previous change. 2009-09-28 09:53:48 -07:00
Guang Zhu
89172dbc0d am c18b0ebc: Merge change 27185 into eclair
Merge commit 'c18b0ebcfb905cc5001618c78890e884a859e069' into eclair-plus-aosp

* commit 'c18b0ebcfb905cc5001618c78890e884a859e069':
  Add checks for double-dumping on webkit data.
2009-09-28 09:27:04 -07:00
Android (Google) Code Review
c18b0ebcfb Merge change 27185 into eclair
* changes:
  Add checks for double-dumping on webkit data.
2009-09-28 12:21:30 -04:00
Guang Zhu
7216047ac3 Add checks for double-dumping on webkit data.
Also some logs seem to suggest that in rare occations, a webkit dump after timeout has occured actually never hears any response back from webkit, thus causing the test app to wait forever, because the request webkit data mechanism is not protected by a timeout watchdog. So adding a explicit log print before calling webkit dump for monitoring in future test runs.
2009-09-28 09:20:20 -07:00
Yu Shan Emily Lau
d155f6d792 am d021ea27: Merge change 27306 into eclair
Merge commit 'd021ea27cea0ea14ad0e0295eaa51c94e92946fc' into eclair-plus-aosp

* commit 'd021ea27cea0ea14ad0e0295eaa51c94e92946fc':
  Modified the test case name for the browser page load test.
2009-09-27 16:54:35 -07:00
Yu Shan Emily Lau
30412d1ce0 Modified the test case name for the browser page load test. 2009-09-27 14:14:10 -07:00
Jesse Wilson
c27d57182a am 5648dbb1: Merge change 27159 into eclair
Merge commit '5648dbb1dabc0231fe953ad45916c067c79986c8' into eclair-plus-aosp

* commit '5648dbb1dabc0231fe953ad45916c067c79986c8':
  DO NOT MERGE: Cleaning up the PipedStreamTest
2009-09-26 11:21:16 -07:00
Jesse Wilson
e78fcbac04 DO NOT MERGE: Cleaning up the PipedStreamTest 2009-09-26 09:28:17 -07:00
johnwang
f776012426 am 9c118c80: Update CID in NeighboringCellInfo
Merge commit '9c118c80fd0a5416051f2a49f515301f2cf3fd6f' into eclair-plus-aosp

* commit '9c118c80fd0a5416051f2a49f515301f2cf3fd6f':
  Update CID in NeighboringCellInfo
2009-09-25 13:44:42 -07:00
johnwang
9c118c80fd Update CID in NeighboringCellInfo
NeighboringCellInfo works in GSM and UMTS network.

In GSM network, the locaiton value is the combination of LAC and CID.

In UMTS network, the locaiton value is PSC code.

NeighboringCellInfo should access and store those two values seperately.

It involves the change of Public API.

1. Add new API getRadioType(), getLac(), and getPsc() to get location info in GSM and UMTS.

2. Deprecate setCid() and NeighboringCellInfo(int cid) because cid is set by interpreting network type.
2009-09-25 12:17:46 -07:00
Ben Murdoch
349236c61c am b4ef3334: Merge change 26593 into eclair
Merge commit 'b4ef3334ca45ce43f8ed9e193e2b63208bb9624b' into eclair-plus-aosp

* commit 'b4ef3334ca45ce43f8ed9e193e2b63208bb9624b':
  Change the way DRT determines if it is ready to continue to the next test when running in automated mode.
2009-09-24 10:10:59 -07:00
Ben Murdoch
2eea5f3dc8 Change the way DRT determines if it is ready to continue to the next test when running in automated mode.
Change-Id: I4d8f6b447dd3c7d7b4baa449a5bacebe4ba59d25
(cherry picked from commit 15b503e46315a56467c0b40d411b457eda7ee334)
2009-09-24 12:48:59 +01:00
Tammo Spalink
a1e350eadc am b89cfb0f: Merge change 26566 into eclair
Merge commit 'b89cfb0f9db2b1a4655c5e78e5c57855b5a78ee9' into eclair-plus-aosp

* commit 'b89cfb0f9db2b1a4655c5e78e5c57855b5a78ee9':
  Conditionalized CDMA-specific test.
2009-09-23 21:50:40 -07:00
Tammo Spalink
af8e23fe9e Conditionalized CDMA-specific test.
Addresses issue:
http://b/issue?id=2122045

Change-Id: Ia43e254f0808e1d96cbd240101eee621979e9100
2009-09-24 12:29:16 +08:00
Wei Huang
7bcf59c43d am a1dfa7f4: Merge change 26550 into eclair
Merge commit 'a1dfa7f4a108a7823d8da49ba5ea1777e283a724' into eclair-plus-aosp

* commit 'a1dfa7f4a108a7823d8da49ba5ea1777e283a724':
  fix bug 2134367: failing phone number compare test.
2009-09-22 22:10:22 -07:00
Android (Google) Code Review
a1dfa7f4a1 Merge change 26550 into eclair
* changes:
  fix bug 2134367: failing phone number compare test.
2009-09-23 01:01:18 -04:00
Wei Huang
409308617f fix bug 2134367: failing phone number compare test.
Change-Id: Iccc3b69cd1e4bdb82da48d87d610e4a45ae31601
2009-09-22 21:52:41 -07:00
Jesse Wilson
7ca38352b9 am c3c6621a: Merge change 25879 into eclair
Merge commit 'c3c6621a2cf2f0d40d062dcad1c9f65485473841' into eclair-plus-aosp

* commit 'c3c6621a2cf2f0d40d062dcad1c9f65485473841':
  Setting the default HTTP user agent at runtime init.
2009-09-22 19:12:40 -07:00
Android (Google) Code Review
c3c6621a2c Merge change 25879 into eclair
* changes:
  Setting the default HTTP user agent at runtime init.
2009-09-22 22:04:05 -04:00
Wei Huang
0562eac463 am 31a12429: Merge change 26254 into eclair
Merge commit '31a12429b77e87b5047589d251642b975ad35b9a' into eclair-plus-aosp

* commit '31a12429b77e87b5047589d251642b975ad35b9a':
  fix bug 2134685: fix tests for PhoneNumberUtilsTest.
2009-09-21 14:50:01 -07:00
Android (Google) Code Review
31a12429b7 Merge change 26254 into eclair
* changes:
  fix bug 2134685: fix tests for PhoneNumberUtilsTest.
2009-09-21 17:43:20 -04:00
Yu Shan Emily Lau
6bf39fdbec am c2f97178: Merge change 26111 into eclair
Merge commit 'c2f97178acaf9c406067b9b89776b87ddf9c8558' into eclair-plus-aosp

* commit 'c2f97178acaf9c406067b9b89776b87ddf9c8558':
  Added a workaround to clear the browser cache.
2009-09-21 14:04:26 -07:00
Android (Google) Code Review
c2f97178ac Merge change 26111 into eclair
* changes:
  Added a workaround to clear the browser cache.
2009-09-21 16:58:35 -04:00
Yu Shan Emily Lau
d2ef9e31e6 Added a workaround to clear the browser cache.
modified:   BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java
2009-09-21 13:48:24 -07:00
Wei Huang
35fd2e5853 fix bug 2134685: fix tests for PhoneNumberUtilsTest.
Change-Id: I28c4e69775c7ce20983c052b8b77ba2df6d5c63b
2009-09-21 12:56:21 -07:00
Daisuke Miyakawa
4d9a5cc45c am a13ccc90: Merge change 26175 into eclair
Merge commit 'a13ccc908ee54d6c606b5a73b3a57e4dda13e44a' into eclair-plus-aosp

* commit 'a13ccc908ee54d6c606b5a73b3a57e4dda13e44a':
  Fix test for phone number comparation. Now that there are two algorithms, we should consider them in Java layer.
2009-09-21 10:58:23 -07:00
Daisuke Miyakawa
6a857d957e Fix test for phone number comparation. Now that there are two algorithms, we should consider them in Java layer.
Uguu.

Internal issue number: 2134367
2009-09-21 10:49:44 -07:00
Jesse Wilson
d0f80d4456 Setting the default HTTP user agent at runtime init.
I can't do this in HttpURLConnection directly, since that would
cause a forbidden dependency from Dalvik on Android.
2009-09-18 18:16:16 -07:00
Daniel Sandler
bf72ec17bf am e5a6d16f: Merge change 25785 into eclair
Merge commit 'e5a6d16f26543061a0fc815ba90644a44995e025' into eclair-plus-aosp

* commit 'e5a6d16f26543061a0fc815ba90644a44995e025':
  Fix http://b/2126318 (density test fails due to wrong-size asset stripping)
2009-09-18 13:59:38 -07:00
Daniel Sandler
da06e32e4c Fix http://b/2126318 (density test fails due to wrong-size asset stripping)
The density test expects all resources of all densities to be included, but specifying a density for a particular device build kills that. We therefore add all the required densities explicitly to the Makefile to compensate.
2009-09-18 15:12:07 -04:00
Ben Murdoch
f1638002a7 am f8c90acd: Merge change 25319 into eclair
Merge commit 'f8c90acd7fde806d2d9cccf4d6ec52dc279497bc' into eclair-plus-aosp

* commit 'f8c90acd7fde806d2d9cccf4d6ec52dc279497bc':
  Only move to the next test in DRT after the test has completed AND the page has finished loading.
2009-09-17 08:47:53 -07:00
Dianne Hackborn
ca1475a868 am 8843620c: Merge change 25360 into eclair
Merge commit '8843620cb208904bb9583809c9cfbe9e41264ae0' into eclair-plus-aosp

* commit '8843620cb208904bb9583809c9cfbe9e41264ae0':
  Fix issue #2121993: com.android.unit_tests.os.HandlerThreadTest:testHandlerThread is failing
2009-09-17 08:42:13 -07:00
Fred Quintana
fd6bb030fd am 5f78786c: Merge change 25190 into eclair
Merge commit '5f78786cf9802b988a4de3c08555eb43f1e02e04' into eclair-plus-aosp

* commit '5f78786cf9802b988a4de3c08555eb43f1e02e04':
  add the ability to do a newAssert with no values
2009-09-17 08:41:34 -07:00
Guang Zhu
77c65a641a am 44ca7090: Merge change 25356 into eclair
Merge commit '44ca7090aca79b8c8e71d34982ae54b69968ad56' into eclair-plus-aosp

* commit '44ca7090aca79b8c8e71d34982ae54b69968ad56':
  Filter out failing cases for future investigation.
2009-09-17 08:41:18 -07:00
Ben Murdoch
977f7691e5 Only move to the next test in DRT after the test has completed AND the page has finished loading.
Change-Id: I157da58bb99f7bf0fcd00073d078c26c7df201ed
2009-09-17 11:57:47 +01:00
Jean-Baptiste Queru
e525eef4b8 merge from open-source master 2009-09-16 16:22:13 -07:00
Android (Google) Code Review
8843620cb2 Merge change 25360 into eclair
* changes:
  Fix issue #2121993: com.android.unit_tests.os.HandlerThreadTest:testHandlerThread is failing
2009-09-16 19:20:52 -04:00
Android (Google) Code Review
5f78786cf9 Merge change 25190 into eclair
* changes:
  add the ability to do a newAssert with no values
2009-09-16 18:36:00 -04:00
Android (Google) Code Review
44ca7090ac Merge change 25356 into eclair
* changes:
  Filter out failing cases for future investigation.
2009-09-16 18:28:31 -04:00
Dianne Hackborn
207700d857 Fix issue #2121993: com.android.unit_tests.os.HandlerThreadTest:testHandlerThread is failing
Change-Id: I5f2cc8b39d3f15782e5fbf47015be9f4fa94a65b
2009-09-16 15:10:30 -07:00
Guang Zhu
01033abd7a Filter out failing cases for future investigation. 2009-09-16 15:04:38 -07:00
Guang Zhu
6bf18bae60 Refactor logic for starting forward servers and http test cases hacking, so that they can be shared between automated test mode and UI launch mode. 2009-09-15 23:47:20 -07:00
Fred Quintana
5ab78057a3 add the ability to do a newAssert with no values 2009-09-15 18:57:17 -07:00
Derek Sollenberger
0b3a5d6524 First pass at replacing native plugin views with java.
Change-Id: I6d1f45f31210c2353fa348cc37be8d91bcd5e887
2009-09-15 19:33:54 -04:00
Android (Google) Code Review
4b687f2eb5 Merge change 25132 into eclair
* changes:
  fix ContentProviderOperationTest
2009-09-15 17:42:25 -04:00
Fred Quintana
bfed8e9a32 fix ContentProviderOperationTest 2009-09-15 14:36:55 -07:00
Android (Google) Code Review
617d470dff Merge change 25124 into eclair
* changes:
  Add more error message if the script failed to pull result file from device.
2009-09-15 17:18:02 -04:00
Guang Zhu
ce8d9d1672 Add more error message if the script failed to pull result file from device. 2009-09-15 14:17:04 -07:00