575 Commits

Author SHA1 Message Date
Brad Fitzpatrick
70ece8d334 Speed up Uri.getQueryParameter by allocating less.
Sample hierarchial URL, from my ContactsProvider test case:

content://com.android.contacts/data?account_name=braddroid%40gmail.com&account_type=com.google.GAIA&caller_is_syncadapter=true

Without this patch:  (fetching the "account_name" parameter)

10000 iters: 0.5293 ms average
10000 iters: 0.5119 ms average
10000 iters: 0.5158 ms average

With this patch, rewriting it to not allocate memory (no implicit
StringBuilder), but still no caching:

1) when it needs to decode something (i.e account_name above;
   allocates memory)

  50000 iters: 0.28724 ms average
  50000 iters: 0.31774 ms average
  50000 iters: 0.28764 ms average

2) when it doesn't need to decode (and thus allocate memory,
   i.e. account_type above)

  50000 iters: 0.0954 ms average
  50000 iters: 0.09124 ms average
  50000 iters: 0.09088 ms average
2009-10-26 14:46:25 -07:00
Wei Huang
2c726389fb am 45db67f2: Merge change I808651dc into eclair-mr2
Merge commit '45db67f2e89341412613ea6b162dd0ad36f091c6' into eclair-mr2-plus-aosp

* commit '45db67f2e89341412613ea6b162dd0ad36f091c6':
  bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().
2009-10-23 11:38:25 -07:00
Wei Huang
fd7b4f1d12 bug #2180646: make comparing "404-04" and "40404" return true in PhoneNumberUtils.compare().
- when comparing two numbers whose dialable char length is less than the MIN_MATCH (7), treat them as equal if the dialable portion of the numbers match.
- update unit test.
2009-10-23 01:17:17 -07:00
Brett Chabot
7733978a18 am 5f2ae667: am 76bb9a36: Merge change I1932e8f8 into eclair
Merge commit '5f2ae667e89e5ddfd7aa2bcbe3017b746b7b1de2' into eclair-mr2-plus-aosp

* commit '5f2ae667e89e5ddfd7aa2bcbe3017b746b7b1de2':
  Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
2009-10-21 22:33:53 -07:00
Brett Chabot
5f2ae667e8 am 76bb9a36: Merge change I1932e8f8 into eclair
Merge commit '76bb9a363633b5741937ebe58b01a8b2024753b0' into eclair-mr2

* commit '76bb9a363633b5741937ebe58b01a8b2024753b0':
  Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
2009-10-21 22:21:40 -07:00
Daisuke Miyakawa
ae27c57664 am 54616f34: Make MockCursor class a part of public SDK.
Merge commit '54616f3435e67029006d2f77462c61ed0635a3f6' into eclair-mr2-plus-aosp

* commit '54616f3435e67029006d2f77462c61ed0635a3f6':
  Make MockCursor class a part of public SDK.
2009-10-21 16:10:24 -07:00
Daisuke Miyakawa
54616f3435 Make MockCursor class a part of public SDK.
With this class, external developers will be able to reduce their
redundant work related to testing around ContentProvider/ContentResolver.

Internal Issue number: 2181010
2009-10-22 07:25:02 +09:00
Tammo Spalink
60be848554 am 8785c064: Merge change Ie5df08ef into eclair-mr2
Merge commit '8785c064fab3429c792ac160aeeb19e9926382f0' into eclair-mr2-plus-aosp

* commit '8785c064fab3429c792ac160aeeb19e9926382f0':
  Let PLUS occur once anywhere in dial-str network portion.
2009-10-21 00:37:00 -07:00
Android (Google) Code Review
8785c064fa Merge change Ie5df08ef into eclair-mr2
* changes:
  Let PLUS occur once anywhere in dial-str network portion.
2009-10-21 03:27:14 -04:00
Tammo Spalink
9e53415326 Let PLUS occur once anywhere in dial-str network portion.
Create a new extractNetworkPortion() function, since the old one is
public, that does effectively the same thing but is more flexible as
just mentioned.

Addresses issue:
http://buganizer/issue?id=2013998

Change-Id: Ie5df08ef9c871881e8728a44abf0385908000823
2009-10-21 10:30:58 +08:00
Dan Egnor
484a065ce3 am 2a2805b7: Merge change Ib3b06fc3 into eclair-mr2
Merge commit '2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5' into eclair-mr2-plus-aosp

* commit '2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5':
  It turns out to be useful to allow enumeration on a per-tag basis,
2009-10-20 13:29:31 -07:00
Android (Google) Code Review
2a2805b7fb Merge change Ib3b06fc3 into eclair-mr2
* changes:
  It turns out to be useful to allow enumeration on a per-tag basis, and it's easy to support based on the data structures we have, so add a tag parameter to getNextEvent().
