67 Commits

Author SHA1 Message Date
Brett Chabot
111a4135d8 am b9a40068: Merge "Failing test cleanup." into gingerbread
Merge commit 'b9a40068b590b86904b40bf466571b140d0f94b4' into gingerbread-plus-aosp

* commit 'b9a40068b590b86904b40bf466571b140d0f94b4':
  Failing test cleanup.
2010-10-05 11:05:37 -07:00
Brett Chabot
2ad24f944e Failing test cleanup.
Change-Id: I7cabc6ff2ec1fcb80dede5da03b03622a5bae021
2010-10-04 19:55:14 -07:00
Brian Carlstrom
0535d8577f am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
Merge commit '94126238427f04ecb86fe6832113afb2f04e89b5' into gingerbread-plus-aosp

* commit '94126238427f04ecb86fe6832113afb2f04e89b5':
  Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
2010-09-14 11:17:22 -07:00
Brian Carlstrom
2c42c8fbaf Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
Bug: 2672817

Change-Id: If5f10fa16eaf5676a0c1540463759cd4e0e837de
2010-09-14 00:11:14 -07:00
Brian Carlstrom
90b3135d8b am 4d672988: Merge "Remove "StringTest.java"." into gingerbread
Merge commit '4d672988fed7fbdd887fe78603fa2eaf713031ad' into gingerbread-plus-aosp

* commit '4d672988fed7fbdd887fe78603fa2eaf713031ad':
  Remove "StringTest.java".
2010-08-25 11:04:26 -07:00
Brian Carlstrom
5c8e760bcb Remove "StringTest.java".
This only tests stuff that's already better tested in dalvik/libcore, plus
private ICU API (RuleBasedNumberFormat) we'd like to remove, and that this
is the only caller of.

Conflicts:

	tests/CoreTests/android/core/StringTest.java

git cherry-pick -e 935022a99dac5454fc478e221b6392f3ba467009

Change-Id: I0bd172f2703bbcd6381920d40244165234fef4a1
2010-08-24 21:04:25 -07:00
Brian Carlstrom
1b7e4d5adc am 4ae1e382: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread
Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp

* commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
  Tracking merge of dalvik-dev to gingerbread
2010-08-05 10:40:45 -07:00
Brian Carlstrom
3c7c351a62 Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b5285e30c1a881d0ba860ba9021f57d113
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd4dc1a5c909b56ab56a56406290da30
git cherry-pick --no-commit 5e8a587d

Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
2010-08-04 23:47:38 -07:00
Romain Guy
3fb33c7262 Merge "Added method getPreferredHttpHost" 2010-07-15 10:49:47 -07:00
Andreas Sandblad
2986f858ae Added method getPreferredHttpHost
Added method for returning preferred proxy which takes both
localhost and Wi-Fi into account. This is a convenient method
to clients which only wants to set a correct proxy and don't
want to build in dependency to if Wi-Fi is active or not.
Currently no Wi-Fi proxy is supported by the system, but once
added, this method could return a suitable proxy for Wi-Fi.

