generator-jhipster 7.8.1 → 7.9.2

package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs

@@ -18,9 +18,6 @@
 -%>
 package <%= packageName %>.web.rest;
 
-<%_ if (databaseTypeCouchbase) { _%>
-import <%= packageName %>.CouchbaseTestContainerExtension;
-<%_ } _%>
 import <%= packageName %>.IntegrationTest;
 import <%= packageName %>.config.Constants;
 <%_ if (authenticationTypeSession && !reactive) { _%>
@@ -131,11 +128,6 @@ class AccountResourceIT {
     @Autowired
     private PersistentTokenRepository persistentTokenRepository;
 <%_ } _%>
-<%_ if (searchEngineElasticsearch && reactive) { _%>
-
-    @Autowired
-    private UserSearchRepository mockUserSearchRepository;
-<%_ } _%>
 
     @Autowired
     private PasswordEncoder passwordEncoder;
@@ -203,12 +195,6 @@ class AccountResourceIT {
 
     @Test
     void testGetExistingAccount()<% if (!reactive) { %> throws Exception<% } %> {
-<%_ if (searchEngineElasticsearch && reactive) { _%>
-        // Configure the mock search repository
-        when(mockUserSearchRepository.save(any()))
-            .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
-
-<%_ } _%>
         Set<String> authorities = new HashSet<>();
         authorities.add(AuthoritiesConstants.ADMIN);
 
@@ -278,12 +264,6 @@ class AccountResourceIT {
     @Transactional
 <%_ } _%>
     void testRegisterValid() throws Exception {
-<%_ if (searchEngineElasticsearch && reactive) { _%>
-        // Configure the mock search repository
-        when(mockUserSearchRepository.save(any()))
-            .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
-
-<%_ } _%>
         ManagedUserVM validUser = new ManagedUserVM();
         validUser.setLogin("test-register-valid");
         validUser.setPassword("password");
@@ -471,12 +451,6 @@ class AccountResourceIT {
     @Transactional
 <%_ } _%>
     void testRegisterDuplicateLogin() throws Exception {
-<%_ if (searchEngineElasticsearch && reactive) { _%>
-        // Configure the mock search repository
-        when(mockUserSearchRepository.save(any()))
-            .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
-
-<%_ } _%>
         // First registration
         ManagedUserVM firstUser = new ManagedUserVM();
         firstUser.setLogin("alice");
@@ -571,12 +545,6 @@ class AccountResourceIT {
     @Transactional
 <%_ } _%>
     void testRegisterDuplicateEmail() throws Exception {
-<%_ if (searchEngineElasticsearch && reactive) { _%>
-        // Configure the mock search repository
-        when(mockUserSearchRepository.save(any()))
-            .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
-
-<%_ } _%>
         // First user
         ManagedUserVM firstUser = new ManagedUserVM();
         firstUser.setLogin("test-register-duplicate-email");
@@ -716,12 +684,6 @@ class AccountResourceIT {
         validUser.setLangKey(Constants.DEFAULT_LANGUAGE);
         validUser.setAuthorities(Collections.singleton(AuthoritiesConstants.ADMIN));
 
-<%_ if (searchEngineElasticsearch && reactive) { _%>
-        // Configure the mock search repository
-        when(mockUserSearchRepository.save(any()))
-            .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
-
-<%_ } _%>
 <%_ if (reactive) { _%>
         accountWebTestClient.post().uri("/api/register")
             .contentType(MediaType.APPLICATION_JSON)
@@ -748,12 +710,6 @@ class AccountResourceIT {
     @Transactional
 <%_ } _%>
     void testActivateAccount()<% if (!reactive) { %> throws Exception<% } %> {
-<%_ if (searchEngineElasticsearch && reactive) { _%>
-        // Configure the mock search repository
-        when(mockUserSearchRepository.save(any()))
-            .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
-
-<%_ } _%>
         final String activationKey = "some activation key";
         <%= asEntity('User') %> user = new <%= asEntity('User') %>();
 <%_ if (databaseTypeCassandra) { _%>
@@ -761,7 +717,7 @@ class AccountResourceIT {
 <%_ } _%>
         user.setLogin("activate-account");
         user.setEmail("activate-account@example.com");
-        user.setPassword(RandomStringUtils.random(60));
+        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
         user.setActivated(false);
         user.setActivationKey(activationKey);
 <%_ if (databaseTypeSql && reactive) { _%>
@@ -810,19 +766,13 @@ class AccountResourceIT {
 <%_ } _%>
         user.setLogin("save-account");
         user.setEmail("save-account@example.com");
-        user.setPassword(RandomStringUtils.random(60));
+        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
         user.setActivated(true);
 <%_ if (databaseTypeSql && reactive) { _%>
         user.setCreatedBy(Constants.SYSTEM);
 <%_ } _%>
         userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
 
-<%_ if (searchEngineElasticsearch && reactive) { _%>
-        // Configure the mock search repository
-        when(mockUserSearchRepository.save(any()))
-            .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
-
-<%_ } _%>
         <%= asDto('AdminUser') %> userDTO = new <%= asDto('AdminUser') %>();
         userDTO.setLogin("not-used");
         userDTO.setFirstName("firstname");
@@ -875,7 +825,7 @@ class AccountResourceIT {
 <%_ } _%>
         user.setLogin("save-invalid-email");
         user.setEmail("save-invalid-email@example.com");
-        user.setPassword(RandomStringUtils.random(60));
+        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
         user.setActivated(true);
 <%_ if (databaseTypeSql && reactive) { _%>
         user.setCreatedBy(Constants.SYSTEM);
@@ -928,7 +878,7 @@ class AccountResourceIT {
 <%_ } _%>
         user.setLogin("save-existing-email");
         user.setEmail("save-existing-email@example.com");
-        user.setPassword(RandomStringUtils.random(60));
+        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
         user.setActivated(true);
 <%_ if (databaseTypeSql && reactive) { _%>
         user.setCreatedBy(Constants.SYSTEM);
@@ -941,7 +891,7 @@ class AccountResourceIT {
 <%_ } _%>
         anotherUser.setLogin("save-existing-email2");
         anotherUser.setEmail("save-existing-email2@example.com");
-        anotherUser.setPassword(RandomStringUtils.random(60));
+        anotherUser.setPassword(RandomStringUtils.randomAlphanumeric(60));
         anotherUser.setActivated(true);
 <%_ if (databaseTypeSql && reactive) { _%>
         anotherUser.setCreatedBy(Constants.SYSTEM);
@@ -992,19 +942,13 @@ class AccountResourceIT {
 <%_ } _%>
         user.setLogin("save-existing-email-and-login");
         user.setEmail("save-existing-email-and-login@example.com");
-        user.setPassword(RandomStringUtils.random(60));
+        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
         user.setActivated(true);
 <%_ if (databaseTypeSql && reactive) { _%>
         user.setCreatedBy(Constants.SYSTEM);
 <%_ } _%>
         userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
 
-<%_ if (searchEngineElasticsearch && reactive) { _%>
-        // Configure the mock search repository
-        when(mockUserSearchRepository.save(any()))
-            .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
-
-<%_ } _%>
         <%= asDto('AdminUser') %> userDTO = new <%= asDto('AdminUser') %>();
         userDTO.setLogin("not-used");
         userDTO.setFirstName("firstname");
@@ -1046,7 +990,7 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        String currentPassword = RandomStringUtils.random(60);
+        String currentPassword = RandomStringUtils.randomAlphanumeric(60);
         user.setPassword(passwordEncoder.encode(currentPassword));
         user.setLogin("change-password-wrong-existing-password");
         user.setEmail("change-password-wrong-existing-password@example.com");
@@ -1085,7 +1029,7 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        String currentPassword = RandomStringUtils.random(60);
+        String currentPassword = RandomStringUtils.randomAlphanumeric(60);
         user.setPassword(passwordEncoder.encode(currentPassword));
         user.setLogin("change-password");
         user.setEmail("change-password@example.com");
@@ -1123,7 +1067,7 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        String currentPassword = RandomStringUtils.random(60);
+        String currentPassword = RandomStringUtils.randomAlphanumeric(60);
         user.setPassword(passwordEncoder.encode(currentPassword));
         user.setLogin("change-password-too-small");
         user.setEmail("change-password-too-small@example.com");
@@ -1163,7 +1107,7 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        String currentPassword = RandomStringUtils.random(60);
+        String currentPassword = RandomStringUtils.randomAlphanumeric(60);
         user.setPassword(passwordEncoder.encode(currentPassword));
         user.setLogin("change-password-too-long");
         user.setEmail("change-password-too-long@example.com");
@@ -1203,7 +1147,7 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        String currentPassword = RandomStringUtils.random(60);
+        String currentPassword = RandomStringUtils.randomAlphanumeric(60);
         user.setPassword(passwordEncoder.encode(currentPassword));
         user.setLogin("change-password-empty");
         user.setEmail("change-password-empty@example.com");
@@ -1242,7 +1186,7 @@ class AccountResourceIT {
   <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
   <%_ } _%>
-        user.setPassword(RandomStringUtils.random(60));
+        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
         user.setLogin("current-sessions");
         user.setEmail("current-sessions@example.com");
   <%_ if (databaseTypeSql && reactive) { _%>
@@ -1287,7 +1231,7 @@ class AccountResourceIT {
   <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
   <%_ } _%>
-        user.setPassword(RandomStringUtils.random(60));
+        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
         user.setLogin("invalidate-session");
         user.setEmail("invalidate-session@example.com");
   <%_ if (databaseTypeSql && reactive) { _%>
@@ -1332,10 +1276,11 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        user.setPassword(RandomStringUtils.random(60));
+        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
         user.setActivated(true);
         user.setLogin("password-reset");
         user.setEmail("password-reset@example.com");
+        user.setLangKey("en");
 <%_ if (databaseTypeSql && reactive) { _%>
         user.setCreatedBy(Constants.SYSTEM);
 <%_ } _%>
@@ -1364,10 +1309,11 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        user.setPassword(RandomStringUtils.random(60));
+        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
         user.setActivated(true);
         user.setLogin("password-reset-upper-case");
         user.setEmail("password-reset-upper-case@example.com");
+        user.setLangKey("en");
 <%_ if (databaseTypeSql && reactive) { _%>
         user.setCreatedBy(Constants.SYSTEM);
 <%_ } _%>
@@ -1413,7 +1359,7 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        user.setPassword(RandomStringUtils.random(60));
+        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
         user.setLogin("finish-password-reset");
         user.setEmail("finish-password-reset@example.com");
         user.setResetDate(Instant.now().plusSeconds(60));
@@ -1455,7 +1401,7 @@ class AccountResourceIT {
 <%_ if (databaseTypeCassandra) { _%>
         user.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        user.setPassword(RandomStringUtils.random(60));
+        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
         user.setLogin("finish-password-reset-too-small");
         user.setEmail("finish-password-reset-too-small@example.com");
         user.setResetDate(Instant.now().plusSeconds(60));

package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT_skipUserManagement.java.ejs

@@ -24,9 +24,6 @@ import <%= packageName %>.repository.search.UserSearchRepository;
 <%_ } _%>
 import <%= packageName %>.security.AuthoritiesConstants;
 import org.junit.jupiter.api.Test;
-<%_ if (reactiveSqlTestContainers) { _%>
-import <%= packageName %>.ReactiveSqlTestContainerExtension;
-<%_ } _%>
 import org.springframework.beans.factory.annotation.Autowired;
 <%_ if (reactive) { _%>
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
@@ -69,11 +66,6 @@ class AccountResourceIT {
 <%_ } else { _%>
     private MockMvc restAccountMockMvc;
 <%_ } _%>
-<%_ if (searchEngineElasticsearch && reactive) { _%>
-
-    @Autowired
-    private UserSearchRepository mockUserSearchRepository;
-<%_ } _%>
 
     @Test
     @WithMockUser(username = TEST_USER_LOGIN, authorities = AuthoritiesConstants.ADMIN)

package/generators/server/templates/src/test/java/package/web/rest/TestUtil.java.ejs

@@ -54,6 +54,7 @@ import java.util.concurrent.Callable;
 import java.util.function.Function;
 import java.time.Duration;
 import reactor.core.publisher.Mono;
+import reactor.util.retry.Retry;
 <%_ } _%>
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -254,18 +255,20 @@ public final class TestUtil {
     }
 <%_ } _%>
 <%_ if (searchEngineCouchbase) { _%>
+
     public static <T> void retryUntilNotEmpty(Callable<Iterable<T>> iterableCallable) {
-        Mono.defer(
-                () -> Mono.fromCallable(iterableCallable)
-                    .flatMapIterable(Function.identity())
-                    .next()
-                    .switchIfEmpty(Mono.error(new NoSuchElementException()))
-            )
-            .retry()
-            .timeout(Duration.ofSeconds(60))
-            .block();
-    }
+        Mono.defer(() ->
+            Mono
+                .fromCallable(iterableCallable)
+                .flatMapIterable(Function.identity())
+                .next()
+                .switchIfEmpty(Mono.error(new NoSuchElementException()))
+        )
+        .retry()
+        .timeout(Duration.ofMinutes(15))
+        .block();
 
+    }
 <%_ } _%>
 
     private TestUtil() {}

package/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs

@@ -17,7 +17,12 @@
  limitations under the License.
 -%>
 package <%= packageName %>.web.rest;
-
+<%_
+let saveMethod = 'save';
+if (!reactive && databaseTypeSql) {
+    saveMethod = 'saveAndFlush';
+}
+_%>
 import <%= packageName %>.IntegrationTest;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.config.Constants;
@@ -35,7 +40,6 @@ import <%= packageName %>.repository.search.UserSearchRepository;
 <%_ } _%>
 import <%= packageName %>.security.AuthoritiesConstants;
 import <%= packageName %>.service.dto.<%= asDto('AdminUser') %>;
-import <%= packageName %>.service.dto.<%= asDto('User') %>;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.repository.EntityManager;
 <%_ } _%>
@@ -96,9 +100,6 @@ import static org.mockito.Mockito.*;
 <%_ if (reactive && testsNeedCsrf) { _%>
 import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.csrf;
 <%_ } else if (!reactive) { _%>
-  <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
-import static org.hamcrest.Matchers.hasItems;
-  <%_ } _%>
 import static org.hamcrest.Matchers.hasItem;
   <%_ if (testsNeedCsrf) { _%>
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
@@ -171,13 +172,8 @@ class UserResourceIT {
 <%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
 
-    /**
-     * This repository is mocked in the <%= packageName %>.repository.search test package.
-     *
-     * @see <%= packageName %>.repository.search.UserSearchRepositoryMockConfiguration
-     */
     @Autowired
-    private UserSearchRepository mockUserSearchRepository;
+    private UserSearchRepository userSearchRepository;
 <%_ } _%>
 
     @Autowired
@@ -230,7 +226,7 @@ class UserResourceIT {
 <%_ } _%>
         user.setLogin(DEFAULT_LOGIN<% if (databaseTypeSql) { %> + RandomStringUtils.randomAlphabetic(5)<% } %>);
 <%_ if (!authenticationTypeOauth2) { _%>
-        user.setPassword(RandomStringUtils.random(60));
+        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
 <%_ } _%>
         user.setActivated(true);
         user.setEmail(<% if (databaseTypeSql) { %>RandomStringUtils.randomAlphabetic(5) + <% } %>DEFAULT_EMAIL);
@@ -267,9 +263,7 @@ class UserResourceIT {
 <%_ if (databaseTypeSql && reactive) { _%>
         userRepository.deleteAllUserAuthorities().block();
 <%_ } _%>
-<%_ if (!databaseTypeSql || reactive) { _%>
         userRepository.deleteAll()<% if (reactive) { %>.block()<% } %>;
-<%_ } _%>
         <%= asEntity('User') %> user = createEntity(<% if (databaseTypeSql ) { %>em<% } _%>);
 <%_ if (databaseTypeSql) { _%>
         user.setLogin(DEFAULT_LOGIN);
@@ -291,11 +285,6 @@ class UserResourceIT {
     void createUser() throws Exception {
         int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
             .collectList().block()<% } %>.size();
-  <%_ if (searchEngineElasticsearch && reactive) { _%>
-        // Configure the mock search repository
-        when(mockUserSearchRepository.save(any()))
-            .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
-  <%_ } _%>
 
         // Create the User
         ManagedUserVM managedUserVM = new ManagedUserVM();
@@ -338,6 +327,11 @@ class UserResourceIT {
   <%_ } _%>
             assertThat(testUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
         });
+  <%_ if (!databaseTypeSql) {_%>
+            userRepository.deleteAll();
+  <% } else if (searchEngineElasticsearch) { %>
+            userSearchRepository.deleteAll();
+  <%_ } _%>
     }
 
     @Test
@@ -385,6 +379,11 @@ class UserResourceIT {
 
         // Validate the User in the database
         assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
+  <%_ if (!databaseTypeSql) {_%>
+        userRepository.deleteAll();
+  <% } else if (searchEngineElasticsearch) { %>
+        userSearchRepository.deleteAll();
+  <%_ } _%>
     }
 
     @Test
@@ -393,9 +392,9 @@ class UserResourceIT {
   <%_ } _%>
     void createUserWithExistingLogin() throws Exception {
         // Initialize the database
-        userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+        userRepository.<%= saveMethod %>(user)<% if (reactive) { %>.block()<% } %>;
   <%_ if (searchEngineElasticsearch) { _%>
-        mockUserSearchRepository.save(user);
+        userSearchRepository.save(user)<% if (reactive) { %>.block()<% } %>;
   <%_ } _%>
         int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
             .collectList().block()<% } %>.size();
@@ -430,6 +429,11 @@ class UserResourceIT {
 
         // Validate the User in the database
         assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
+  <%_ if (!databaseTypeSql) {_%>
+        userRepository.deleteAll();
+  <% } else if (searchEngineElasticsearch) { %>
+        userSearchRepository.deleteAll();
+  <%_ } _%>
     }
 
     @Test
@@ -438,9 +442,9 @@ class UserResourceIT {
   <%_ } _%>
     void createUserWithExistingEmail() throws Exception {
         // Initialize the database
-        userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+        userRepository.<%= saveMethod %>(user)<% if (reactive) { %>.block()<% } %>;
   <%_ if (searchEngineElasticsearch) { _%>
-        mockUserSearchRepository.save(user);
+        userSearchRepository.save(user)<% if (reactive) { %>.block()<% } %>;
   <%_ } _%>
         int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
             .collectList().block()<% } %>.size();
@@ -475,6 +479,11 @@ class UserResourceIT {
 
         // Validate the User in the database
         assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
+  <%_ if (!databaseTypeSql) {_%>
+        userRepository.deleteAll();
+  <% } else if (searchEngineElasticsearch) { %>
+        userSearchRepository.deleteAll();
+  <%_ } _%>
     }
 
     @Test
@@ -483,7 +492,7 @@ class UserResourceIT {
   <%_ } _%>
     void getAllUsers()<% if (!reactive) { %> throws Exception<% } %> {
         // Initialize the database
-        userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %>save<% } %><% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+        userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %><%= saveMethod %><% } %>(user)<% if (reactive) { %>.block()<% } %>;
   <%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
         authorityRepository
             .findById(AuthoritiesConstants.USER)
@@ -524,6 +533,11 @@ class UserResourceIT {
             .andExpect(jsonPath("$.[*].imageUrl").value(hasItem(DEFAULT_IMAGEURL)))
     <%_ } _%>
             .andExpect(jsonPath("$.[*].langKey").value(hasItem(DEFAULT_LANGKEY)));
+  <%_ } _%>
+  <%_ if (!databaseTypeSql) {_%>
+        userRepository.deleteAll();
+  <% } else if (searchEngineElasticsearch) { %>
+        userSearchRepository.deleteAll();
   <%_ } _%>
     }
 
@@ -533,7 +547,7 @@ class UserResourceIT {
   <%_ } _%>
     void getUser()<% if (!reactive) { %> throws Exception<% } %> {
         // Initialize the database
-        userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %>save<% } %><% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+        userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %><%= saveMethod %><% } %>(user)<% if (reactive) { %>.block()<% } %>;
   <%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
         authorityRepository
             .findById(AuthoritiesConstants.USER)
@@ -542,7 +556,7 @@ class UserResourceIT {
   <%_ } _%>
 
   <%_ if (searchEngineElasticsearch) { _%>
-        mockUserSearchRepository.save(user);
+        userSearchRepository.save(user);
   <%_ } _%>
   <%_ if (cacheManagerIsAvailable) { _%>
 
@@ -589,6 +603,11 @@ class UserResourceIT {
         }
   <%_ } else if (cacheManagerIsAvailable) { _%>
         assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNotNull();
+  <%_ } _%>
+  <%_ if (!databaseTypeSql) {_%>
+        userRepository.deleteAll();
+  <% } else if (searchEngineElasticsearch) { %>
+        userSearchRepository.deleteAll();
   <%_ } _%>
     }
 
@@ -613,12 +632,7 @@ class UserResourceIT {
   <%_ } _%>
     void updateUser() throws Exception {
         // Initialize the database
-        userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
-  <%_ if (searchEngineElasticsearch && reactive) { _%>
-        // Configure the mock search repository
-        when(mockUserSearchRepository.save(any()))
-            .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
-  <%_ } _%>
+        userRepository.<%= saveMethod %>(user)<% if (reactive) { %>.block()<% } %>;
         int databaseSizeBeforeUpdate = userRepository.findAll()<% if (reactive) { %>
             .collectList().block()<% } %>.size();
 
@@ -671,6 +685,11 @@ class UserResourceIT {
   <%_ } _%>
             assertThat(testUser.getLangKey()).isEqualTo(UPDATED_LANGKEY);
         });
+  <%_ if (!databaseTypeSql) {_%>
+        userRepository.deleteAll();
+  <% } else if (searchEngineElasticsearch) { %>
+        userSearchRepository.deleteAll();
+  <%_ } _%>
     }
 
     @Test
@@ -679,12 +698,7 @@ class UserResourceIT {
   <%_ } _%>
     void updateUserLogin() throws Exception {
         // Initialize the database
-        userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
-  <%_ if (searchEngineElasticsearch && reactive) { _%>
-        // Configure the mock search repository
-        when(mockUserSearchRepository.save(any()))
-            .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
-  <%_ } _%>
+        userRepository.<%= saveMethod %>(user)<% if (reactive) { %>.block()<% } %>;
         int databaseSizeBeforeUpdate = userRepository.findAll()<% if (reactive) { %>
             .collectList().block()<% } %>.size();
 
@@ -738,6 +752,11 @@ class UserResourceIT {
   <%_ } _%>
             assertThat(testUser.getLangKey()).isEqualTo(UPDATED_LANGKEY);
         });
+  <%_ if (!databaseTypeSql) {_%>
+        userRepository.deleteAll();
+  <% } else if (searchEngineElasticsearch) { %>
+        userSearchRepository.deleteAll();
+  <%_ } _%>
     }
 
     @Test
@@ -746,9 +765,9 @@ class UserResourceIT {
   <%_ } _%>
     void updateUserExistingEmail() throws Exception {
         // Initialize the database with 2 users
-        userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+        userRepository.<%= saveMethod %>(user)<% if (reactive) { %>.block()<% } %>;
   <%_ if (searchEngineElasticsearch) { _%>
-        mockUserSearchRepository.save(user);
+        userSearchRepository.save(user);
   <%_ } _%>
 
         <%= asEntity('User') %> anotherUser = new <%= asEntity('User') %>();
@@ -756,7 +775,7 @@ class UserResourceIT {
         anotherUser.setId(UUID.randomUUID().toString());
   <%_ } _%>
         anotherUser.setLogin("jhipster");
-        anotherUser.setPassword(RandomStringUtils.random(60));
+        anotherUser.setPassword(RandomStringUtils.randomAlphanumeric(60));
         anotherUser.setActivated(true);
         anotherUser.setEmail("jhipster@localhost");
         anotherUser.setFirstName("java");
@@ -770,7 +789,7 @@ class UserResourceIT {
   <%_ } _%>
         userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(anotherUser)<% if (reactive) { %>.block()<% } %>;
   <%_ if (searchEngineElasticsearch) { _%>
-        mockUserSearchRepository.save(anotherUser);
+        userSearchRepository.save(anotherUser);
   <%_ } _%>
 
         // Update the user
@@ -808,6 +827,11 @@ class UserResourceIT {
             .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
             .with(csrf())<% } %>)
             .andExpect(status().isBadRequest());
+  <%_ } _%>
+  <%_ if (!databaseTypeSql) {_%>
+        userRepository.deleteAll();
+  <% } else if (searchEngineElasticsearch) { %>
+        userSearchRepository.deleteAll();
   <%_ } _%>
     }
 
@@ -817,9 +841,9 @@ class UserResourceIT {
   <%_ } _%>
     void updateUserExistingLogin() throws Exception {
         // Initialize the database
-        userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
+        userRepository.<%= saveMethod %>(user)<% if (reactive) { %>.block()<% } %>;
   <%_ if (searchEngineElasticsearch) { _%>
-        mockUserSearchRepository.save(user);
+        userSearchRepository.save(user);
   <%_ } _%>
 
         <%= asEntity('User') %> anotherUser = new <%= asEntity('User') %>();
@@ -827,7 +851,7 @@ class UserResourceIT {
         anotherUser.setId(UUID.randomUUID().toString());
   <%_ } _%>
         anotherUser.setLogin("jhipster");
-        anotherUser.setPassword(RandomStringUtils.random(60));
+        anotherUser.setPassword(RandomStringUtils.randomAlphanumeric(60));
         anotherUser.setActivated(true);
         anotherUser.setEmail("jhipster@localhost");
         anotherUser.setFirstName("java");
@@ -841,7 +865,7 @@ class UserResourceIT {
   <%_ } _%>
         userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(anotherUser)<% if (reactive) { %>.block()<% } %>;
   <%_ if (searchEngineElasticsearch) { _%>
-        mockUserSearchRepository.save(anotherUser);
+        userSearchRepository.save(anotherUser);
   <%_ } _%>
 
         // Update the user
@@ -879,6 +903,11 @@ class UserResourceIT {
             .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
             .with(csrf())<% } %>)
             .andExpect(status().isBadRequest());
+  <%_ } _%>
+  <%_ if (!databaseTypeSql) {_%>
+        userRepository.deleteAll();
+  <% } else if (searchEngineElasticsearch) { %>
+        userSearchRepository.deleteAll();
   <%_ } _%>
     }
 
@@ -888,11 +917,7 @@ class UserResourceIT {
   <%_ } _%>
     void deleteUser()<% if (!reactive) { %> throws Exception<% } %> {
         // Initialize the database
-        userRepository.save<% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
-  <%_ if (searchEngineElasticsearch && reactive) { _%>
-        // Configure the mock search repository
-        when(mockUserSearchRepository.delete(any())).thenReturn(Mono.empty());
-  <%_ } _%>
+        userRepository.<%= saveMethod %>(user)<% if (reactive) { %>.block()<% } %>;
         int databaseSizeBeforeDelete = userRepository.findAll()<% if (reactive) { %>
             .collectList().block()<% } %>.size();