Skip to content

Commit 53f0167

Browse files
committed
Re-enable a few SSL integration tests
Re-enable a few SSL integration tests that now started passing after changes in previous commits. The only tests that are still disabled are the ones that use "withSslLocalhostCn".
1 parent 77bbda2 commit 53f0167

File tree

4 files changed

+0
-10
lines changed

4 files changed

+0
-10
lines changed

integration-tests/src/test/java/com/datastax/oss/driver/core/ssl/DefaultSslEngineFactoryIT.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,13 @@
3030
import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
3131
import com.datastax.oss.driver.internal.core.ssl.DefaultSslEngineFactory;
3232
import org.junit.ClassRule;
33-
import org.junit.Ignore;
3433
import org.junit.Test;
3534

3635
public class DefaultSslEngineFactoryIT {
3736

3837
@ClassRule public static final CustomCcmRule CCM_RULE = CustomCcmRule.builder().withSsl().build();
3938

4039
@Test
41-
@Ignore("@IntegrationTestDisabledCassandra3Failure @IntegrationTestDisabledSSL")
4240
public void should_connect_with_ssl() {
4341
DriverConfigLoader loader =
4442
SessionUtils.configLoaderBuilder()
@@ -89,7 +87,6 @@ public void should_not_connect_if_truststore_not_provided() {
8987
}
9088

9189
@Test(expected = AllNodesFailedException.class)
92-
@Ignore("@IntegrationTestDisabledCassandra3Failure @IntegrationTestDisabledSSL")
9390
public void should_not_connect_if_not_using_ssl() {
9491
try (CqlSession session = SessionUtils.newSession(CCM_RULE)) {
9592
session.execute("select * from system.local");

integration-tests/src/test/java/com/datastax/oss/driver/core/ssl/DefaultSslEngineFactoryPropertyBasedWithClientAuthIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import com.datastax.oss.driver.categories.IsolatedTests;
3131
import com.datastax.oss.driver.internal.core.ssl.DefaultSslEngineFactory;
3232
import org.junit.ClassRule;
33-
import org.junit.Ignore;
3433
import org.junit.Test;
3534
import org.junit.experimental.categories.Category;
3635

@@ -41,7 +40,6 @@ public class DefaultSslEngineFactoryPropertyBasedWithClientAuthIT {
4140
public static final CustomCcmRule CCM_RULE = CustomCcmRule.builder().withSslAuth().build();
4241

4342
@Test
44-
@Ignore("@IntegrationTestDisabledCassandra3Failure @IntegrationTestDisabledSSL")
4543
public void should_connect_with_ssl_using_client_auth() {
4644
System.setProperty(
4745
"javax.net.ssl.keyStore", CcmBridge.DEFAULT_CLIENT_KEYSTORE_FILE.getAbsolutePath());

integration-tests/src/test/java/com/datastax/oss/driver/core/ssl/DefaultSslEngineFactoryWithClientAuthIT.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import com.datastax.oss.driver.api.testinfra.session.SessionUtils;
3131
import com.datastax.oss.driver.internal.core.ssl.DefaultSslEngineFactory;
3232
import org.junit.ClassRule;
33-
import org.junit.Ignore;
3433
import org.junit.Test;
3534

3635
public class DefaultSslEngineFactoryWithClientAuthIT {
@@ -39,7 +38,6 @@ public class DefaultSslEngineFactoryWithClientAuthIT {
3938
public static final CustomCcmRule CCM_RULE = CustomCcmRule.builder().withSslAuth().build();
4039

4140
@Test
42-
@Ignore("@IntegrationTestDisabledCassandra3Failure @IntegrationTestDisabledSSL")
4341
public void should_connect_with_ssl_using_client_auth() {
4442
DriverConfigLoader loader =
4543
SessionUtils.configLoaderBuilder()

integration-tests/src/test/java/com/datastax/oss/driver/core/ssl/ProgrammaticSslIT.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,13 @@
3636
import javax.net.ssl.SSLContext;
3737
import javax.net.ssl.TrustManagerFactory;
3838
import org.junit.ClassRule;
39-
import org.junit.Ignore;
4039
import org.junit.Test;
4140

4241
public class ProgrammaticSslIT {
4342

4443
@ClassRule public static final CustomCcmRule CCM_RULE = CustomCcmRule.builder().withSsl().build();
4544

4645
@Test
47-
@Ignore("@IntegrationTestDisabledCassandra3Failure @IntegrationTestDisabledSSL")
4846
public void should_connect_with_programmatic_factory() {
4947
SslEngineFactory factory = new ProgrammaticSslEngineFactory(createSslContext());
5048
try (CqlSession session =
@@ -58,7 +56,6 @@ public void should_connect_with_programmatic_factory() {
5856
}
5957

6058
@Test
61-
@Ignore("@IntegrationTestDisabledCassandra3Failure @IntegrationTestDisabledSSL")
6259
public void should_connect_with_programmatic_ssl_context() {
6360
SSLContext sslContext = createSslContext();
6461
try (CqlSession session =

0 commit comments

Comments
 (0)