Skip to content

Commit

Permalink
Merge pull request #26233 from mshima/user-cleanup2
Browse files Browse the repository at this point in the history 
don't delete all Users in AccountResourceIT
  • Loading branch information
@DanielFran
DanielFran committed May 24, 2024
2 parents bbee59a + 6d0ada2 commit bb5a70d
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 27 deletions.
68 changes: 62 additions & 6 deletions generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ import <%= packageName %>.web.rest.vm.ManagedUserVM;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.RandomStringUtils;
<%_ if (reactive && authenticationUsesCsrf || databaseTypeMongodb || databaseTypeNeo4j) { _%>
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
<%_ } _%>
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
Expand Down Expand Up @@ -144,10 +143,12 @@ class AccountResourceIT {
private MockMvc restAccountMockMvc;
<%_ } _%>
<%_ if (databaseTypeMongodb || databaseTypeNeo4j) { _%>
<%_ if (!databaseTypeCassandra && !requiresDeleteAllUsers) { _%>
private Long numberOfUsers;
@BeforeEach
public void setup() {
userRepository.deleteAll()<% if (reactive) { %>.block()<% } %>;
public void countUsers() {
numberOfUsers = userRepository.count()<%- reactorBlock %>;
}
<%_ } _%>
Expand All @@ -158,6 +159,16 @@ class AccountResourceIT {
}
<%_ } _%>
@AfterEach
public void cleanupAndCheck() {
<%_ if (requiresDeleteAllUsers) { _%>
userRepository.deleteAll()<%- reactorBlock %>;
<%_ } else if (!databaseTypeCassandra) { _%>
assertThat(userRepository.count()<%- reactorBlock %>).isEqualTo(numberOfUsers);
numberOfUsers = null;
<%_ } _%>
}
@Test
@WithUnauthenticatedMockUser
<%_ if (reactive) { _%>
Expand Down Expand Up @@ -246,6 +257,8 @@ class AccountResourceIT {
.andExpect(jsonPath("$.authorities").value(AuthoritiesConstants.ADMIN));

<%_ } _%>

userService.deleteUser(TEST_USER_LOGIN)<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -301,6 +314,8 @@ class AccountResourceIT {
<%_ } _%>

assertThat(userRepository.findOneByLogin("test-register-valid")<% if (reactive) { %>.blockOptional()<% } %>).isPresent();

userService.deleteUser("test-register-valid")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -484,6 +499,8 @@ class AccountResourceIT {
.with(csrf())<% } %>)
.andExpect(status().is4xxClientError());
<%_ } _%>

userService.deleteUser("alice")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -610,6 +627,8 @@ class AccountResourceIT {
.with(csrf())<% } %>)
.andExpect(status().is4xxClientError());
<%_ } _%>

userService.deleteUser("test-register-duplicate-email-3")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -649,6 +668,8 @@ class AccountResourceIT {
assertThat(userDup).isPresent();
assertThat(userDup.orElseThrow().getAuthorities()).hasSize(1)
.containsExactly(<% if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j) { %>authorityRepository.findById(AuthoritiesConstants.USER).<% if (reactive) { %>block<% } else { %>orElseThrow<% } %>()<% } %><% if (databaseTypeCassandra || databaseTypeCouchbase) { %>AuthoritiesConstants.USER<% } %>);

