Add EnabledIf checks for ALPN tests

Author: davidh44

http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/NettyClientAlpnTest.java

@@ -61,6 +61,7 @@ public void alpnClientJdkProvider_serverWithAlpnSupport_requestSucceeds() throws
     }
 
     @Test
+    @EnabledIf("alpnSupported")
     public void alpnClientOpenSslProvider_serverWithAlpnSupport_requestSucceeds() throws Exception {
         initClient(ProtocolNegotiation.ALPN, SslProvider.OPENSSL);
         initServer(true);
@@ -86,6 +87,7 @@ public void priorKnowledgeClient_serverWithAlpnSupport_requestSucceeds() throws
     }
 
     @Test
+    @EnabledIf("alpnSupported")
     public void priorKnowledgeClient_serverWithoutAlpnSupport_requestSucceeds() throws Exception {
         initClient(ProtocolNegotiation.ASSUME_PROTOCOL, SslProvider.JDK);
         initServer(false);

services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/AbstractTestCase.java

@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.services.kinesis;
 
+import io.netty.handler.ssl.SslProvider;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -23,33 +24,21 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import software.amazon.awssdk.awscore.util.AwsHostNameUtils;
-import software.amazon.awssdk.http.Protocol;
-import software.amazon.awssdk.http.ProtocolNegotiation;
-import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
+import software.amazon.awssdk.http.nio.netty.internal.utils.NettyUtils;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.testutils.service.AwsTestBase;
 
 public class AbstractTestCase extends AwsTestBase {
     protected static KinesisClient client;
     protected static KinesisAsyncClient asyncClient;
-    protected static KinesisAsyncClient asyncClientAlpn;
 
     @BeforeAll
     public static void init() throws IOException {
         setUpCredentials();
         KinesisClientBuilder builder = KinesisClient.builder().credentialsProvider(CREDENTIALS_PROVIDER_CHAIN);
         setEndpoint(builder);
         client = builder.build();
-        asyncClient = KinesisAsyncClient.builder()
-                                        .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
-                                        .build();
-        asyncClientAlpn = KinesisAsyncClient.builder()
-                                            .httpClient(NettyNioAsyncHttpClient.builder()
-                                                                               .protocol(Protocol.HTTP2)
-                                                                               .protocolNegotiation(ProtocolNegotiation.ALPN)
-                                                                               .build())
-                                            .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
-                                            .build();
+        asyncClient = kinesisAsyncClientBuilder().build();
     }
 
     @AfterAll
@@ -58,6 +47,14 @@ public static void cleanUp() {
         asyncClient.close();
     }
 
+    protected static KinesisAsyncClientBuilder kinesisAsyncClientBuilder() {
+        return KinesisAsyncClient.builder().credentialsProvider(CREDENTIALS_PROVIDER_CHAIN);
+    }
+
+    protected static boolean alpnSupported(){
+        return NettyUtils.isAlpnSupported(SslProvider.JDK);
+    }
+
     private static void setEndpoint(KinesisClientBuilder builder) throws IOException {
         File endpointOverrides = new File(
             new File(System.getProperty("user.home")),

services/kinesis/src/it/java/software/amazon/awssdk/services/kinesis/KinesisResponseMetadataIntegrationTest.java

@@ -18,6 +18,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
+import software.amazon.awssdk.http.Protocol;
+import software.amazon.awssdk.http.ProtocolNegotiation;
+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
 import software.amazon.awssdk.services.kinesis.model.DescribeLimitsResponse;
 import software.amazon.awssdk.services.kinesis.model.KinesisResponse;
 
@@ -36,7 +40,13 @@ public void async_shouldContainResponseMetadata() {
     }
 
     @Test
+    @EnabledIf("alpnSupported")
     public void asyncAlpn_shouldContainResponseMetadata() {
+        KinesisAsyncClient asyncClientAlpn = kinesisAsyncClientBuilder().httpClient(NettyNioAsyncHttpClient.builder()
+                                                                                                           .protocol(Protocol.HTTP2)
+                                                                                                           .protocolNegotiation(ProtocolNegotiation.ALPN)
+                                                                                                           .build())
+                                                                        .build();
         DescribeLimitsResponse response = asyncClientAlpn.describeLimits().join();
         verifyResponseMetadata(response);
     }