Browse Source

Polish

See gh-29050
pull/29132/head
Brian Clozel 3 years ago
parent
commit
a425512025
  1. 16
      spring-web/src/test/java/org/springframework/web/filter/RelativeRedirectFilterTests.java

16
spring-web/src/test/java/org/springframework/web/filter/RelativeRedirectFilterTests.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2019 the original author or authors. * Copyright 2002-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -46,41 +46,45 @@ public class RelativeRedirectFilterTests {
@Test @Test
public void sendRedirectHttpStatusWhenNullThenIllegalArgumentException() { void sendRedirectHttpStatusWhenNullThenIllegalArgumentException() {
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException().isThrownBy(() ->
this.filter.setRedirectStatus(null)); this.filter.setRedirectStatus(null));
} }
@Test @Test
public void sendRedirectHttpStatusWhenNot3xxThenIllegalArgumentException() { void sendRedirectHttpStatusWhenNot3xxThenIllegalArgumentException() {
assertThatIllegalArgumentException().isThrownBy(() -> assertThatIllegalArgumentException().isThrownBy(() ->
this.filter.setRedirectStatus(HttpStatus.OK)); this.filter.setRedirectStatus(HttpStatus.OK));
} }
@Test @Test
public void doFilterSendRedirectWhenDefaultsThenLocationAnd303() throws Exception { void doFilterSendRedirectWhenDefaultsThenLocationAnd303() throws Exception {
String location = "/foo"; String location = "/foo";
sendRedirect(location); sendRedirect(location);
InOrder inOrder = Mockito.inOrder(this.response); InOrder inOrder = Mockito.inOrder(this.response);
inOrder.verify(this.response).resetBuffer();
inOrder.verify(this.response).setStatus(HttpStatus.SEE_OTHER.value()); inOrder.verify(this.response).setStatus(HttpStatus.SEE_OTHER.value());
inOrder.verify(this.response).setHeader(HttpHeaders.LOCATION, location); inOrder.verify(this.response).setHeader(HttpHeaders.LOCATION, location);
inOrder.verify(this.response).flushBuffer();
} }
@Test @Test
public void doFilterSendRedirectWhenCustomSendRedirectHttpStatusThenLocationAnd301() throws Exception { void doFilterSendRedirectWhenCustomSendRedirectHttpStatusThenLocationAnd301() throws Exception {
String location = "/foo"; String location = "/foo";
HttpStatus status = HttpStatus.MOVED_PERMANENTLY; HttpStatus status = HttpStatus.MOVED_PERMANENTLY;
this.filter.setRedirectStatus(status); this.filter.setRedirectStatus(status);
sendRedirect(location); sendRedirect(location);
InOrder inOrder = Mockito.inOrder(this.response); InOrder inOrder = Mockito.inOrder(this.response);
inOrder.verify(this.response).resetBuffer();
inOrder.verify(this.response).setStatus(status.value()); inOrder.verify(this.response).setStatus(status.value());
inOrder.verify(this.response).setHeader(HttpHeaders.LOCATION, location); inOrder.verify(this.response).setHeader(HttpHeaders.LOCATION, location);
inOrder.verify(this.response).flushBuffer();
} }
@Test @Test
public void wrapOnceOnly() throws Exception { void wrapOnceOnly() throws Exception {
HttpServletResponse original = new MockHttpServletResponse(); HttpServletResponse original = new MockHttpServletResponse();
MockFilterChain chain = new MockFilterChain(); MockFilterChain chain = new MockFilterChain();

Loading…
Cancel
Save