Skip to content

Commit 67fb936

Browse files
committed
Polish Formatting in Tests
Issue: gh-6454
1 parent 93d6a38 commit 67fb936

File tree

7 files changed

+26
-21
lines changed

7 files changed

+26
-21
lines changed

web/src/test/java/org/springframework/security/web/header/writers/ContentSecurityPolicyHeaderWriterTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ public void writeHeadersContentSecurityPolicyInvalid() {
9393

9494

9595
@Test
96-
public void writeHeaderOnlyIfNotPresentContentSecurityPolicyHeader(){
96+
public void writeContentSecurityPolicyHeaderWhenNotPresent() {
9797
String value = new String("value");
9898
this.response.setHeader(CONTENT_SECURITY_POLICY_HEADER, value);
9999
this.writer.writeHeaders(this.request, this.response);
100100
assertThat(this.response.getHeader(CONTENT_SECURITY_POLICY_HEADER)).isSameAs(value);
101101
}
102102

103103
@Test
104-
public void writeHeaderOnlyIfNotPresentContentSecurityPolicyReportOnlyHeader(){
104+
public void writeContentSecurityPolicyReportOnlyHeaderWhenNotPresent() {
105105
String value = new String("value");
106106
this.response.setHeader(CONTENT_SECURITY_POLICY_REPORT_ONLY_HEADER, value);
107107
this.writer.setReportOnly(true);

web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.springframework.security.web.header.writers;
1717

18-
import static org.assertj.core.api.Assertions.assertThat;
19-
2018
import java.net.URI;
2119
import java.net.URISyntaxException;
2220
import java.util.Collections;
@@ -25,9 +23,12 @@
2523

2624
import org.junit.Before;
2725
import org.junit.Test;
26+
2827
import org.springframework.mock.web.MockHttpServletRequest;
2928
import org.springframework.mock.web.MockHttpServletResponse;
3029

30+
import static org.assertj.core.api.Assertions.assertThat;
31+
3132
/**
3233
* @author Tim Ysewyn
3334
* @author Ankur Pathak
@@ -203,7 +204,7 @@ public void setIncorrectReportUri() {
203204
}
204205

205206
@Test
206-
public void writeHeaderOnlyIfNotPresentPublicKeyPins(){
207+
public void writePublicKeyPinsHeaderOnlyWhenNotPresent() {
207208
String value = new String("value");
208209
this.response.setHeader(HPKP_HEADER_NAME, value);
209210
this.writer.setReportOnly(false);
@@ -212,7 +213,7 @@ public void writeHeaderOnlyIfNotPresentPublicKeyPins(){
212213
}
213214

214215
@Test
215-
public void writeHeaderOnlyIfNotPresentPublicKeyPinsReportOnly(){
216+
public void writePublicKeyPinsReportOnlyHeaderWhenNotPresent() {
216217
String value = new String("value");
217218
this.response.setHeader(HPKP_RO_HEADER_NAME, value);
218219
this.writer.setReportOnly(false);

web/src/test/java/org/springframework/security/web/header/writers/HstsHeaderWriterTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@
1515
*/
1616
package org.springframework.security.web.header.writers;
1717

18-
import static org.assertj.core.api.Assertions.assertThat;
19-
2018
import org.junit.Before;
2119
import org.junit.Test;
20+
2221
import org.springframework.mock.web.MockHttpServletRequest;
2322
import org.springframework.mock.web.MockHttpServletResponse;
2423
import org.springframework.security.web.util.matcher.AnyRequestMatcher;
2524

25+
import static org.assertj.core.api.Assertions.assertThat;
26+
2627
/**
2728
* @author Rob Winch
2829
* @author Ankur Pathak
@@ -154,7 +155,7 @@ public void setRequestMatcherToNull() {
154155
}
155156

156157
@Test
157-
public void writeHeaderOnlyIfNotPresent(){
158+
public void writeHeaderWhenNotPresent() {
158159
String value = new String("value");
159160
this.response.setHeader(HSTS_HEADER_NAME, value);
160161
this.writer.writeHeaders(this.request, this.response);

web/src/test/java/org/springframework/security/web/header/writers/ReferrerPolicyHeaderWriterTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void writeHeaderReferrerPolicyInvalid() {
6969
}
7070

7171
@Test
72-
public void writeHeaderOnlyIfNotPresent(){
72+
public void writeHeaderWhenNotPresent() {
7373
String value = new String("value");
7474
this.response.setHeader(REFERRER_POLICY_HEADER, value);
7575
this.writer.writeHeaders(this.request, this.response);

web/src/test/java/org/springframework/security/web/header/writers/StaticHeaderWriterTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,18 @@
1515
*/
1616
package org.springframework.security.web.header.writers;
1717

18-
import static org.assertj.core.api.Assertions.assertThat;
19-
2018
import java.util.Arrays;
2119
import java.util.Collections;
2220

2321
import org.junit.Before;
2422
import org.junit.Test;
23+
2524
import org.springframework.mock.web.MockHttpServletRequest;
2625
import org.springframework.mock.web.MockHttpServletResponse;
2726
import org.springframework.security.web.header.Header;
2827

28+
import static org.assertj.core.api.Assertions.assertThat;
29+
2930
/**
3031
* Test for the {@code StaticHeadersWriter}
3132
*
@@ -98,7 +99,7 @@ public void writeHeadersMulti() {
9899
}
99100

100101
@Test
101-
public void writeHeaderOnlyIfNotPresent() {
102+
public void writeHeaderWhenNotPresent() {
102103
String pragmaValue = new String("pragmaValue");
103104
String cacheControlValue = new String("cacheControlValue");
104105
this.response.setHeader("Pragma", pragmaValue);

web/src/test/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriterTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515
*/
1616
package org.springframework.security.web.header.writers;
1717

18-
import static org.assertj.core.api.Assertions.assertThat;
19-
2018
import org.junit.Before;
2119
import org.junit.Test;
20+
2221
import org.springframework.mock.web.MockHttpServletRequest;
2322
import org.springframework.mock.web.MockHttpServletResponse;
2423

24+
import static org.assertj.core.api.Assertions.assertThat;
25+
2526
/**
2627
* @author Rob Winch
2728
* @author Ankur Pathak
@@ -92,7 +93,7 @@ public void setBlockTrueWithEnabledFalse() {
9293
}
9394

9495
@Test
95-
public void writeHeaderOnlyIfNotPresent(){
96+
public void writeHeaderWhenNotPresent() {
9697
String value = new String("value");
9798
this.response.setHeader(XSS_PROTECTION_HEADER, value);
9899
this.writer.writeHeaders(this.request, this.response);

web/src/test/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriterTests.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,19 @@
1616

1717
package org.springframework.security.web.header.writers.frameoptions;
1818

19+
import java.util.Arrays;
20+
import java.util.Collections;
21+
1922
import org.junit.Test;
23+
2024
import org.springframework.mock.web.MockHttpServletRequest;
2125
import org.springframework.mock.web.MockHttpServletResponse;
2226

23-
import java.util.Arrays;
24-
import java.util.Collections;
25-
2627
import static org.assertj.core.api.Assertions.assertThat;
2728

2829
/**
2930
* @author Rob Winch
30-
* @author AnkurPathak
31+
* @author Ankur Pathak
3132
* @since 5.0
3233
*/
3334
public class XFrameOptionsHeaderWriterTests {
@@ -48,7 +49,7 @@ public void writeHeadersWhenWhiteList() {
4849
}
4950

5051
@Test
51-
public void writeHeaderOnlyIfNotPresent(){
52+
public void writeHeaderWhenNotPresent() {
5253
WhiteListedAllowFromStrategy whitelist = new WhiteListedAllowFromStrategy(Collections.singletonList("example.com"));
5354
XFrameOptionsHeaderWriter writer = new XFrameOptionsHeaderWriter(whitelist);
5455
String value = new String("value");

0 commit comments

Comments
 (0)