Skip to content

Commit 9518047

Browse files
committed
Disable test when testing against WebSocket
1 parent 44e021e commit 9518047

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

src/test/java/com/rabbitmq/client/amqp/impl/TestUtils.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,18 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con
359359
}
360360
}
361361

362+
static class DisabledIfWebSocketCondition implements ExecutionCondition {
363+
364+
@Override
365+
public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
366+
if (useWebSocket()) {
367+
return ConditionEvaluationResult.disabled("Testing against WebSocket");
368+
} else {
369+
return ConditionEvaluationResult.enabled("Not testing against WebSocket");
370+
}
371+
}
372+
}
373+
362374
static class DisabledIfAddressV1PermittedCondition implements ExecutionCondition {
363375

364376
private static final String KEY = "addressV1Permitted";
@@ -500,6 +512,12 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con
500512
@ExtendWith(DisabledIfTlsNotEnabledCondition.class)
501513
public @interface DisabledIfTlsNotEnabled {}
502514

515+
@Target({ElementType.TYPE, ElementType.METHOD})
516+
@Retention(RetentionPolicy.RUNTIME)
517+
@Documented
518+
@ExtendWith(DisabledIfWebSocketCondition.class)
519+
public @interface DisabledIfWebSocket {}
520+
503521
@Target({ElementType.TYPE, ElementType.METHOD})
504522
@Retention(RetentionPolicy.RUNTIME)
505523
@Documented

src/test/java/com/rabbitmq/client/amqp/impl/TlsTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.rabbitmq.client.amqp.AmqpException.AmqpSecurityException;
2828
import com.rabbitmq.client.amqp.impl.TestUtils.DisabledIfAuthMechanismSslNotEnabled;
2929
import com.rabbitmq.client.amqp.impl.TestUtils.DisabledIfTlsNotEnabled;
30+
import com.rabbitmq.client.amqp.impl.TestUtils.DisabledIfWebSocket;
3031
import java.security.cert.X509Certificate;
3132
import java.util.UUID;
3233
import java.util.concurrent.CountDownLatch;
@@ -214,12 +215,13 @@ void hostnameVerificationShouldFailWhenSettingHostToLoopbackInterface() throws E
214215
}
215216

216217
@Test
218+
@DisabledIfWebSocket
217219
void connectToLoopbackInterfaceShouldWorkIfNoHostnameVerification() throws Exception {
218220
SSLContext sslContext = sslContext(trustManagerFactory(caCertificate()));
219221
try (Connection ignored =
220222
environment
221223
.connectionBuilder()
222-
.host("127.0.01")
224+
.host("127.0.0.1")
223225
.tls()
224226
.sslContext(sslContext)
225227
.hostnameVerification(false)

0 commit comments

Comments
 (0)