Skip to content

Commit

Permalink
Polish tests
Browse files Browse the repository at this point in the history
  • Loading branch information
izeye authored and rwinch committed Jan 8, 2019
1 parent 1a02caf commit c94f13a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package org.springframework.security.config;

import static org.assertj.core.api.Assertions.*;
import static org.junit.Assert.fail;

import org.junit.After;
import org.junit.Test;
Expand Down Expand Up @@ -57,14 +58,15 @@ public void authenticationProviderCannotAppearAtTopLevel() {
public void missingAuthenticationManagerGivesSensibleErrorMessage() {
try {
setContext("<http auto-config='true' />");
fail();
}
catch (BeanCreationException e) {
Throwable cause = ultimateCause(e);
assertThat(cause instanceof NoSuchBeanDefinitionException).isTrue();
NoSuchBeanDefinitionException nsbe = (NoSuchBeanDefinitionException) cause;
assertThat(nsbe.getBeanName()).isEqualTo(BeanIds.AUTHENTICATION_MANAGER);
assertThat(nsbe.getMessage().endsWith(
AuthenticationManagerFactoryBean.MISSING_BEAN_ERROR_MESSAGE));
assertThat(nsbe.getMessage()).endsWith(
AuthenticationManagerFactoryBean.MISSING_BEAN_ERROR_MESSAGE);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public void issuerWhenAllInformationThenSuccess() throws Exception {
@Test
public void issuerWhenContainsTrailingSlashThenSuccess() throws Exception {
assertThat(registration("")).isNotNull();
assertThat(this.issuer.endsWith("/")).isTrue();
assertThat(this.issuer).endsWith("/");
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public void issuerWhenContainsTrailingSlashThenSuccess() {
prepareOpenIdConfigurationResponse();
this.server.enqueue(new MockResponse().setBody(JWK_SET));
assertThat(JwtDecoders.fromOidcIssuerLocation(this.issuer)).isNotNull();
assertThat(this.issuer.endsWith("/")).isTrue();
assertThat(this.issuer).endsWith("/");
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public void cookieShouldBeCorrectlyEncodedAndDecoded() throws Exception {

String encoded = services.encodeCookie(cookie);
// '=' aren't allowed in version 0 cookies.
assertThat(encoded.endsWith("=")).isFalse();
assertThat(encoded).doesNotEndWith("=");
String[] decoded = services.decodeCookie(encoded);

assertThat(decoded).containsExactly("name:with:colon", "cookie", "tokens", "blah");
Expand Down

0 comments on commit c94f13a

Please sign in to comment.