summaryrefslogtreecommitdiffstats
path: root/support/src/test/java
Commit message (Collapse)AuthorAgeFilesLines
* SSLEngineTest: position should be same as produced/consumedKenny Root2015-01-071-3/+11
| | | | | | | | The position of the buffer should match the number of bytes produced or consumed. Make sure all the tests have this condition on the handshake. Bug: 18921387 Change-Id: I8d248b2ac189d801586510fb5aca2e3bd6701ffe
* Repurpose "HexEncoding" for internal users.Narayan Kamath2014-12-163-97/+4
| | | | | | | | | Frameworks callers either roll their own or use an internal apache class. Given that apache is going away, we need to provide them with an alternative. bug: 18027885 Change-Id: Iec01cba9f3d2027828457c0b450eac0dd08fcaf6
* Get rid of Support_Configuration.SpecialInetTestAddress ...Narayan Kamath2014-12-041-359/+14
| | | | | | | ... aka. "www.google.com" and lots of other unused support configuration values. Change-Id: I07f07d656e77317a50ac54dda07f493437c15e58
* Fix URLConnectionTest for devices without full internet access.Aaron Whyte2014-11-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | This removes two bad tests that are covered elsewhere, using mocks. test_getContentEncoding() was hitting http://www.amazon.com, to see if a URLConnection getter was working. That getter is now tested in libcore/luni/src/test/java/libcore/java/net/URLConnectionTest.java, in testClientConfiguredGzipContentEncoding(). test_getLastModified() was hitting http://www.php.net/manual/en/function.explode.php, to see if getHeaderFieldDate was working for Last-Modified. That getter is better tested in test_getHeaderFieldDateLjava_lang_StringJ(), in the same file. Bug:18480776 (cherry picked from commit 939e6a1aceff448445928ad5d815479e84e84383) Change-Id: Ia01fd59809683317271017364179e1843c149e65
* Assert finite default timeout for TLS/SSL sessions.Alex Klyubin2014-11-241-1/+2
| | | | | | | | | This makes CTS tests expect 8 hours as the default timeout for TLS/SSL sessions. Prior to this change, sessions were expected to not time out by default. Bug: 18370076 Change-Id: I09ae9ee91df2fb4bb2e8cc812127dc9f05a14696
* Merge "Fix SSLContextTest.test_SSLContext_defaultConfiguration failure"Alex Klyubin2014-11-183-241/+255
|\
| * Fix SSLContextTest.test_SSLContext_defaultConfiguration failureAlex Klyubin2014-11-183-241/+255
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was failing because it assumed that all SSLContext instances have the same set of TLS protocol versions enabled. The fix refactored SSLDefaultConfigurationAsserts class into SSLConfigurationAsserts class. The main difference is that the new class has wider scope: it can assert that (1) the default configuration of TLS/SSL primitives is as expected -- exactly what the old SSLDefaultConfigurationAsserts class offered, and (2) that TLS/SSL primitives are configured the same as a provided SSLContext. Assertions about the default configuration of primitives other than SSLContext are now implemented by asserting that these primitives are configured exactly like the default SSLContext. Change-Id: I52d6514768c4053054df2cf79e7182d8fd87bfe2
* | Adjust tests for removal of DSS TLS/SSL cipher suites.Alex Klyubin2014-11-171-11/+11
|/ | | | | | | | This is in preparation for migration from OpenSSL to BoringSSL. BoringSSL does not support DSS. Bug: 17409664 Change-Id: I6b2ac5f7c7b9c41416650cdbdce2deed03372f49
* Basic library for parsing TLS/SSL ClientHellos in tests.Alex Klyubin2014-11-1211-0/+1194
| | | | | | | | | | | | | | | | | CTS tests in libcore assert certain properties of TLS/SSL and HTTPS stacks, but they do not check whether these are correctly reflected in the underlying TLS/SSL traffic generated by these stacks. This basic TLS wire-protocol library will enable CTS tests to inspect in detail ClientHello messages, such as which protocol is being signalled as the higest supported by the client, which cipher suites are enabled, whether SNI extension is provided and set to the correct value. As an example, in this CL I switched one test in SSLSocketTest to this library. Change-Id: I93251dd873a78ec7f6caa704b71f5fa0ecf2c2f2
* Fix OldSocketTest#test_connectLjava_net_SocketAddressI.Elliott Hughes2014-11-112-16/+15
| | | | | | | Use the same address as StuckServer. Bug: 18143878 Change-Id: I3759776ed3a9d46175c4b987fa0c47b27033441d
* am d4d881ff: Merge "SSLSocket: track update to TLS defaults"Kenny Root2014-11-041-6/+8
|\ | | | | | | | | * commit 'd4d881ff8989346583de40c49519f83b4b51d160': SSLSocket: track update to TLS defaults
| * SSLSocket: track update to TLS defaultsKenny Root2014-11-031-6/+8
| | | | | | | | | | | | | | SSLv3 is no longer in the default list. Bug: 17136008 Change-Id: I4092e17f79c29d10d11ffe01d130d0d03cd2215f
* | am 140f3a33: Merge "SSLSocket: document current behavior with SSLContext"Kenny Root2014-11-041-0/+50
|\ \ | |/ | | | | | | * commit '140f3a336ff5383b3462a720786143f3dda347bf': SSLSocket: document current behavior with SSLContext
| * SSLSocket: document current behavior with SSLContextKenny Root2014-11-031-0/+50
| | | | | | | | | | | | | | | | Currently Android does not pay attention to the algorithm choice, so use this test as documentation of that. Bug: 17136008 Change-Id: If8e516be48721bf65a98f22a9cdf02eded8f6375
| * Add support for TLS_FALLBACK_SCSVKenny Root2014-10-221-0/+12
| | | | | | | | | | | | | | Bug: 17750026 (cherry picked from commit e6a6e935e98f426c7000b2bf4086f87101f4441c) Change-Id: Ia7f0714157b0dc36579122b27eb921a54f3a6818
* | Add support for TLS_FALLBACK_SCSVKenny Root2014-10-061-0/+12
| | | | | | | | | | Bug: 17750026 Change-Id: I8dec89ae59a6f745f63120b11b4f6dbe9b21a139
* | am 9a497b6d: Merge "Fix UnmodifiableEntrySet.toArray() ordering"Neil Fuller2014-07-172-161/+191
|\ \ | |/ | | | | | | * commit '9a497b6d3b95d774f28f0203409ce6ebf6cb1241': Fix UnmodifiableEntrySet.toArray() ordering
| * Merge "Fix UnmodifiableEntrySet.toArray() ordering"Neil Fuller2014-07-172-161/+191
| |\
| | * Fix UnmodifiableEntrySet.toArray() orderingNeil Fuller2014-06-232-161/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | toArray() was returning entries in reverse order. toArray(T[]) was correct. Thanks to Chris Povirk for discovering. The fix is simple. Change includes additional tests to avoid regressions. Test & support code has been cleaned up a little to improve coverage and make it (slightly) less horrible. Bug: https://code.google.com/p/android/issues/detail?id=72073 Change-Id: I42ff90e0f592482289cd0cd9fdbdaabf0c17ad93
* | | am ea43fa14: Merge "TLS-PSK cipher suites enabled when PSKKeyManager is ↵Alex Klyubin2014-07-151-0/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | provided." * commit 'ea43fa1424058748e3ec4ac01d2f6e1898e9a4e3': TLS-PSK cipher suites enabled when PSKKeyManager is provided.
| * | TLS-PSK cipher suites enabled when PSKKeyManager is provided.Alex Klyubin2014-07-141-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | This documents and tests that TLS-PSK cipher suites are enabled if a PSKKeyManager is provided to SSLContext during its initialization. Bug: 15073623 Change-Id: I8e2bc3e7a1ea8a986e468973b6bad19dc6b7bc3c
| * | RemoveBrian Carlstrom2014-07-072-109/+9
| | | | | | | | | | | | | | | | | | (cherry picked from commit 36214feb86a0963b23f34c8c63584252bd757e19) Change-Id: I96d5109c01e39255b9970f7a515ddd3575a50e56
* | | RemoveBrian Carlstrom2014-07-072-109/+9
| | | | | | | | | | | | Change-Id: I143d0b26b116e75892223e74b6c22b6c8db05466
* | | am 33c1c8c3: am e0affcdc: Merge "Assert the updated list of supported ↵Alex Klyubin2014-06-191-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ECDHE-PSK cipher suites." * commit '33c1c8c36c62c1238876bddf916bdf92a5654543': Assert the updated list of supported ECDHE-PSK cipher suites.
| * \ \ am e0affcdc: Merge "Assert the updated list of supported ECDHE-PSK cipher ↵Alex Klyubin2014-06-191-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | suites." * commit 'e0affcdc8c4513d91352c0fc6f4c5c29b0605d2d': Assert the updated list of supported ECDHE-PSK cipher suites.
| | * | Assert the updated list of supported ECDHE-PSK cipher suites.Alex Klyubin2014-06-041-2/+2
| | |/ | | | | | | | | | | | | Bug: 15073623 Change-Id: I427c99f4c1c72690d95e5a3c63763631c41ddae2
* | | am c0a8f479: am 9adf681e: am 4352ab40: Merge "Document and assert support ↵Alex Klyubin2014-05-292-4/+37
|\ \ \ | |/ / | | | | | | | | | | | | | | | for TLS-PSK cipher suites." * commit 'c0a8f479a47de31427211ea7952b3b92c0c650c2': Document and assert support for TLS-PSK cipher suites.
| * | am 9adf681e: am 4352ab40: Merge "Document and assert support for TLS-PSK ↵Alex Klyubin2014-05-292-4/+37
| |\ \ | | |/ | | | | | | | | | | | | | | | cipher suites." * commit '9adf681eb5691afe6f82b67768b3a7fca592251a': Document and assert support for TLS-PSK cipher suites.
| | * Merge "Document and assert support for TLS-PSK cipher suites."Alex Klyubin2014-05-292-4/+37
| | |\
| | | * Document and assert support for TLS-PSK cipher suites.Alex Klyubin2014-05-272-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 dacb4741: am c0d465fd: am 6c16a47c: Merge "Simplify assertions about ↵Alex Klyubin2014-05-282-78/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | SSLEngine." * commit 'dacb4741098f7976a94b3cc55aedb662ca126f04': Simplify assertions about SSLEngine.
| * | | am c0d465fd: am 6c16a47c: Merge "Simplify assertions about SSLEngine."Alex Klyubin2014-05-282-78/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'c0d465fdd5165ecf8162cde686fa858a581eca5d': Simplify assertions about SSLEngine.
| | * | Simplify assertions about SSLEngine.Alex Klyubin2014-05-232-78/+6
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Now that the default SSLEngine implementation is backed by the same OpenSSL stack as the default SSLSocket implementation, the sets of supported/enabled cipher suites and protocols should remain the same between SSLEngine and SSLSocket. Change-Id: I1ed88f39b07950e5d8b6e2fc7d6482a034626de3
* | | am 4cd96cc5: am 5c6ea6f6: am c7743447: Merge "Enlarge the minimum key size ↵Kenny Root2014-05-131-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | of RSA to enhance the security" * commit '4cd96cc5ac73be05b2397d0b97c4c99bc07012ff': Enlarge the minimum key size of RSA to enhance the security
| * | am 5c6ea6f6: am c7743447: Merge "Enlarge the minimum key size of RSA to ↵Kenny Root2014-05-131-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | enhance the security" * commit '5c6ea6f61facd19fdcc2372b710fb8fb23905032': Enlarge the minimum key size of RSA to enhance the security
| | * Enlarge the minimum key size of RSA to enhance the securityDanielMo2014-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have modified OpenSSL source code such that size of RSA key should be at least 512 bits or more to support higher quality key generation as lower key sizes are vulnerable to attack. Thus we need to increase the size to 512 to avoid CTS failures, please refer to it also. https://code.google.com/p/android/issues/detail?id=66394 Change-Id: I95d734033227ed1497a5bc0fd0010f62b12c01c5 Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
* | | am 0d6d3292: am 6005b896: am 4abcf7ad: Merge changes Iaaafcbed,Ifbca5637Kenny Root2014-05-081-4/+17
|\ \ \ | |/ / | | | | | | | | | | | | * commit '0d6d32920134aa84e55fab59b6bd3a71c7bcb38f': KeyStoreTest: add more key types KeyManagerFactoryTest: add all the possible key types
| * | am 6005b896: am 4abcf7ad: Merge changes Iaaafcbed,Ifbca5637Kenny Root2014-05-081-4/+17
| |\ \ | | |/ | | | | | | | | | | | | * commit '6005b896b58659f8c2e0693bd9ead32706a05044': KeyStoreTest: add more key types KeyManagerFactoryTest: add all the possible key types
| | * KeyManagerFactoryTest: add all the possible key typesKenny Root2014-05-071-4/+17
| | | | | | | | | | | | | | | | | | | | | This adds all the possible key types from the Standard Names document to the tests. Change-Id: Ifbca56371261c040c3cb9e0d80447e9cb73cad0f
* | | am c3eed594: am f6696d69: am eec4356c: Merge "Improve detection of ↵Paul Duffin2014-05-021-68/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | CloseGuard protected resource leakage" * commit 'c3eed594ffd6b488b5771cd1e6a9a4c44aa0826b': Improve detection of CloseGuard protected resource leakage
| * | am f6696d69: am eec4356c: Merge "Improve detection of CloseGuard protected ↵Paul Duffin2014-05-021-68/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | resource leakage" * commit 'f6696d69727e1089f5608b0c3772ced3c347df7e': Improve detection of CloseGuard protected resource leakage
| | * Improve detection of CloseGuard protected resource leakagePaul Duffin2014-05-011-68/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add CloseGuardMonitor to intercept and collate CloseGuard reports and if necessary throw an exception listing the resource leaks. * Add ResourceLeakageDetector to abstract away the CloseGuardMonitor which will not work on RI. * Add AbstractResourceLeakageDetectorTestCase as a base class for tests that need to detect resource leaks, in future this could be handled by modifications to Cts and Vogar test runners. * Remove CloseGuardTester and its sole usage in ProcessBuilderTest. * Remove CloseGuardGuard from within URLConnectionTest * Change ZipFileTest, ProcessBuilderTest, URLConnectionTest to use new mechanism, fix issues that are identified and do some cleanup/remove duplicated code. Bug: https://code.google.com/p/android/issues/detail?id=66383 Change-Id: Id026dbb6bc66091a15f07329e6371cd0d1f32cf5
* | | resolved conflicts for merge of 9687e46b to masterKenny Root2014-04-302-0/+0
|\ \ \ | |/ / | | | | | | Change-Id: Iaeaea9b44423257e8ccbcf631f40720d3035cecd
| * | am 42db8377: am 15e6f173: am d353b8e2: am ddc91700: am 0a0379d4: am ↵Kenny Root2014-04-302-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 297a7de2: am 183efbb4: am 4629f94a: am e0350a80: am afd7d947: Merge "JarFile: make test chain 3 long" into jb-dev * commit '42db8377fdd20cdff6cac1994b25382551270a26': JarFile: make test chain 3 long
| | * \ am 15e6f173: am d353b8e2: am ddc91700: am 0a0379d4: am 297a7de2: am ↵Kenny Root2014-04-302-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 183efbb4: am 4629f94a: am e0350a80: am afd7d947: Merge "JarFile: make test chain 3 long" into jb-dev * commit '15e6f173de11133e1a61090635e350303ac0481a': JarFile: make test chain 3 long
| | | * \ am d353b8e2: am ddc91700: am 0a0379d4: am 297a7de2: am 183efbb4: am ↵Kenny Root2014-04-302-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4629f94a: am e0350a80: am afd7d947: Merge "JarFile: make test chain 3 long" into jb-dev * commit 'd353b8e2dbcdbd23e59a4a3e1460c88c33640044': JarFile: make test chain 3 long
| | | | * \ am ddc91700: am 0a0379d4: am 297a7de2: am 183efbb4: am 4629f94a: am ↵Kenny Root2014-04-302-0/+0
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0350a80: am afd7d947: Merge "JarFile: make test chain 3 long" into jb-dev * commit 'ddc91700a5bed8e2b7214d6ca1e317929e378bc7': JarFile: make test chain 3 long
| | | | | * \ am 0a0379d4: am 297a7de2: am 183efbb4: am 4629f94a: am e0350a80: am ↵Kenny Root2014-04-302-0/+0
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afd7d947: Merge "JarFile: make test chain 3 long" into jb-dev * commit '0a0379d45726c4cac1505167095d763068f900ae': JarFile: make test chain 3 long
| | | | | | * \ am 297a7de2: am 183efbb4: am 4629f94a: am e0350a80: am afd7d947: Merge ↵Kenny Root2014-04-302-0/+0
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "JarFile: make test chain 3 long" into jb-dev * commit '297a7de2a15cae179d6713182641bddfdf89f397': JarFile: make test chain 3 long
| | | | | | | * \ am e0350a80: am afd7d947: Merge "JarFile: make test chain 3 long" into jb-devKenny Root2014-04-302-0/+0
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0350a80cbcce86445c29c043ab5be3b46e28181': JarFile: make test chain 3 long