andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only use test SslProviders that are supported in SslHandlerTest.testCompositeBufSizeEstimationGuaranteesSynchronousWrite().

Browse Source 
Motivation:

We need to ensure we only try to to test with the SslProviders that are supported when running the SslHandlerTest.testCompositeBufSizeEstimationGuaranteesSynchronousWrite test.

Modifications:

Skip SslProvider.OPENSSL* if not supported.

Result:

No more test-failures if openssl is not installed on the system.
This commit is contained in:
Norman Maurer 2017-04-20 15:42:50 +02:00
parent bf0beb772c
commit 4dd6c14ba2
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
handler/src/test/java/io/netty/handler/ssl/SslHandlerTest.java
View File

@ -571,13 +571,19 @@ public class SslHandlerTest {
throws CertificateException, SSLException, ExecutionException, InterruptedException {
SslProvider[] providers = SslProvider.values();
for (int i = 0; i < providers.length; ++i) {
for (int j = 0; j < providers.length; ++j) {
compositeBufSizeEstimationGuaranteesSynchronousWrite(providers[i], providers[j]);
SslProvider serverProvider = providers[i];
if (isSupported(serverProvider)) {
for (int j = 0; j < providers.length; ++j) {
SslProvider clientProvider = providers[j];
if (isSupported(clientProvider)) {
compositeBufSizeEstimationGuaranteesSynchronousWrite(serverProvider, clientProvider);
}
}
}
}
}
private void compositeBufSizeEstimationGuaranteesSynchronousWrite(
private static void compositeBufSizeEstimationGuaranteesSynchronousWrite(
SslProvider serverProvider, SslProvider clientProvider)
throws CertificateException, SSLException, ExecutionException, InterruptedException {
SelfSignedCertificate ssc = new SelfSignedCertificate();
@ -690,4 +696,14 @@ public class SslHandlerTest {
ssc.delete();
}
}
private static boolean isSupported(SslProvider provider) {
switch (provider) {
case OPENSSL:
case OPENSSL_REFCNT:
return OpenSsl.isAvailable();
default:
return true;
}
}
}