Skip to content

Commit

Permalink
don't delete all Users in AccountResourceIT
Browse files Browse the repository at this point in the history
  • Loading branch information
@mshima
mshima committed May 24, 2024
1 parent 15f9e67 commit 04f6bd4
Showing 1 changed file with 61 additions and 7 deletions.
68 changes: 61 additions & 7 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 @@ -143,20 +142,30 @@ class AccountResourceIT {
<%_ } else { _%>
private MockMvc restAccountMockMvc;
<%_ } _%>
<%_ if (!databaseTypeCassandra) { _%>
private Long numberOfUsers;
<%_ if (databaseTypeMongodb || databaseTypeNeo4j) { _%>
@BeforeEach
public void setup() {
userRepository.deleteAll()<% if (reactive) { %>.block()<% } %>;
public void countUsers() {
numberOfUsers = userRepository.count()<%- reactorBlock %>;
}
<%_ } _%>
<%_ if (reactive && authenticationUsesCsrf) { _%>
@BeforeEach
public void setupCsrf() {
accountWebTestClient = accountWebTestClient.mutateWith(csrf());
}
<%_ } _%>
<%_ if (!databaseTypeCassandra) { _%>
@AfterEach
public void checkUsersCount() {
assertThat(userRepository.count()<%- reactorBlock %>).isEqualTo(numberOfUsers);
numberOfUsers = null;
}
<%_ } _%>
@Test
@WithUnauthenticatedMockUser
Expand Down Expand Up @@ -246,6 +255,8 @@ class AccountResourceIT {
.andExpect(jsonPath("$.authorities").value(AuthoritiesConstants.ADMIN));

<%_ } _%>

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

@Test
Expand Down Expand Up @@ -301,6 +312,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 +497,8 @@ class AccountResourceIT {
.with(csrf())<% } %>)
.andExpect(status().is4xxClientError());
<%_ } _%>

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

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

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

@Test
Expand Down Expand Up @@ -649,6 +666,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 +702,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 +778,8 @@ class AccountResourceIT {
<%_ } _%>
assertThat(updatedUser.isActivated()).isTrue();
assertThat(updatedUser.getAuthorities()).isEmpty();

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

@Test
Expand Down Expand Up @@ -810,6 +833,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 +897,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 +952,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 +993,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 +1033,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 +1075,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 +1117,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 +1157,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 +1205,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 +1253,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 +1290,8 @@ class AccountResourceIT {
.with(csrf())<%_ } _%>)
.andExpect(status().isOk());
<%_ } _%>

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

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

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

@Test
Expand Down Expand Up @@ -1336,6 +1386,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 +1430,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

0 comments on commit 04f6bd4

Please sign in to comment.