Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish Whitespace

Browse Source 
Issue gh-3736
This commit is contained in:
Rob Winch
2016-09-02 11:24:53 -05:00
parent 3531cc93c2
commit 8ad0003456
6 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/test/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixinTests.java
View File

@@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public class AnonymousAuthenticationTokenMixinTests extends AbstractMixinTests {
private static final String HASH_KEY = "key";
// @formatter:off
private static final String ANONYMOUS_JSON = "{"
+ "\"@class\": \"org.springframework.security.authentication.AnonymousAuthenticationToken\", "
@@ -49,7 +49,6 @@ public class AnonymousAuthenticationTokenMixinTests extends AbstractMixinTests {
+ "}";
// @formatter:on
@Test
public void serializeAnonymousAuthenticationTokenTest() throws JsonProcessingException, JSONException {
User user = createDefaultUser();

8
core/src/test/java/org/springframework/security/jackson2/UserDeserializerTests.java
View File

@@ -47,9 +47,9 @@ public class UserDeserializerTests extends AbstractMixinTests {
+ " \"password\": "+ USER_PASSWORD +", "
+ "\"accountNonExpired\": true, "
+ "\"accountNonLocked\": true, "
+ "\"credentialsNonExpired\": true, "
+ "\"credentialsNonExpired\": true, "
+ "\"enabled\": true, "
+ "\"authorities\": " + SimpleGrantedAuthorityMixinTests.AUTHORITIES_SET_JSON
+ "\"authorities\": " + SimpleGrantedAuthorityMixinTests.AUTHORITIES_SET_JSON
+ "}";
// @formatter:on
@@ -77,7 +77,7 @@ public class UserDeserializerTests extends AbstractMixinTests {
@Test
public void deserializeUserWithNullPasswordNoAuthorityTest() throws Exception {
String userJsonWithoutPasswordString = removeNode(userWithNoAuthoritiesJson(), mapper, "password");
User user = mapper.readValue(userJsonWithoutPasswordString, User.class);
assertThat(user).isNotNull();
assertThat(user.getUsername()).isEqualTo("admin");
@@ -113,7 +113,7 @@ public class UserDeserializerTests extends AbstractMixinTests {
public static String userJson() {
return USER_JSON;
}
public static String userWithPasswordJson(String password) {
return userJson().replaceAll(Pattern.quote(USER_PASSWORD), "\""+ password +"\"");
}

6
core/src/test/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixinTests.java
View File

@@ -36,12 +36,12 @@ import static org.assertj.core.api.Assertions.assertThat;
public class UsernamePasswordAuthenticationTokenMixinTests extends AbstractMixinTests {
// @formatter:off
private static final String AUTHENTICATED_JSON = "{"
+ "\"@class\": \"org.springframework.security.authentication.UsernamePasswordAuthenticationToken\","
+ "\"@class\": \"org.springframework.security.authentication.UsernamePasswordAuthenticationToken\","
+ "\"principal\": "+ UserDeserializerTests.USER_JSON + ", "
+ "\"credentials\": \"1234\", "
+ "\"authenticated\": true, "
+ "\"details\": null, "
+ "\"authorities\": "+ SimpleGrantedAuthorityMixinTests.AUTHORITIES_ARRAYLIST_JSON
+ "\"authorities\": "+ SimpleGrantedAuthorityMixinTests.AUTHORITIES_ARRAYLIST_JSON
+ "}";
// @formatter:on
@@ -120,4 +120,4 @@ public class UsernamePasswordAuthenticationTokenMixinTests extends AbstractMixin
UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(user, user.getPassword(), user.getAuthorities());
return token;
}
}
}