2009-10-20 16:23:01 -04:00
Dan Egnor
b3b06fc39b It turns out to be useful to allow enumeration on a per-tag basis,
and it's easy to support based on the data structures we have, so
add a tag parameter to getNextEvent().
2009-10-20 13:05:17 -07:00
Brett Chabot
1932e8f811 Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
BUG 2170975
2009-10-19 17:34:33 -07:00
Guang Zhu
2f2d2f8316 am d1a720d0: am 9e58e642: Enable some tests that requires local http server
Merge commit 'd1a720d06f92a7228f28361a01f3a158c560cd18' into eclair-mr2-plus-aosp

* commit 'd1a720d06f92a7228f28361a01f3a158c560cd18':
  Enable some tests that requires local http server
2009-10-15 12:05:04 -07:00
Guang Zhu
d1a720d06f am 9e58e642: Enable some tests that requires local http server
Merge commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd' into eclair-mr2

* commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd':
  Enable some tests that requires local http server
2009-10-15 11:59:05 -07:00
Guang Zhu
9e58e6427c Enable some tests that requires local http server 2009-10-15 11:01:30 -07:00
Daisuke Miyakawa
ca802b6ed5 am 8b12144d: Merge change I170c8251 into eclair-mr2
Merge commit '8b12144dad94bc0807e20590d72b4aadc56189d4' into eclair-mr2-plus-aosp

* commit '8b12144dad94bc0807e20590d72b4aadc56189d4':
  Add tests and fix vCard code.
2009-10-14 16:46:09 -07:00
Daisuke Miyakawa
99a0a2cd73 Add tests and fix vCard code.
Now, basic tests are almost ready.

TODO:
- importer test toward multiple vCard input (though it was tested with real usage)
- exporter tests for multiple composition
- tests with non-Ascii
- tests with special types like TYPE_DOCOMO

ISSUE:
In order to fully check the validity of exporter, we may have to develop
some vCard importer which rejects vCard which is valid but a kind of dubious.

Internal Issue Number: 2160039
2009-10-14 16:07:40 -07:00
Dan Egnor
eac70503c2 am 5c8a80b8: Merge change I4410ec8f into eclair-mr2
Merge commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625' into eclair-mr2-plus-aosp

* commit '5c8a80b8fc7a25dda269cd16e0b90b35227fd625':
  Framework-side DropBox service that maintains a size-bounded
2009-10-13 18:14:37 -07:00
Dan Egnor
4410ec8f7c Framework-side DropBox service that maintains a size-bounded
queue of data chunks (sort of a blob-oriented logcat).

In the future, this will be coupled with a revised checkin service that
would actually upload this data.
2009-10-13 17:36:19 -07:00
Daisuke Miyakawa
2c0fe9b0f6 am d48e25d4: Merge change I83b3bddf into eclair-mr2
Merge commit 'd48e25d4e3278c5e975db01adb98661ee59923fe' into eclair-mr2-plus-aosp

* commit 'd48e25d4e3278c5e975db01adb98661ee59923fe':
  Add a new TestSuites: VCardTests
2009-10-12 14:53:43 -07:00
Daisuke Miyakawa
221bc127c4 Add a new TestSuites: VCardTests
Now, the following command is available.
adb shell am instrument -w -e class com.android.unit_tests.vcard.VCardTests com.android.unit_tests/android.test.InstrumentationTestRunner

Internal Issuer number: 2160039
2009-10-12 14:43:30 -07:00
Daisuke Miyakawa
74a2d09cba am 347daf3a: Merge change I2a52a60a into eclair-mr2
Merge commit '347daf3a9802b2a4184ff8aa90b4af6c5de79ab7' into eclair-mr2-plus-aosp

* commit '347daf3a9802b2a4184ff8aa90b4af6c5de79ab7':
  Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
2009-10-12 14:12:17 -07:00
Daisuke Miyakawa
ba2b21bee8 Implement unit tests for vCard exporter, which depends on the sucess in vCard importer.
In order to share the logic between tests for importer and those for exporter,
PropertyNodesVerifier is now a separated class and drastically modified.
Now the class accept "unordered" expected PropertyNode objects, which allows vCard
composer to not care the exact order of each elements.

MockCursor is added, which may be added into the public API in the future, but in
the test directory for now.
Another MockContentProvider is (temporarily) developed so that it can be accepted by
MockContentResolver#addProvider(), which does not allow IContentProvider and its
descendants but only exact ContentProvider, while the original MockContentProvider in
android.test.mock.MockContentProvider implements IContentProvider.

The test development is still on-going, but this test suffices minimal requirement of
vCard tests.

Internal issue number: 2160039
2009-10-12 13:42:42 -07:00
Daisuke Miyakawa
403b5cd405 am 6e15a70c: Merge change I1fb066b0 into eclair-mr2
Merge commit '6e15a70c79c360f6870b06610f61a7d02cb29b2c' into eclair-mr2-plus-aosp

* commit '6e15a70c79c360f6870b06610f61a7d02cb29b2c':
  Rename VCardTest.java to VCardImportTest.java.