Change-Id: I8c9c2879351fd25a20ea82a2cb000f226248c357
2010-07-14 08:49:46 +02:00
Henrik Baard
c692e8c4da Make HTTP Header class handle multiple cache-control fields.
The HTTP specification states the following about the fields:
Multiple message-header fields with the same field-name MAY be present
in a message if and only if the entire field-value for that header field
is defined as a comma-separated list [i.e., #(values)]. It MUST be
possible to combine the multiple header fields into one "field-name:
field-value" pair, without changing the semantics of the message, by
appending each subsequent field-value to the first, each separated by a
comma. The order in which header fields with the same field-name are
received is therefore significant to the interpretation of the combined
field value, and thus a proxy MUST NOT change the order of these field
values when a message is forwarded.

Change-Id: I1a6fe5cc8f541f8e80d559641d270d09eac9d85c
2010-07-14 08:20:40 +02:00
Brett Chabot
0dc59e78e1 More framework tests cleanup.
Move all tests for android.* classes from tests/AndroidTests and
tests/CoreTests into framework/base/<core|graphics>/tests.

Consolidate all tests for java.* classes to tests/CoreTests.
Eventually hopefully these will be moved to dalvik/ somewhere.

Remove tests/AndroidTests entirely.

Change-Id: I86584d086ab7bd045bb38a10b699907805298a95
2010-04-01 18:31:11 -07:00
Brian Carlstrom
778ce48665 Issue 5697: getContextClassLoader returns a non-application classloader
ActivityThread should try to set the value for Java
Thread.getContextClassLoader to the PathClassLoader that loaded the
APK's classes so that Java frameworks that use the Java context class
loader, which is not to be confused with the
android.content.Context.getClassLoader which serves a similar purpose
in the Android framework.

However, we avoid setting the Java context ClassLoader to the APK's
PathClassLoader if there is a static indication that multiple packages
may share the VM, since they could load in an unpredictable order
leading to different values for the thread local Java context
ClassLoader. In this case, we instead use a specially created
WarningContextClassLoader that warns the user the first time the Java
context ClassLoader.

Currently the static indications that a package might share a VM with
other packages are the presence in the AndroidManifest of a
sharedUserId or requesting a non-default application process name.
2010-02-23 15:58:00 -08:00
Brett Chabot
e70f61b116 Retry test-runner tests move.
This time change the frameworks makefile so it only includes test-runner/src
in the public API.
2010-02-20 17:29:05 -08:00
Brett Chabot
c1ca8c51c6 Revert "Move framework test-runner unit tests to be closer to their source."
This reverts commit 12093976a4842a795491cfd2b1d3b71e18503f2d.
2010-02-19 10:31:05 -08:00
Brett Chabot
12093976a4 Move framework test-runner unit tests to be closer to their source.
Move the test-runner source into a separate src folder to accommodate the test
move.
2010-02-19 09:58:29 -08:00
Fred Quintana
c5d1c6db61 add sync polling
- added the ability to specify that a sync (of account/authority/extras)
  should occur at a given frequency
- the existing daily poll code was replaced with seeding each
  account/authority with a 24 hour periodic sync
- enhanced the "adb shell dumpsys content" output to show the
  periodic syncs and when they will next run
2010-02-05 15:16:20 -08:00
Elliott Hughes
809cf4481f Remove "StringTest.java".
This only tests stuff that's already better tested in dalvik/libcore, plus
private ICU API (RuleBasedNumberFormat) we'd like to remove, and that this
is the only caller of.
2010-02-03 11:33:47 -08:00
Patrick Scott
9d0f609251 There is no ../com directory and the build (find) agrees. 2010-01-28 09:03:14 -05:00
Neal Nguyen
22e31e5b60 Moving framework core tests closer to their source files.
Phase 2 of test case cleanup; distributing CoreTests files closer to their respective sources under frameworks.
2010-01-27 13:36:38 -08:00
Fred Quintana
307da1a46b enhance the sync manager backoff logic and add support for retry-after
moved SyncQueue and SyncOperation into their own top-level classes
to ease maintainability and testing6

removed some dead code
2010-01-25 16:41:58 -08:00
Neal Nguyen
ae51f0a857 Merge "Framework Tests Cleanup: Removing CTS duplicate files" 2010-01-13 14:17:56 -08:00
Doug Zongker
edc5189c33 change remaining frameworks/base Gservices to Secure settings
Change-Id: I61bdb05a2526523700c2833154d5a4133881ef10
2010-01-07 15:00:37 -08:00
Neal Nguyen
a5411f5b8d Framework Tests Cleanup: Removing CTS duplicate files
CookieTest.java is already included in CTS, so removing this one under frameworks.
2009-12-23 16:02:55 -08:00
Dan Egnor
ded0e6447e Create android-common static library which gets included in frameworks.jar,
but can also be used by unbundled apps.  Move android.text.util.Regex there as
a starting example, renamed to a more sensible (?) com.android.common.Patterns.
Set up a corresponding test package, and move RegexTest (to PatternsTest).
Update clients.
2009-11-18 12:05:04 -08:00
Jesse Wilson
e78fcbac04 DO NOT MERGE: Cleaning up the PipedStreamTest 2009-09-26 09:28:17 -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
Grace Kloba
d0990d4a78 The empty path and no path mean default path. So "a=d" should replace "a=c". 2009-09-09 18:22:44 -07:00
Ken Shirriff
5f5989de7c Add tests for RecurrenceSet.
Tests only cover populateContentValues.  See bug 1594638
2009-08-21 17:09:33 -07:00
Grace Kloba
699c646839 fix the build. handleSslErrorRequest needs a return value now. 2009-08-03 11:46:44 -07:00
Android (Google) Code Review
ba58c6f228 am ad346278: Merge change 8208 into donut
Merge commit 'ad346278fe129a341543d4a75bf9cc08c50742f8'

* commit 'ad346278fe129a341543d4a75bf9cc08c50742f8':
  Removing MD2
2009-07-29 16:45:22 -07:00
Android (Google) Code Review
ad346278fe Merge change 8208 into donut
* changes:
  Removing MD2
2009-07-29 00:38:53 -07:00
Android (Google) Code Review
1186bb1eca am ae1ba650: Merge change 8227 into donut
Merge commit 'ae1ba650074ab7b9a73f4430c1fc3576a8199383'

* commit 'ae1ba650074ab7b9a73f4430c1fc3576a8199383':
  Handle null in MatrixCursor.get*()
2009-07-22 13:29:31 -07:00
Bjorn Bringert
f2cec58d90 Handle null in MatrixCursor.get*()
Before, if a column contained null, MatrixCursor.getString()
returned the string "null", and the get<Number>() methods
threw exceptions.

Now, getString() returns null, and get<Number>() return 0.

Fixes http://b/issue?id=1996628
2009-07-22 21:20:51 +01:00
Android (Google) Code Review
c33bd02e0f am 113eaa59: Merge change 8131 into donut
Merge commit '113eaa59c1dfafd548a13919e48c0346c0c925ac'

* commit '113eaa59c1dfafd548a13919e48c0346c0c925ac':
  Fix android.core.FileTest#testFile: add sdcard write permission to test.
2009-07-22 11:50:57 -07:00
Urs Grob
dbda5ceb49 Removing MD2 2009-07-22 20:09:52 +02:00
Brett Chabot
d0bff15377 Fix android.core.FileTest#testFile: add sdcard write permission to test. 2009-07-21 18:17:05 -07:00
Patrick Scott
fe4fec7c66 Remove all our old high priority knowledge since WebCore will manage it.
Also removed an unused variable in RequestQueue.java.
2009-07-15 15:48:02 -04:00
Android (Google) Code Review
8ba63601ab am 15e74b9d: Merge change 1939 into donut
Merge commit '15e74b9da8b4cda11ee54da1e77a02d1a86c944a'

* commit '15e74b9da8b4cda11ee54da1e77a02d1a86c944a':
  Temporarily suppress flaky test LocationManagerProximityTest until test harness support can be rolled out.
  Fix build breakage
  Revise the ImageButton class description to include information
  Record statistics about whether HTTP connections are reused.
2009-05-19 01:19:15 -07:00
Brett Chabot
78a1c9067f Temporarily suppress flaky test LocationManagerProximityTest until test harness support can be rolled out. 2009-05-18 19:15:09 -07:00
Jorg Pleumann
86dbf0d798 am b4735b6: am 25f9637: AI 148665: Disabling a test that does not work a
Merge commit 'b4735b6c04c6bca3219115395748a1b5ef02ff6c'

* commit 'b4735b6c04c6bca3219115395748a1b5ef02ff6c':
  AI 148665: Disabling a test that does not work as
2009-05-11 00:44:29 -07:00
Jorg Pleumann
b4735b6c04 am 25f9637: AI 148665: Disabling a test that does not work as
Merge commit '25f963753ea762c12c74c0dcb861b023ac92177a' into donut

* commit '25f963753ea762c12c74c0dcb861b023ac92177a':
  AI 148665: Disabling a test that does not work as
2009-05-11 00:39:55 -07:00
Jorg Pleumann
25f963753e AI 148665: Disabling a test that does not work as
expected on a device with a SIM.
  BUG=1657996

Automated import of CL 148665
2009-05-11 00:36:52 -07:00
Android (Google) Code Review
f9189f17d1 am 08d00b9: Merge change 1159 into donut
Merge commit '08d00b9ad794d9f627f1c2c4b282c3950806f4bd'

* commit '08d00b9ad794d9f627f1c2c4b282c3950806f4bd':
  CoreTests: Fix LocationManagerProximityTest.
2009-05-07 10:35:09 -07:00
Mike Lockwood
7f7840b41e CoreTests: Fix LocationManagerProximityTest.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-07 13:29:59 -04:00
Dianne Hackborn
7a13559501 merged 231cc608d06ffc31c24bf8aa8c8275bdd2636581 2009-05-06 00:28:37 -07:00
Dianne Hackborn
231cc608d0 Rewrite SyncStorageEngine to use flat files and in-memory data structures.
The previous implementation used a database for storing all of its state, which could cause
a significant amount of IO activity as its tables were updated through the stages of a sync.
This new implementation replaces that in-memory data structures, with hand-written code
for writing them to persistent storage.

There are now 4 files associated with this class, holding various pieces of its state that
should be consistent.  These are everything from a main XML file of account information that
must always be retained, to a binary file of per-day statistics that can be thrown away at
any time.  Writes of these files as scheduled at various times based on their importance of
the frequency at which they change.

Because the database no longer exists, there needs to be a new explicit interface for
interacting with the sync manager database.  This is provided by new APIs on IContentService,
with a hidden method on ContentResolver to retrieve the IContentService so that various
system entities can use it.  Other changes in other projects are required to update to the
new API.

The goal here is to have as little an impact on the code and functionality outside of
SyncStorageEngine, though due to the necessary change in API it is still somewhat extensive.
2009-05-05 15:40:53 -07:00
Fred Quintana
d9d2f1140b change the sync framework and users to understand Account 2009-04-23 15:37:45 -07:00
Yu Shan Emily Lau
810ec50a1e AI 146179: am: CL 145971 am: CL 145757 Suppress the flaky tests
Original author: yslau
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146179
2009-04-14 14:32:03 -07:00
Dan Bornstein
5a0e535782 AI 146178: am: CL 145970 am: CL 145743 Excise the "de" locale out of testResourceBundles(), leaving a
TODO and long comment about the situation.
  Original author: danfuzz
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146178
2009-04-14 12:41:05 -07:00