Skip to content
This repository has been archived by the owner on Jul 29, 2021. It is now read-only.

Commit

Permalink
fix(user): test login with special characters
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolasGeraud authored and tcompiegne committed Aug 13, 2019
1 parent 7e026be commit 1ebe7bf
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 5 deletions.
13 changes: 10 additions & 3 deletions src/test/java/io/gravitee/repository/UserRepositoryTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,16 @@ public void shouldSearchAllWithNullCriteria() throws Exception {
).getContent();

assertNotNull(users);
assertEquals("Invalid user numbers in search", 8, users.size());
assertEquals("Invalid user numbers in search", 9, users.size());
assertEquals("user0", users.get(0).getId());
assertEquals("user1", users.get(1).getId());
assertEquals("user3", users.get(2).getId());
assertEquals("user5", users.get(3).getId());
assertEquals("user2", users.get(4).getId());
assertEquals("user4", users.get(5).getId());
assertEquals("id2update", users.get(6).getId());
assertEquals("user2delete", users.get(7).getId());
assertEquals("idSpecialChar", users.get(7).getId());
assertEquals("user2delete", users.get(8).getId());
}

@Test
Expand Down Expand Up @@ -155,6 +156,12 @@ public void findUserBySourceCaseInsensitive() throws Exception {
assertEquals(user1.get().getId(), user1Upper.get().getId());
}

@Test
public void findUserBySourceSpecialCharacters() throws Exception {
Optional<User> user = userRepository.findBySource("sourceSpecialChar", "sourceIdSpecialChar+test@me");
assertTrue(user.isPresent());
}

@Test
public void shouldSearchUsersWithNoStatus() throws Exception {
List<User> users = userRepository.search(new UserCriteria.Builder().noStatus().build(),
Expand All @@ -172,7 +179,7 @@ public void shouldSearchActiveUsers() throws Exception {
).getContent();

Assert.assertNotNull(users);
assertEquals("Invalid user numbers in find active", 6, users.size());
assertEquals("Invalid user numbers in find active", 7, users.size());
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,10 @@ void prepare(UserRepository userRepository) throws Exception {
when(id2update.getId()).thenReturn("id2update");
final User user2delete = mock(User.class);
when(user2delete.getId()).thenReturn("user2delete");
final User userSpecialChar = mock(User.class);
when(userSpecialChar.getId()).thenReturn("idSpecialChar");
io.gravitee.common.data.domain.Page<User> searchAllResult = new io.gravitee.common.data.domain.Page<>(
asList(user0, user1, user3, user5, user2, user4, id2update, user2delete),0, 0, 8);
asList(user0, user1, user3, user5, user2, user4, id2update, userSpecialChar, user2delete),0, 0, 8);

when(userRepository.search(isNull(UserCriteria.class), any())).thenReturn(searchAllResult);
when(userRepository.search(
Expand All @@ -101,7 +103,7 @@ void prepare(UserRepository userRepository) throws Exception {
&& UserStatus.ACTIVE.equals(o.getStatuses()[0])
), any()))
.thenReturn(new io.gravitee.common.data.domain.Page<>(
asList(user, mock(User.class), mock(User.class), mock(User.class), mock(User.class), mock(User.class)),0, 0, 6));
asList(user, mock(User.class), mock(User.class), mock(User.class), mock(User.class), mock(User.class), mock(User.class)),0, 0, 6));
when(userRepository.search(
argThat(o -> o != null
&& o.getStatuses() == null
Expand All @@ -125,6 +127,7 @@ void prepare(UserRepository userRepository) throws Exception {
when(userRepository.findBySource("gravitee", "user1")).thenReturn(of(user1));
when(userRepository.findBySource("gravitee", "USER1")).thenReturn(of(user1));
when(userRepository.findBySource("gravitee", "user")).thenReturn(empty());
when(userRepository.findBySource("sourceSpecialChar", "sourceIdSpecialChar+test@me")).thenReturn(of(userSpecialChar));
when(userRepository.findById("user1")).thenReturn(of(user1));
when(userRepository.findByIds(asList("user1", "user5"))).thenReturn(new HashSet<>(asList(user1, user5)));

Expand Down
14 changes: 14 additions & 0 deletions src/test/resources/data/user-tests/users.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,19 @@
"createdAt": 1439022010883,
"updatedAt": 1439032010883,
"lastConnectionAt": 1439042010883
},
{
"id": "idSpecialChar",
"source":"sourceSpecialChar",
"sourceId":"sourceIdSpecialChar+test@me",
"password":"passwordSpecialChar",
"email":"emailSpecialChar",
"status": "ACTIVE",
"firstname":"FirstnameSpecialChar",
"lastname":"LastnameSpecialChar",
"picture":"pictureSpecialChar",
"createdAt": 1439022010883,
"updatedAt": 1439032010883,
"lastConnectionAt": 1439042010883
}
]

0 comments on commit 1ebe7bf

Please sign in to comment.