This is an automated email from the ASF dual-hosted git repository. orudyy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit fd79bf6e0fc3914cf4689e9590647744d594b3fb Author: Alex Rudyy <[email protected]> AuthorDate: Tue Aug 20 14:55:41 2019 +0100 QPID-8350: [Tests][AMQP 1.0] Verify test assumptions --- .../tests/protocol/v1_0/transport/security/sasl/SaslTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/security/sasl/SaslTest.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/security/sasl/SaslTest.java index 0931b1b..eea2361 100644 --- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/security/sasl/SaslTest.java +++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/security/sasl/SaslTest.java @@ -64,7 +64,6 @@ public class SaslTest extends BrokerAdminUsingTestBase { assumeThat(getBrokerAdmin().isSASLSupported(), is(true)); assumeThat(getBrokerAdmin().isSASLMechanismSupported(PLAIN.toString()), is(true)); - assumeThat(getBrokerAdmin().isSASLMechanismSupported(CRAM_MD5.toString()), is(true)); _username = getBrokerAdmin().getValidUsername(); _password = getBrokerAdmin().getValidPassword(); } @@ -84,7 +83,7 @@ public class SaslTest extends BrokerAdminUsingTestBase assertThat(saslHeaderResponse, is(equalTo(SASL_AMQP_HEADER_BYTES))); SaslMechanisms saslMechanismsResponse = interaction.consumeResponse().getLatestResponse(SaslMechanisms.class); - assertThat(Arrays.asList(saslMechanismsResponse.getSaslServerMechanisms()), hasItem(PLAIN)); + assumeThat(Arrays.asList(saslMechanismsResponse.getSaslServerMechanisms()), hasItem(PLAIN)); final Binary initialResponse = new Binary(String.format("\0%s\0%s", _username, _password).getBytes(StandardCharsets.US_ASCII)); SaslOutcome saslOutcome = interaction.saslMechanism(PLAIN) @@ -130,7 +129,7 @@ public class SaslTest extends BrokerAdminUsingTestBase assertThat(saslHeaderResponse, is(equalTo(SASL_AMQP_HEADER_BYTES))); SaslMechanisms saslMechanismsResponse = interaction.consumeResponse().getLatestResponse(SaslMechanisms.class); - assertThat(Arrays.asList(saslMechanismsResponse.getSaslServerMechanisms()), hasItem(PLAIN)); + assumeThat(Arrays.asList(saslMechanismsResponse.getSaslServerMechanisms()), hasItem(PLAIN)); SaslOutcome saslOutcome = interaction.consumeResponse().getLatestResponse(SaslOutcome.class); assertThat(saslOutcome.getCode(), equalTo(SaslCode.OK)); @@ -148,6 +147,7 @@ public class SaslTest extends BrokerAdminUsingTestBase description = "SASL Negotiation [...] challenge/response step occurs once") public void saslSuccessfulAuthenticationWithChallengeResponse() throws Exception { + assumeThat(getBrokerAdmin().isSASLMechanismSupported(CRAM_MD5.toString()), is(true)); final InetSocketAddress addr = getBrokerAdmin().getBrokerAddress(BrokerAdmin.PortType.AMQP); try (FrameTransport transport = new FrameTransport(addr, true).connect()) { @@ -198,7 +198,7 @@ public class SaslTest extends BrokerAdminUsingTestBase assertThat(saslHeaderResponse, is(equalTo(SASL_AMQP_HEADER_BYTES))); SaslMechanisms saslMechanismsResponse = interaction.consumeResponse().getLatestResponse(SaslMechanisms.class); - assertThat(Arrays.asList(saslMechanismsResponse.getSaslServerMechanisms()), hasItem(PLAIN)); + assumeThat(Arrays.asList(saslMechanismsResponse.getSaslServerMechanisms()), hasItem(PLAIN)); final Binary initialResponse = new Binary(String.format("\0%s\0badpassword", _username).getBytes(StandardCharsets.US_ASCII)); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