2009-10-09 09:53:47 -07:00
Daisuke Miyakawa
3f15538a32 Rename VCardTest.java to VCardImportTest.java.
Internal issue number: 2160039
2009-10-09 09:43:57 -07:00
Daisuke Miyakawa
258bc9cb44 am 5a016488: Merge commit \'refs/changes/08/29008/8\' of ssh://dmiyakawa@android-git.corp.google.com:29418/platform/frameworks/base into cleanup_import
Merge commit '5a016488da5ff6c1ecdff0b1febd836cc1711531' into eclair-mr2-plus-aosp

* commit '5a016488da5ff6c1ecdff0b1febd836cc1711531':
  Develop ContentResolver-based unit tests for vCard importer and fix vCard code
2009-10-08 20:09:31 -07:00
Daisuke Miyakawa
5c3e687965 Develop ContentResolver-based unit tests for vCard importer and fix vCard code
along with the tests

Make test code not only check the validity of VCardParser but also check
the validity of the data insertion part of ContactStruct class, using
MockContentResolver/MockContentProvider. With these tests, we are now really sure
vCard side appropriately sends vCard data into the resolver.

Fix ContactStruct so that it properly handles ORG property and TITLE property,
though it still does not see Group information. There's no vCard found which
uses Group and ORG and TITLE in convolted orders...

e.g. Current implementation misinterprets the following case, but we're not sure
whether any exporter emits data in this kind of complicated form...
group2.ORG:ComparyA
group1.ORG:CompanyB
group1.TITLE:TitleForA
group2.TITLE:TitleForB

Expected: CompanyA + TitleForA, CompanyB + TitleForB
Actual: CompanyA + TitleForB, CompanyB + TitleForA

Also change the parser part a little, so that some component can be reused via
the other part of vCard code.

Added several additional files for the tests, which ensures that
- ORG/TITLE properties are handled as we expect.
- PREF is appropriately handled and passed to the resolver as "IS_PRIMARY" flag.
-- We discarded the code which ensures that "IS_PRIMARY" is added to only one
   field in each type, after the local discussion (the duplication or no primary
   state should be handled by the resolver).

Internal Issue number: 2160039
2009-10-08 19:33:33 -07:00
Brett Chabot
d7dc2c4774 am baa44f11: am 773fd131: Merge change I3429f77a into eclair
Merge commit 'baa44f1109ebaa723d64ffee09d5b436749cd7c2' into eclair-mr2-plus-aosp

* commit 'baa44f1109ebaa723d64ffee09d5b436749cd7c2':
  Suppress flaky test HeapTest#testOomeLarge.
2009-10-06 19:47:12 -07:00
Android (Google) Code Review
773fd13130 Merge change I3429f77a into eclair
* changes:
  Suppress flaky test HeapTest#testOomeLarge.
2009-10-06 22:35:27 -04:00
Brett Chabot
b8a4e5f79a Suppress flaky test HeapTest#testOomeLarge.
BUG 2170975
2009-10-06 19:33:24 -07:00
Romain Guy
dba9981588 am 72da3a46: am c404ed2b: Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
Merge commit '72da3a467e46453e87549492ccec47e1feda6fe2' into eclair-mr2-plus-aosp

* commit '72da3a467e46453e87549492ccec47e1feda6fe2':
  Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
2009-10-06 19:28:01 -07:00
Romain Guy
c404ed2be5 Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
Change-Id: I407c7baa5606aaee875f51d6e96ce8a0117fc375
2009-10-06 18:38:27 -07:00
Tammo Spalink
7589ae7722 am ef5aed64: am 5c8dba21: Merge change I61aac7b3 into eclair
Merge commit 'ef5aed64fb58f39f50e398ecf35affbaa42be9d3' into eclair-mr2-plus-aosp

* commit 'ef5aed64fb58f39f50e398ecf35affbaa42be9d3':
  Add PERIOD char to CDMA address sugar list.
2009-10-05 19:33:52 -07:00
Tammo Spalink
61aac7b377 Add PERIOD char to CDMA address sugar list.
Addresses issue:
http://buganizer/issue?id=2164455
2009-10-05 14:20:06 +08:00
Hung-ying Tyan
4c0d406d56 am 2df1cc43: Merge change I42a80783 into eclair
Merge commit '2df1cc437793d50609c575881c04cc2c63d0bd97' into eclair-plus-aosp

* commit '2df1cc437793d50609c575881c04cc2c63d0bd97':
  Remove deprecated VpnType.getDescription().
2009-09-30 03:50:30 -07:00
Hung-ying Tyan
865a1bbf36 Remove deprecated VpnType.getDescription(). 2009-09-30 18:39:48 +08:00
Guang Zhu
fde37e5b40 am 277a41a7: Merge change Ia0609a0d into eclair
Merge commit '277a41a771c56727ad7456dad23f964e9e3ed546' into eclair-plus-aosp

* commit '277a41a771c56727ad7456dad23f964e9e3ed546':
  rebase layout test result as the numbers reported are much more stable now
2009-09-29 16:34:42 -07:00
Guang Zhu
a0609a0d8a rebase layout test result as the numbers reported are much more stable now 2009-09-29 16:24:43 -07:00
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