Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish CompositeHeaderWriterTests 

Changed test to favor mocks in order to provide a stronger
guarantee that the composite delegates to its components.

Issue: gh-6453
This commit is contained in:
Josh Cummings 2019-01-21 09:30:18 -07:00
parent bb1b9d9b86
commit c82440ee82
1 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
web/src/test/java/org/springframework/security/web/header/writers/CompositeHeaderWriterTests.java
View File

@ -15,16 +15,17 @@
*/ */
package org.springframework.security.web.header.writers; package org.springframework.security.web.header.writers;
import java.util.Arrays;
import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.security.web.header.HeaderWriter; import org.springframework.security.web.header.HeaderWriter;
import static org.assertj.core.api.Assertions.assertThat; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Collections;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
/** /**
* Tests for class {@link CompositeHeaderWriter}/. * Tests for class {@link CompositeHeaderWriter}/.
@ -33,37 +34,25 @@ import static org.assertj.core.api.Assertions.assertThat;
* @since 5.2 * @since 5.2
*/ */
public class CompositeHeaderWriterTests { public class CompositeHeaderWriterTests {
private MockHttpServletRequest request;
private MockHttpServletResponse response;
private CompositeHeaderWriter writer;
@Before
public void setup() {
this.request = new MockHttpServletRequest();
this.response = new MockHttpServletResponse();
HeaderWriter writerA = (request, response) -> {
if (!response.containsHeader("A")) {
response.setHeader("A", "a");
}
};
HeaderWriter writerB = (request, response) -> {
if (!response.containsHeader("B")) {
response.setHeader("B", "b");
}
};
this.writer = new CompositeHeaderWriter(Arrays.asList(writerA, writerB));
}
@Test @Test
public void doCompositeHeaderWrite(){ public void writeHeadersWhenConfiguredWithDelegatesThenInvokesEach() {
this.writer.writeHeaders(request, response); HttpServletRequest request = mock(HttpServletRequest.class);
assertThat(this.response.containsHeader("A")).isTrue(); HttpServletResponse response = mock(HttpServletResponse.class);
assertThat(this.response.containsHeader("B")).isTrue(); HeaderWriter one = mock(HeaderWriter.class);
assertThat(this.response.getHeader("A")).isEqualTo("a"); HeaderWriter two = mock(HeaderWriter.class);
assertThat(this.response.getHeader("B")).isEqualTo("b");
CompositeHeaderWriter headerWriter = new CompositeHeaderWriter(
Arrays.asList(one, two));
headerWriter.writeHeaders(request, response);
verify(one).writeHeaders(request, response);
verify(two).writeHeaders(request, response);
}
@Test
public void constructorWhenPassingEmptyListThenThrowsException() {
assertThatCode(() -> new CompositeHeaderWriter(Collections.emptyList()))
.isInstanceOf(IllegalArgumentException.class);
} }
} }