| 7b2c66b678a97d7d8b4c2ec918db17db2058e6d4 |
|
06-Jul-2017 |
Adam Vartanian <flooey@google.com> |
Streamline testInstall_compatibleContext()
Conscrypt is making ClientSessionContext#getSession() private since
users shouldn't be calling it, which causes this test to fail to build.
While this test uses it, in practice the only non-Conscrypt code it's
testing is SSLSessionCache#install(), the rest of it just tests that
Conscrypt works properly. We reduce the test to just a test of the
SSLSessionCache code, since Conscrypt's tests should suffice for testing
Conscrypt's use of the cache.
Test: adb shell am instrument -w -e class android.net.SSLSessionCacheTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Iea61c47eb2c002629dd2f50c81d5bc4f7221c654
/frameworks/base/core/tests/coretests/src/android/net/SSLSessionCacheTest.java
|
| 9df5d4f715f2ba5670753b78a236ff98eff34cfb |
|
06-Mar-2017 |
Paul Duffin <paulduffin@google.com> |
Replace usages of littlemock with mockito
Littlemock appears to have been created as an alternative to
Mockito that would work on Android. Given that Mockito does
now work on Android and Littlemock has had no activity since
Aug 2012 it seems prudent to switch over to use Mockito instead.
https://code.google.com/archive/p/littlemock/
This is being done as part of the work to upgrade Mockito.
Bug: 32912773
Test: Build and install affected APKs, test using am instrument
Change-Id: Id0e57880ea66c5681b664bbfb534c96410544665
/frameworks/base/core/tests/coretests/src/android/net/SSLSessionCacheTest.java
|
| d6b37fdf6c24321a87566ad4053dad5daa3a844a |
|
09-Sep-2013 |
Narayan Kamath <narayan@google.com> |
Allow SSL caches to be installed directly on SSLContexts.
This allows clients to enable ssl session caching without
having to use SSLCertificateSocketFactory.
Change-Id: Id63b8b31f51c96e73beefe9ecc5fd0cf0a1852c6
/frameworks/base/core/tests/coretests/src/android/net/SSLSessionCacheTest.java
|
| fdf4bbf2d0514f8ad56ebbf06b8ebdeebe1da82b |
|
09-Sep-2013 |
Narayan Kamath <narayan@google.com> |
Revert "Allow SSL caches to be installed directly on SSLContexts."
This reverts commit 25bef03cbf8d24c225b97202423dae75ed8b640f.
Breaks build with
cannot access com.android.org.conscrypt.SSLClientSessionCache
class file for com.android.org.conscrypt.SSLClientSessionCache not found
Change-Id: I6a89b45d5e8c7547778d7485ed02006cd4679989
/frameworks/base/core/tests/coretests/src/android/net/SSLSessionCacheTest.java
|
| 25bef03cbf8d24c225b97202423dae75ed8b640f |
|
06-Sep-2013 |
Narayan Kamath <narayan@google.com> |
Allow SSL caches to be installed directly on SSLContexts.
This allows clients to enable ssl session caching without
having to use SSLCertificateSocketFactory.
Change-Id: Ibfb4b99fa86bc0704674437d9b860531317d2bde
/frameworks/base/core/tests/coretests/src/android/net/SSLSessionCacheTest.java
|