userService.deleteUser("badguy")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -683,6 +704,8 @@ class AccountResourceIT {

user = userRepository.findOneByLogin(user.getLogin())<%_ if (reactive) { _%>.block()<% } else { %>.orElse(null)<% } %>;
assertThat(user.isActivated()).isTrue();

userService.deleteUser("activate-account")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -757,6 +780,8 @@ class AccountResourceIT {
<%_ } _%>
assertThat(updatedUser.isActivated()).isTrue();
assertThat(updatedUser.getAuthorities()).isEmpty();

userService.deleteUser("save-account")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -810,6 +835,8 @@ class AccountResourceIT {
<%_ } _%>

assertThat(userRepository.findOneByEmailIgnoreCase("invalid email")<% if (reactive) { %>.blockOptional()<% } %>).isNotPresent();

userService.deleteUser("save-invalid-email")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -872,8 +899,11 @@ class AccountResourceIT {
.andExpect(status().isBadRequest());
<%_ } _%>

<%= user.persistClass %> updatedUser = userRepository.findOneByLogin("save-existing-email")<%_ if (reactive) { _%>.block()<% } else { %>.orElse(null)<% } %>;
<%= user.persistClass %> updatedUser = userRepository.findOneByLogin("save-existing-email")<%_ if (reactive) { _%>.block()<% } else { %>.orElseThrow()<% } %>;
assertThat(updatedUser.getEmail()).isEqualTo("save-existing-email@example.com");

userService.deleteUser("save-existing-email")<%- reactorBlock %>;
userService.deleteUser("save-existing-email2")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -924,6 +954,8 @@ class AccountResourceIT {

<%= user.persistClass %> updatedUser = userRepository.findOneByLogin("save-existing-email-and-login")<%_ if (reactive) { _%>.block()<% } else { %>.orElse(null)<% } %>;
assertThat(updatedUser.getEmail()).isEqualTo("save-existing-email-and-login@example.com");

userService.deleteUser("save-existing-email-and-login")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -963,6 +995,8 @@ class AccountResourceIT {
<%= user.persistClass %> updatedUser = userRepository.findOneByLogin("change-password-wrong-existing-password")<%_ if (!reactive) { _%>.orElse(null)<% } else { %>.block()<% } %>;
assertThat(passwordEncoder.matches("new password", updatedUser.getPassword())).isFalse();
assertThat(passwordEncoder.matches(currentPassword, updatedUser.getPassword())).isTrue();

userService.deleteUser("change-password-wrong-existing-password")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -1001,6 +1035,8 @@ class AccountResourceIT {

<%= user.persistClass %> updatedUser = userRepository.findOneByLogin("change-password")<%_ if (reactive) { _%>.block()<% } else { %>.orElse(null)<% } %>;
assertThat(passwordEncoder.matches("new password", updatedUser.getPassword())).isTrue();

userService.deleteUser("change-password")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -1041,6 +1077,8 @@ class AccountResourceIT {

<%= user.persistClass %> updatedUser = userRepository.findOneByLogin("change-password-too-small")<%_ if (reactive) { _%>.block()<% } else { %>.orElse(null)<% } %>;
assertThat(updatedUser.getPassword()).isEqualTo(user.getPassword());

userService.deleteUser("change-password-too-small")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -1081,6 +1119,8 @@ class AccountResourceIT {

<%= user.persistClass %> updatedUser = userRepository.findOneByLogin("change-password-too-long")<%_ if (!reactive) { _%>.orElse(null)<% } else { %>.block()<% } %>;
assertThat(updatedUser.getPassword()).isEqualTo(user.getPassword());

userService.deleteUser("change-password-too-long")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -1119,6 +1159,8 @@ class AccountResourceIT {

<%= user.persistClass %> updatedUser = userRepository.findOneByLogin("change-password-empty")<%_ if (reactive) { _%>.block()<% } else { %>.orElse(null)<% } %>;
assertThat(updatedUser.getPassword()).isEqualTo(user.getPassword());

userService.deleteUser("change-password-empty")<%- reactorBlock %>;
}
<%_ if (authenticationTypeSession && !reactive) { _%>

Expand Down Expand Up @@ -1165,6 +1207,9 @@ class AccountResourceIT {
.andExpect(jsonPath("$.[*].ipAddress").value(hasItem(token.getIpAddress())))
.andExpect(jsonPath("$.[*].userAgent").value(hasItem(token.getUserAgent())))
.andExpect(jsonPath("$.[*].tokenDate").value(hasItem(containsString(<% if (databaseTypeCassandra) { %>"2017-03-28T15:25:57.123Z"<% } else { %>token.getTokenDate().toString()<% } %>))));

persistentTokenRepository.delete(token);
userService.deleteUser("current-sessions")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -1210,6 +1255,9 @@ class AccountResourceIT {
.andExpect(status().isOk());

assertThat(persistentTokenRepository.findByUser(user)).isEmpty();

persistentTokenRepository.delete(token);
userService.deleteUser("invalidate-session")<%- reactorBlock %>;
}
<%_ } _%>

Expand Down Expand Up @@ -1244,6 +1292,8 @@ class AccountResourceIT {
.with(csrf())<%_ } _%>)
.andExpect(status().isOk());
<%_ } _%>

userService.deleteUser("password-reset")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -1277,6 +1327,8 @@ class AccountResourceIT {
.with(csrf())<%_ } _%>)
.andExpect(status().isOk());
<%_ } _%>

userService.deleteUser("password-reset-upper-case")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -1336,6 +1388,8 @@ class AccountResourceIT {

<%= user.persistClass %> updatedUser = userRepository.findOneByLogin(user.getLogin())<%_ if (reactive) { _%>.block()<% } else { %>.orElse(null)<% } %>;
assertThat(passwordEncoder.matches(keyAndPassword.getNewPassword(), updatedUser.getPassword())).isTrue();

userService.deleteUser("finish-password-reset")<%- reactorBlock %>;
}

@Test
Expand Down Expand Up @@ -1378,6 +1432,8 @@ class AccountResourceIT {

<%= user.persistClass %> updatedUser = userRepository.findOneByLogin(user.getLogin())<%_ if (!reactive) { _%>.orElse(null)<% } else { %>.block()<% } %>;
assertThat(passwordEncoder.matches(keyAndPassword.getNewPassword(), updatedUser.getPassword())).isFalse();

userService.deleteUser("finish-password-reset-too-small")<%- reactorBlock %>;
}

@Test
Expand Down
22 changes: 1 addition & 21 deletions ...g-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/UserResourceIT.java.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,12 +502,6 @@ class UserResourceIT {
void getAllUsers()<% if (!reactive) { %> throws Exception<% } %> {
// Initialize the database
userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %><%= saveMethod %><% } %>(user)<% if (reactive) { %>.block()<% } %>;
<%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
authorityRepository
.findById(AuthoritiesConstants.USER)
.flatMap(authority -> userRepository.saveUserAuthority(user.getId(), authority.getName()))
.block();
<%_ } _%>

// Get all the users
<%_ if (reactive) { _%>
Expand All @@ -526,9 +520,6 @@ class UserResourceIT {
assertThat(foundUser.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
<%_ } _%>
assertThat(foundUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
<%_ if (databaseTypeSql && !applicationTypeMicroservice) { _%>
assertThat(foundUser.getAuthorities()).containsExactly(AuthoritiesConstants.USER);
<%_ } _%>
<%_ } else { _%>
restUserMockMvc.perform(get("/api/admin/users<% if (databaseTypeSql) { %>?sort=id,desc<% } %>")
.accept(MediaType.APPLICATION_JSON))
Expand All @@ -552,12 +543,6 @@ class UserResourceIT {
void getUser()<% if (!reactive) { %> throws Exception<% } %> {
// Initialize the database
userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %><%= saveMethod %><% } %>(user)<% if (reactive) { %>.block()<% } %>;
<%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
authorityRepository
.findById(AuthoritiesConstants.USER)
.flatMap(authority -> userRepository.saveUserAuthority(user.getId(), authority.getName()))
.block();
<%_ } _%>

<%_ if (searchEngineElasticsearch) { _%>
userSearchRepository.save(user);
Expand All @@ -581,12 +566,7 @@ class UserResourceIT {
<%_ if (!databaseTypeCassandra) { _%>
.jsonPath("$.imageUrl").isEqualTo(DEFAULT_IMAGEURL)
<%_ } _%>
.jsonPath("$.langKey").isEqualTo(DEFAULT_LANGKEY)<%
if (!databaseTypeSql || applicationTypeMicroservice) { %>;
<%_ } else { _%>
.jsonPath("$.authorities")
.isEqualTo(AuthoritiesConstants.USER);
<% } %>
.jsonPath("$.langKey").isEqualTo(DEFAULT_LANGKEY);
<%_ } else { _%>
restUserMockMvc.perform(get("/api/admin/users/{login}", user.getLogin()))
.andExpect(status().isOk())
Expand Down

0 comments on commit bb5a70d

Please sign in to comment.