summaryrefslogtreecommitdiffstats
path: root/luni
Commit message (Collapse)AuthorAgeFilesLines
...
* | Fix Mac build.Ian Rogers2014-06-101-0/+3
| | | | | | | | Change-Id: I32fdb9dabbc87d49e0be82ea39c2eea6f452fd6f
* | Merge "Tests for Runtime.*Memory()"Neil Fuller2014-06-101-26/+0
|\ \
| * | Tests for Runtime.*Memory()Neil Fuller2014-06-101-26/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs describe a condition we do not test for. The freeMemory / totalMemory tests have been consolidated into a single test and joined by an additional assertion for maxMemory(). The test for freeMemory from OldRuntimeTest has been tidied up and moved to RuntimeTest. Bug: 15507122 Change-Id: I4343215fb7f6b441613e25d3844d67812f5b5e94
* | | Merge "Fix DatagramMulticastChannelTest so it works better on hammerhead"Neil Fuller2014-06-101-345/+392
|\ \ \
| * | | Fix DatagramMulticastChannelTest so it works better on hammerheadNeil Fuller2014-06-101-345/+392
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some android devices have a WiFi-direct interface (p2p0) that probably shares underlying hardware with the standard wireless interface (wlan0). On hammerhead, when Wifi-direct is disconnected this interface appears to (only) have an IPv6 address and is "up" and "support multicast". The test was not tested on this hardware when it was written. Mako devices have the same behavior but the wlan0 interface most likely discovered first. The ordering of interfaces may also not be stable. The other breakages were due to implicit assumptions that the device supports both IPv4 and IPv6 on a single interface. The tests also rely on the IP_MULTICAST_LOOP option to receive packets sent out. There were some other bugs that were probably the result of assuming that when the interface was left unspecified the device would route outgoing packets via the interface the test was listening on. With multiple interfaces available those tests were flaky. Bug: 15509450 Change-Id: I33f71e26379a53334dce9991043c3a9a21000d02
* | | Build fix.Ian Rogers2014-06-091-0/+2
| | | | | | | | | | | | Change-Id: I52559cfcc806dfe0d8682be50a6078cb678e4169
* | | Merge "Remove deprecated WITH_HOST_DALVIK."Ian Rogers2014-06-103-5/+70
|\ \ \ | |/ / |/| |
| * | Remove deprecated WITH_HOST_DALVIK.Ian Rogers2014-06-093-5/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13751317 Fix the Mac host build: - conditionally define constants using pre-existing pattern, - make Posix calls that the Mac doesn't support throw UnsupportedOperationException. Change-Id: Ib68887cbe36ab167d042eb96c7834bce0651b078
* | | Shard the _getInstance test and skip the DH tests.Neil Fuller2014-06-091-50/+70
|/ / | | | | | | | | | | | | | | | | | | The _getInstance test was suppressed previously because it took too long to complete. This re-enables parts of the test but temporarily skips the DH algorithm until it can be investigated further. Bug: 5513723 Change-Id: Ia211de51f8def5b710c1d2a164f1ec70e474fc7a
* | Improve the load/loadLibrary documentation.Elliott Hughes2014-06-062-57/+42
|/ | | | | | | | | | | Also improve the exception detail message for the default case. Experience with third-party app developers is that the current documentation is unhelpful and the current exception detail message is misleading. If we didn't have to use the existing ClassLoader API, we could actually list the exact pathnames we'd tried. Change-Id: I31e1980addf34d6ada6a112949801c970f73bd2b
* Merge "Add interruptibility/wake on close to FileChannel.lock()"Neil Fuller2014-06-042-3/+8
|\
| * Add interruptibility/wake on close to FileChannel.lock()Neil Fuller2014-06-032-3/+8
| | | | | | | | | | | | | | | | | | | | There is no obvious way of automated testing given the test would have to spawn a separate process to lock a file (and flock is not available on devices). It has been tested manually with multiple processes on host and a device. Bug: 13927110 Change-Id: Ie2e565d4965e7aa6392b0eb32e55cdf50d7f61c5
* | Merge "Fix ZoneInfoDBTest.testGoodOverride"Neil Fuller2014-06-031-15/+17
|\ \
| * | Fix ZoneInfoDBTest.testGoodOverrideNeil Fuller2014-06-021-15/+17
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When executed under the CTS environment some of the tests in ZoneInfoDBTest assumed: 1) The device was booted with all tzinfo files present and that they don't change (i.e. so the runtime's static TimeZone singleton reflects the contents of the file system at the time the test is executed). 2) The number of timezone IDs in /data/misc/zoneinfo/tzdata, /system/usr/share/zoneinfo/tzdata are the same (if assumption 1 holds). This change modifies the tests to only use the (unchanging) /system/usr/share/zoneinfo/tzdata file and avoid use of the TimeZone class. Bug: 15382201 Change-Id: I8d3b1ea52a2147e7afaa302803c834539bd01db9
* | Merge "Fix BufferTest.testAccess"Neil Fuller2014-06-031-2/+5
|\ \
| * | Fix BufferTest.testAccessNeil Fuller2014-06-021-2/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Commit b327df0b7d83f079856304830ff4da92b4a5ea1f fixed three tests but broke BufferTest.testAccess. This fixes all of them. This ordering of state / argument checks appears consistent with the checks in DirectByteBuffer for other, similar methods such as putShort: 1) this.isAccessible 2) this.isReadOnly 3) Argument validity checks Change-Id: I4e93129ae0f3008ee4894f840d69ae71586b9f07
* | am 971bcaa5: Merge "Fix for flakiness in ↵Neil Fuller2014-05-301-0/+6
|\ \ | | | | | | | | | | | | | | | | | | URLConnectionTest.testServerShutdownOutput" * commit '971bcaa513fc1c6cb8ac6612d85f69d2bb45314f': Fix for flakiness in URLConnectionTest.testServerShutdownOutput
| * \ Merge "Fix for flakiness in URLConnectionTest.testServerShutdownOutput"Neil Fuller2014-05-301-0/+6
| |\ \
| | * | Fix for flakiness in URLConnectionTest.testServerShutdownOutputNeil Fuller2014-05-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flakiness reported by Junjie.Hu <junjie.hu@mediatek.com> This fix relies on changes to MockWebServer to provide deterministic ordering of responses. Change-Id: I4f296fa2f8d227876f52c69e22001f4e0d7b4ffd
* | | | am 4352ab40: Merge "Document and assert support for TLS-PSK cipher suites."Alex Klyubin2014-05-295-4/+197
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '4352ab40ce104520bfb6588ad8eef386866ff190': Document and assert support for TLS-PSK cipher suites.
| * | | Merge "Document and assert support for TLS-PSK cipher suites."Alex Klyubin2014-05-295-4/+197
| |\ \ \ | | |_|/ | |/| |
| | * | Document and assert support for TLS-PSK cipher suites.Alex Klyubin2014-05-275-4/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL updates the Javadoc of SSLSocket and SSLEngine to list the now supported TLS-PSK cipher suites. It also adds tests to assert that these cipher suites are actually supported by SSLSocket and SSLEngine. Bug: 15073623 Change-Id: I8e59264455f980f23a5e66099c27b5b4d932b9bb
* | | | am b106b5f3: Merge "Update SSLEngine Javadoc to reflect recent changes."Alex Klyubin2014-05-281-53/+358
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b106b5f3d44f7cd94ecc1b45a0e4b079c6aa5276': Update SSLEngine Javadoc to reflect recent changes.
| * | | Merge "Update SSLEngine Javadoc to reflect recent changes."Alex Klyubin2014-05-281-53/+358
| |\ \ \
| | * | | Update SSLEngine Javadoc to reflect recent changes.Alex Klyubin2014-05-231-53/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSLEngine is now backed by OpenSSL and thus supports the same cipher suites and protocols as SSLSocket. Change-Id: I842d6806afa5f9123dae3900c8ddad537d76048a
* | | | | am ddfd8597: Merge "Fix NetworkOnMainThreadException in KeyStoreTest"Neil Fuller2014-05-281-21/+27
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ddfd859719048c50cf247125af436391a4fff742': Fix NetworkOnMainThreadException in KeyStoreTest
| * | | | Merge "Fix NetworkOnMainThreadException in KeyStoreTest"Neil Fuller2014-05-281-21/+27
| |\ \ \ \
| | * | | | Fix NetworkOnMainThreadException in KeyStoreTestNeil Fuller2014-05-281-21/+27
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A quick fix for KeyStoreTest. Commit 1b6a2f56cf25fcbd0e2311be58d8577565622cf3 moved some code around causing the static initializer of the test to access the network, which is forbidden in CTS tests. Change-Id: I8addfa8f3b0d801cb90b9f9bb7d2707c4fc3f62f
* | | | | am 4fee9a24: Merge "ECParameterSpec: move curve selection to non-final"Kenny Root2014-05-271-14/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '4fee9a24b51650342aa85aab8c995e1107601e7a': ECParameterSpec: move curve selection to non-final
| * | | | ECParameterSpec: move curve selection to non-finalKenny Root2014-05-271-14/+10
| | |_|/ | |/| | | | | | | | | | | | | | | | | | This allows us to set the curve name in unbundled apps. Change-Id: Ie869b80aa7f70c7ed56cc7d8232df8ee0c2159f7
* | | | am 322cabe3: Merge "Fix testCalendarSerialization for all locales"Neil Fuller2014-05-271-1/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '322cabe3492bb1dd9d590047f9f1f3f55212ffdd': Fix testCalendarSerialization for all locales
| * | | Merge "Fix testCalendarSerialization for all locales"Neil Fuller2014-05-271-1/+3
| |\ \ \
| | * | | Fix testCalendarSerialization for all localesNeil Fuller2014-05-231-1/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test was passing on vogar but not under CTS on a local device. The test was sensitive to the default locale so failed when run on devices with a non-US locale. Change-Id: I202b2dec417bb8249eb9d6f69240bd120efb07f9
* | | | am cbc04230: Merge "Fix a sorting bug in SSLSocket javadoc."Alex Klyubin2014-05-231-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'cbc04230ba06e4c8877ce34b0fa659a014b5578c': Fix a sorting bug in SSLSocket javadoc.
| * | | Merge "Fix a sorting bug in SSLSocket javadoc."Alex Klyubin2014-05-231-4/+4
| |\ \ \
| | * | | Fix a sorting bug in SSLSocket javadoc.Alex Klyubin2014-05-231-4/+4
| | | |/ | | |/| | | | | | | | | Change-Id: I1d2eaf44191e468713e9a8ee888017a6b0f37e25
* | | | am 21d8bd12: Merge "Adding more tests around System properties"Neil Fuller2014-05-231-1/+57
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '21d8bd1227a8b877adeca3062dc5a427753156e2': Adding more tests around System properties
| * | | Merge "Adding more tests around System properties"Neil Fuller2014-05-231-1/+57
| |\ \ \
| | * | | Adding more tests around System propertiesNeil Fuller2014-05-211-1/+57
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for clearing all system properties between CTS tests to reduce test leakage. The code in the test runner that explicitly sets certain values can also be removed now that those properties have been made immutable. Note: As part of this I discovered that java.io.tmpdir is still mutable under the Zygote and immutable under vogar (where it is set as a command-line arg). This means that calling System.getProperties().clear() or System.setProperties(null) removes the property entirely under an Android app but not under vogar. Change-Id: If0361b138666909b21de9d6b8a73a584e9390550
* | | | am 392ca3ac: Merge "Change exception priority for ByteBuffer.put(null)"Neil Fuller2014-05-231-4/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '392ca3acf5ba48d315fc5469f286446a9cb217a1': Change exception priority for ByteBuffer.put(null)
| * | | Merge "Change exception priority for ByteBuffer.put(null)"Neil Fuller2014-05-231-4/+3
| |\ \ \
| | * | | Change exception priority for ByteBuffer.put(null)Neil Fuller2014-05-211-4/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 7e02765b7ada4e85f941f0a6b0fc60a8a76301f3 made ByteBuffer.put(null) throw a NullPointerException if the ByteBuffer was read only. Previously it would throw a ReadOnlyBufferException. The priority of exceptions is unclear, but this returns the behavior to what it was before and fixes 3 CTS tests: ReadOnlyWrappedByteBufferTest.testPutByteBuffer ReadOnlyHeapByteBufferTest.testPutByteBuffer ReadOnlyDirectByteBufferTest.testPutByteBuffer Change-Id: I90dd4b6969a4f31a26651d7b35758f899cc020b4
* | | | am ce478bec: Merge "DigestTest: reduce flakiness by having more iterations"Kenny Root2014-05-211-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ce478bec95ecb87fcdc25cfaaf917f13180f4660': DigestTest: reduce flakiness by having more iterations
| * | | DigestTest: reduce flakiness by having more iterationsKenny Root2014-05-211-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | This fails every once in a while sinch this isn't a rigorous benchmark, but try to combat it by having more iterations so the measurement has more time to stabilize. Change-Id: I4336d0d670e1e666e5bb75788228651f563eb59a
* | | am a2138c1f: Merge "Fix typo in test"Neil Fuller2014-05-211-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'a2138c1f0dc6f319062d4d09f6e0223f83340709': Fix typo in test
| * | Merge "Fix typo in test"Neil Fuller2014-05-211-1/+1
| |\ \
| | * | Fix typo in testNeil Fuller2014-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The test is supposed to be testing afterLast() not beforeFirst(). Change-Id: Ie36c55ec4d5a09e85ba6a6c5e2eeb037f34422ce
* | | | am 321dec9c: Merge "Keep Preferences tests working"Neil Fuller2014-05-214-3/+76
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '321dec9ceb27ebf4effa8db47e02fe25c38aebe8': Keep Preferences tests working
| * | | Keep Preferences tests workingNeil Fuller2014-05-214-3/+76
| |/ / | | | | | | | | | | | | | | | | | | | | | Apply changes made as part of I6019441c65b398376d84264f1e4c9776507533eb more widely. Bug: 15105787 Change-Id: I2e44487b1561dd564bfa41d65995a61091b011eb
* | | am 49c2fa00: Merge "Deprecate use of BrokenTest and SideEffect"Neil Fuller2014-05-2113-31/+16
|\ \ \ | |/ / | | | | | | | | | * commit '49c2fa00ff36308903f8021c56e608325f8c21ee': Deprecate use of BrokenTest and SideEffect