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

Start AssertJ Migration

Browse Source 
Issue gh-3175
This commit is contained in:
Rob Winch
2015-12-16 10:38:31 -06:00
parent 6cbb439701
commit bb600a473e
355 changed files with 3036 additions and 3133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/gae-xml/src/test/java/samples/gae/security/AppRoleTests.java
View File

@@ -1,6 +1,6 @@
package samples.gae.security;
import static org.junit.Assert.*;
import static org.assertj.core.api.Assertions.*;
import static samples.gae.security.AppRole.*;
import org.junit.Test;
@@ -15,15 +15,15 @@ public class AppRoleTests {
public void getAuthorityReturnsRoleName() {
GrantedAuthority admin = ADMIN;
assertEquals("ROLE_ADMIN", admin.getAuthority());
assertThat(admin.getAuthority()).isEqualTo("ROLE_ADMIN");
}
@Test
public void bitsAreCorrect() throws Exception {
// If this fails, someone has modified the Enum and the Datastore is probably
// corrupt!
assertEquals(0, ADMIN.getBit());
assertEquals(1, NEW_USER.getBit());
assertEquals(2, USER.getBit());
assertThat(ADMIN.getBit()).isEqualTo(0);
assertThat(NEW_USER.getBit()).isEqualTo(1);
assertThat(USER.getBit()).isEqualTo(2);
}
}

16
samples/gae-xml/src/test/java/samples/gae/users/GaeDataStoreUserRegistryTests.java
View File

@@ -1,6 +1,6 @@
package samples.gae.users;
import static org.junit.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.EnumSet;
import java.util.Set;
@@ -43,12 +43,12 @@ public class GaeDataStoreUserRegistryTests {
GaeUser loadedUser = registry.findUser(userId);
assertEquals(loadedUser.getUserId(), origUser.getUserId());
assertEquals(true, loadedUser.isEnabled());
assertEquals(roles, loadedUser.getAuthorities());
assertEquals("nick", loadedUser.getNickname());
assertEquals("nick@blah.com", loadedUser.getEmail());
assertEquals("Forename", loadedUser.getForename());
assertEquals("Surname", loadedUser.getSurname());
assertThat(origUser.getUserId()).isEqualTo(loadedUser.getUserId());
assertThat(loadedUser.isEnabled()).isEqualTo(true);
assertThat(loadedUser.getAuthorities()).isEqualTo(roles);
assertThat(loadedUser.getNickname()).isEqualTo("nick");
assertThat(loadedUser.getEmail()).isEqualTo("nick@blah.com");
assertThat(loadedUser.getForename()).isEqualTo("Forename");
assertThat(loadedUser.getSurname()).isEqualTo("Surname");
}
}