Run token expiration test only on RabbitMQ 4.1+

Author: acogoluegnes

.github/workflows/test-pr.yml

@@ -24,8 +24,6 @@ jobs:
           cache: 'maven'
       - name: Start broker
         run: ci/start-broker.sh
-        env:
-          RABBITMQ_IMAGE: 'pivotalrabbitmq/rabbitmq:main'
       - name: Start toxiproxy
         run: ci/start-toxiproxy.sh
       - name: Display Java version

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

@@ -18,13 +18,15 @@
 package com.rabbitmq.client.amqp.impl;
 
 import static com.rabbitmq.client.amqp.impl.Assertions.assertThat;
+import static com.rabbitmq.client.amqp.impl.TestConditions.BrokerVersion.RABBITMQ_4_1_0;
 import static com.rabbitmq.client.amqp.impl.TestUtils.*;
 import static java.lang.System.currentTimeMillis;
 import static java.time.Duration.ofMillis;
 import static java.time.Duration.ofSeconds;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.rabbitmq.client.amqp.*;
+import com.rabbitmq.client.amqp.impl.TestConditions.BrokerVersionAtLeast;
 import com.rabbitmq.client.amqp.impl.TestUtils.DisabledIfOauth2AuthBackendNotEnabled;
 import com.rabbitmq.client.amqp.impl.TestUtils.Sync;
 import java.time.Duration;
@@ -48,22 +50,23 @@ public class Oauth2Test {
   Environment environment;
 
   @Test
-  void expiredTokenShouldFail() throws Exception {
+  void expiredTokenShouldFail() throws JoseException {
     String expiredToken = token(currentTimeMillis() - 1000);
     assertThatThrownBy(
             () -> environment.connectionBuilder().username("").password(expiredToken).build())
         .isInstanceOf(AmqpException.AmqpSecurityException.class);
   }
 
   @Test
-  void validTokenShouldSucceed() throws Exception {
+  void validTokenShouldSucceed() throws JoseException {
     String validToken = token(currentTimeMillis() + Duration.ofMinutes(10).toMillis());
     try (Connection ignored =
         environment.connectionBuilder().username("").password(validToken).build()) {}
   }
 
   @Test
-  void connectionShouldBeClosedWhenTokenExpires(TestInfo info) throws Exception {
+  @BrokerVersionAtLeast(RABBITMQ_4_1_0)
+  void connectionShouldBeClosedWhenTokenExpires(TestInfo info) throws JoseException {
     String q = TestUtils.name(info);
     long expiry = currentTimeMillis() + ofSeconds(2).toMillis();
     String token = token(expiry);