Browse Source

Update JwtDecoders tests

Issue gh-7860
pull/8028/head
Josh Cummings 6 years ago
parent
commit
283e451cad
No known key found for this signature in database
GPG Key ID: 49EF60DD7FF83443
  1. 15
      oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtDecodersTests.java
  2. 15
      oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/ReactiveJwtDecodersTests.java

15
oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/JwtDecodersTests.java

@ -20,6 +20,10 @@ import java.util.HashMap; @@ -20,6 +20,10 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import okhttp3.HttpUrl;
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;
@ -33,11 +37,6 @@ import org.springframework.http.HttpHeaders; @@ -33,11 +37,6 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.web.util.UriComponentsBuilder;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
@ -102,7 +101,7 @@ public class JwtDecodersTests { @@ -102,7 +101,7 @@ public class JwtDecodersTests {
JwtDecoder decoder = JwtDecoders.fromOidcIssuerLocation(this.issuer);
assertThatCode(() -> decoder.decode(ISSUER_MISMATCH))
.isInstanceOf(JwtValidationException.class)
.hasMessageContaining("This iss claim is not equal to the configured issuer");
.hasMessageContaining("The iss claim is not valid");
}
@Test
@ -111,7 +110,7 @@ public class JwtDecodersTests { @@ -111,7 +110,7 @@ public class JwtDecodersTests {
JwtDecoder decoder = JwtDecoders.fromIssuerLocation(this.issuer);
assertThatCode(() -> decoder.decode(ISSUER_MISMATCH))
.isInstanceOf(JwtValidationException.class)
.hasMessageContaining("This iss claim is not equal to the configured issuer");
.hasMessageContaining("The iss claim is not valid");
}
@Test
@ -120,7 +119,7 @@ public class JwtDecodersTests { @@ -120,7 +119,7 @@ public class JwtDecodersTests {
JwtDecoder decoder = JwtDecoders.fromIssuerLocation(this.issuer);
assertThatCode(() -> decoder.decode(ISSUER_MISMATCH))
.isInstanceOf(JwtValidationException.class)
.hasMessageContaining("This iss claim is not equal to the configured issuer");
.hasMessageContaining("The iss claim is not valid");
}
@Test

15
oauth2/oauth2-jose/src/test/java/org/springframework/security/oauth2/jwt/ReactiveJwtDecodersTests.java

@ -20,6 +20,10 @@ import java.util.HashMap; @@ -20,6 +20,10 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import okhttp3.HttpUrl;
import okhttp3.mockwebserver.Dispatcher;
import okhttp3.mockwebserver.MockResponse;
@ -33,11 +37,6 @@ import org.springframework.http.HttpHeaders; @@ -33,11 +37,6 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.web.util.UriComponentsBuilder;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import static org.assertj.core.api.Assertions.assertThatCode;
/**
@ -104,7 +103,7 @@ public class ReactiveJwtDecodersTests { @@ -104,7 +103,7 @@ public class ReactiveJwtDecodersTests {
assertThatCode(() -> decoder.decode(ISSUER_MISMATCH).block())
.isInstanceOf(JwtValidationException.class)
.hasMessageContaining("This iss claim is not equal to the configured issuer");
.hasMessageContaining("The iss claim is not valid");
}
@Test
@ -115,7 +114,7 @@ public class ReactiveJwtDecodersTests { @@ -115,7 +114,7 @@ public class ReactiveJwtDecodersTests {
assertThatCode(() -> decoder.decode(ISSUER_MISMATCH).block())
.isInstanceOf(JwtValidationException.class)
.hasMessageContaining("This iss claim is not equal to the configured issuer");
.hasMessageContaining("The iss claim is not valid");
}
@Test
@ -126,7 +125,7 @@ public class ReactiveJwtDecodersTests { @@ -126,7 +125,7 @@ public class ReactiveJwtDecodersTests {
assertThatCode(() -> decoder.decode(ISSUER_MISMATCH).block())
.isInstanceOf(JwtValidationException.class)
.hasMessageContaining("This iss claim is not equal to the configured issuer");
.hasMessageContaining("The iss claim is not valid");
}
@Test

Loading…
Cancel
Save