Skip to content

Commit 57e7893

Browse files
committed
Re-enable SSL integration tests
Re-enable all SSL integration tests on both Cassandra and Scylla. Refs #96.
1 parent a8598b7 commit 57e7893

File tree

5 files changed

+6
-24
lines changed

5 files changed

+6
-24
lines changed

driver-core/src/test/java/com/datastax/driver/core/Jdk8SSLEncryptionTest.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,7 @@ public class Jdk8SSLEncryptionTest extends SSLTestBase {
6262
* @jira_ticket JAVA-1364
6363
* @since 3.2.0
6464
*/
65-
@Test(
66-
groups = "short",
67-
dataProvider = "sslImplementation",
68-
dataProviderClass = SSLTestBase.class,
69-
enabled = false /* @IntegrationTestDisabledNettyFailure @IntegrationTestDisabledSSL */)
65+
@Test(groups = "short", dataProvider = "sslImplementation", dataProviderClass = SSLTestBase.class)
7066
public void should_pass_peer_address_to_engine(SslImplementation sslImplementation)
7167
throws Exception {
7268
String expectedPeerHost = TestUtils.IP_PREFIX + "1";

driver-core/src/test/java/com/datastax/driver/core/NettyOptionsTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ public void should_invoke_netty_options_hooks_single_node() throws Exception {
5454
}
5555

5656
@CCMConfig(numberOfNodes = 3)
57-
@Test(
58-
groups = "short",
59-
enabled = false /* @IntegrationTestDisabledNettyFailure @IntegrationTestDisabledSSL */)
57+
@Test(groups = "short")
6058
public void should_invoke_netty_options_hooks_multi_node() throws Exception {
6159
should_invoke_netty_options_hooks(3, 4);
6260
}

driver-core/src/test/java/com/datastax/driver/core/SSLAuthenticatedEncryptionTest.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ public class SSLAuthenticatedEncryptionTest extends SSLTestBase {
4040
* @expected_result Connection can be established to a cassandra node using SSL that requires
4141
* client auth.
4242
*/
43-
@Test(
44-
groups = "short",
45-
dataProvider = "sslImplementation",
46-
dataProviderClass = SSLTestBase.class,
47-
enabled = false /* @IntegrationTestDisabledNettyFailure @IntegrationTestDisabledSSL */)
43+
@Test(groups = "short", dataProvider = "sslImplementation", dataProviderClass = SSLTestBase.class)
4844
public void should_connect_with_ssl_with_client_auth_and_node_requires_auth(
4945
SslImplementation sslImplementation) throws Exception {
5046
connectWithSSLOptions(getSSLOptions(sslImplementation, true, true));
@@ -62,8 +58,7 @@ public void should_connect_with_ssl_with_client_auth_and_node_requires_auth(
6258
groups = "short",
6359
dataProvider = "sslImplementation",
6460
dataProviderClass = SSLTestBase.class,
65-
expectedExceptions = {NoHostAvailableException.class},
66-
enabled = false /* @IntegrationTestDisabledNettyFailure @IntegrationTestDisabledSSL */)
61+
expectedExceptions = {NoHostAvailableException.class})
6762
public void should_not_connect_without_client_auth_but_node_requires_auth(
6863
SslImplementation sslImplementation) throws Exception {
6964
connectWithSSLOptions(getSSLOptions(sslImplementation, false, true));

driver-core/src/test/java/com/datastax/driver/core/SSLEncryptionTest.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,7 @@ public class SSLEncryptionTest extends SSLTestBase {
4141
* @test_category connection:ssl
4242
* @expected_result Connection can be established to a cassandra node using SSL.
4343
*/
44-
@Test(
45-
groups = "short",
46-
dataProvider = "sslImplementation",
47-
dataProviderClass = SSLTestBase.class,
48-
enabled = false /* @IntegrationTestDisabledNettyFailure @IntegrationTestDisabledSSL */)
44+
@Test(groups = "short", dataProvider = "sslImplementation", dataProviderClass = SSLTestBase.class)
4945
public void should_connect_with_ssl_without_client_auth_and_node_doesnt_require_auth(
5046
SslImplementation sslImplementation) throws Exception {
5147
connectWithSSLOptions(getSSLOptions(sslImplementation, false, true));
@@ -63,8 +59,7 @@ public void should_connect_with_ssl_without_client_auth_and_node_doesnt_require_
6359
groups = "short",
6460
dataProvider = "sslImplementation",
6561
dataProviderClass = SSLTestBase.class,
66-
expectedExceptions = {NoHostAvailableException.class},
67-
enabled = false /* @IntegrationTestDisabledNettyFailure @IntegrationTestDisabledSSL */)
62+
expectedExceptions = {NoHostAvailableException.class})
6863
public void should_not_connect_with_ssl_without_trusting_server_cert(
6964
SslImplementation sslImplementation) throws Exception {
7065
connectWithSSLOptions(getSSLOptions(sslImplementation, false, false));

driver-core/src/test/java/com/datastax/driver/core/SSLTestBase.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import static io.netty.handler.ssl.SslProvider.OPENSSL;
2727
import static org.assertj.core.api.Assertions.fail;
2828

29-
import com.datastax.driver.core.utils.ScyllaSkip;
3029
import io.netty.handler.ssl.SslContextBuilder;
3130
import java.security.KeyStore;
3231
import java.security.SecureRandom;
@@ -35,7 +34,6 @@
3534
import javax.net.ssl.TrustManagerFactory;
3635
import org.testng.annotations.DataProvider;
3736

38-
@ScyllaSkip /* @IntegrationTestDisabledScyllaUnsupportedFunctionality @IntegrationTestDisabledSSL */
3937
@CCMConfig(ssl = true, createCluster = false)
4038
public abstract class SSLTestBase extends CCMTestsSupport {
4139

0 commit comments

Comments
 (0)