diff options
author | Adam Vartanian <flooey@google.com> | 2018-01-05 15:44:04 +0000 |
---|---|---|
committer | Adam Vartanian <flooey@google.com> | 2018-01-05 16:18:03 +0000 |
commit | 30039d1f025a4becfdbd97e4946f9cfa217a1a3f (patch) | |
tree | fb2c6315f9bd98cc4c7f53c3c0f6f7de0cf535ae /annotations/generate_annotated_java_files.py | |
parent | d356f1ff14b5250d09abc862ff07356eba8f6e1c (diff) |
Update tests for Conscrypt sync.
The latest sync of Conscrypt includes external copies of most of the
TLS tests in libcore, so delete the copies of those tests in libcore
as they're now redundant. The test cases left in libcore are only
those that test the behavior of the library classes themselves or test
the provider infrastructure in Android, rather than the behavior of
the security provider that provides the implementation of those
classes.
Checks done to ensure that the tests are actually duplicated:
- meld libcore/luni/src/test/java/libcore/javax/net/ssl/ external/conscrypt/openjdk-integ-tests/src/test/java/org/conscrypt/javax/net/ssl/
Ran the meld command before this CL and manually inspected the
difference in the test cases to ensure that all cases are covered.
- cat /usr/local/google/home/flooey/android/aosp-master/out/host/linux-x86/cts/android-cts/results/2018.01.05_12.08.52/test_result.xml | awk -F+ '/TestCase name="(com.android.org.conscrypt|libcore).javax.net.ssl/ {value = 1} value {print $0} /\/TestCase/ { value = 0 }'
Ran the above command before this CL and compared the executed test
cases. An annotated result is below. Lines marked < are test cases
only found in Conscrypt, > are cases only found in libcore.
DefaultHostnameVerifierTest:
> (All tests in DefaultHostnameVerifierTest, which is not being removed)
SSLEngineTest:
< <Test result="pass" name="test_SSLEngine_beginHandshake_redundantCalls" />
< <Test result="pass" name="test_SSLEngine_TlsUnique" />
*** New SSLEngine tests added to Conscrypt
SSLServerSocketTest:
> <Test result="pass" name="testToString" />
*** testToString tests the class behavior, not the provider
SSLSessionTest:
< <Test result="pass" name="test_SSLSession_getPeerCertificates_resumption" />
< <Test result="pass" name="test_SSLSession_valueIndependence" />
*** New SSLSession tests added to Conscrypt
SSLSocketFactoryTest:
> <Test result="pass" name="test_SSLSocketFactory_createSocket_withConsumedInputStream" />
*** Tests failure behavior of unimplemented-in-Android method on SSLSocketFactory
> <Test result="pass" name="test_SSLSocketFactory_getDefault_cacheInvalidate" />
*** Tests code that determines which provider provides the default SSLSocketFactory
SSLSocketTest:
< <Test result="pass" name="testClientMode_bothClient" />
< <Test result="pass" name="testClientMode_bothServer" />
< <Test result="pass" name="testClientMode_normal" />
< <Test result="pass" name="testClientMode_reverse" />
*** Replacements for test_SSLSocket_setUseClientMode below
< <Test result="pass" name="test_SSLSocket_TlsUnique" />
< <Test result="pass" name="test_SSLSocket_TlsUniqueLength" />
< <Test result="pass" name="test_SSLSocket_finalizeThrowsProperException" />
*** New SSLSocket tests added to Conscrypt
< <Test result="pass" name="test_SSLSocket_interrupt_readUnderlyingAndCloseUnderlying" />
< <Test result="pass" name="test_SSLSocket_interrupt_readUnderlyingAndCloseWrapper" />
< <Test result="pass" name="test_SSLSocket_interrupt_readWrapperAndCloseUnderlying" />
< <Test result="pass" name="test_SSLSocket_interrupt_readWrapperAndCloseWrapper" />
*** Replacements for test_SSLSocket_interrupt below
< <Test result="pass" name="test_SSLSocket_interrupt_read_withoutAutoClose" />
*** Renamed from test_SSLSocket_interrupt_read
> <Test result="pass" name="test_SSLSocket_interrupt" />
*** Replaced by the four test_SSLSocket_interrupt_read* test cases above
> <Test result="pass" name="test_SSLSocket_interrupt_read" />
*** Renamed to test_SSLSocket_interrupt_read_withoutAutoClose
> <Test result="pass" name="test_SSLSocket_setUseClientMode" />
*** Replaced by the four testClientMode_* test cases above
> <Test result="pass" name="test_SSLSocket_toString" />
*** testToString tests the class behavior, not the provider
Test: cts -m CtsLibcoreTestCases
Bug: 65476203
Change-Id: Ia4df30600262092cd5f5253008aecc0f8b1279ea
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions