generator-jhipster 8.4.0 → 8.6.0

package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/UserResourceIT.java.ejs

@@ -36,6 +36,9 @@ import <%= user.entityAbsoluteClass %>;
 import <%= packageName %>.repository.AuthorityRepository;
 <%_ } _%>
 import <%= packageName %>.repository.UserRepository;
+<%_ if (!requiresDeleteAllUsers) { _%>
+import <%= packageName %>.service.UserService;
+<%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
 import <%= packageName %>.repository.search.UserSearchRepository;
 <%_ } _%>
@@ -48,6 +51,7 @@ import <%= packageName %>.service.mapper.UserMapper;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +62,8 @@ import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMock
 <%_ } _%>
 <%_ if (cacheProviderAny) { _%>
 import org.springframework.cache.CacheManager;
+import org.springframework.cache.Cache;
+import java.util.Objects;
 <%_ } _%>
 <%_ if (cacheProviderMemcached) { _%>
 import org.springframework.cache.support.NoOpCacheManager;
@@ -83,9 +89,6 @@ import reactor.core.publisher.Mono;
 <%_ if (databaseTypeSql && !reactive) { _%>
 import jakarta.persistence.EntityManager;
 <%_ } _%>
-<%_ if (!databaseTypeCassandra) { _%>
-import java.time.Instant;
-<%_ } _%>
 import java.util.*;
 import java.util.function.Consumer;
 <%_ if (databaseTypeCassandra || databaseTypeCouchbase) { _%>
@@ -168,6 +171,11 @@ class UserResourceIT {
 
     @Autowired
     private UserRepository userRepository;
+<%_ if (!requiresDeleteAllUsers) { _%>
+
+    @Autowired
+    private UserService userService;
+<%_ } _%>
 <%_ if (databaseTypeSql && reactive) { _%>
 
     @Autowired
@@ -201,11 +209,12 @@ class UserResourceIT {
 
     private <%= user.persistClass %> user;
 
-<%_ if (cacheProviderAny) { _%>
+<%_ if (!databaseTypeCassandra && !requiresDeleteAllUsers) { _%>
+    private Long numberOfUsers;
+
     @BeforeEach
-    public void setup() {
-        cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).clear();
-        cacheManager.getCache(UserRepository.USERS_BY_EMAIL_CACHE).clear();
+    public void countUsers() {
+        numberOfUsers = userRepository.count()<%- reactorBlock %>;
     }
 
 <%_ } _%>
@@ -223,26 +232,26 @@ class UserResourceIT {
      * if they test an entity which has a required relationship to the User entity.
      */
     public static <%= user.persistClass %> createEntity(<% if (databaseTypeSql) { %>EntityManager em<% } %>) {
-        <%= user.persistClass %> user = new <%= user.persistClass %>();
+        <%= user.persistClass %> persistUser = new <%= user.persistClass %>();
 <%_ if (databaseTypeCassandra || (authenticationTypeOauth2 && !databaseTypeCouchbase)) { _%>
-        user.setId(UUID.randomUUID().toString());
+        persistUser.setId(UUID.randomUUID().toString());
 <%_ } _%>
-        user.setLogin(DEFAULT_LOGIN<% if (databaseTypeSql) { %> + RandomStringUtils.randomAlphabetic(5)<% } %>);
+        persistUser.setLogin(DEFAULT_LOGIN<% if (databaseTypeSql) { %> + RandomStringUtils.randomAlphabetic(5)<% } %>);
 <%_ if (!authenticationTypeOauth2) { _%>
-        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
+        persistUser.setPassword(RandomStringUtils.randomAlphanumeric(60));
 <%_ } _%>
-        user.setActivated(true);
-        user.setEmail(<% if (databaseTypeSql) { %>RandomStringUtils.randomAlphabetic(5) + <% } %>DEFAULT_EMAIL);
-        user.setFirstName(DEFAULT_FIRSTNAME);
-        user.setLastName(DEFAULT_LASTNAME);
+        persistUser.setActivated(true);
+        persistUser.setEmail(<% if (databaseTypeSql) { %>RandomStringUtils.randomAlphabetic(5) + <% } %>DEFAULT_EMAIL);
+        persistUser.setFirstName(DEFAULT_FIRSTNAME);
+        persistUser.setLastName(DEFAULT_LASTNAME);
 <%_ if (!databaseTypeCassandra) { _%>
-        user.setImageUrl(DEFAULT_IMAGEURL);
+        persistUser.setImageUrl(DEFAULT_IMAGEURL);
 <%_ } _%>
-        user.setLangKey(DEFAULT_LANGKEY);
+        persistUser.setLangKey(DEFAULT_LANGKEY);
 <%_ if (databaseTypeSql && reactive) { _%>
-        user.setCreatedBy(Constants.SYSTEM);
+        persistUser.setCreatedBy(Constants.SYSTEM);
 <%_ } _%>
-        return user;
+        return persistUser;
     }
 <%_ if (databaseTypeSql && reactive) { _%>
 
@@ -250,34 +259,49 @@ class UserResourceIT {
      * Delete all the users from the database.
      */
     public static void deleteEntities(EntityManager em) {
-        try {
-            em.deleteAll("<%= jhiTablePrefix %>_user_authority").block();
-            em.deleteAll(<%= user.persistClass %>.class).block();
-        } catch (Exception e) {
-            // It can fail, if other entities are still referring this - it will be removed later.
-        }
     }
 <%_ } _%>
 
     /**
      * Setups the database with one user.
      */
-    public static <%= user.persistClass %> initTestUser(UserRepository userRepository<% if (databaseTypeSql) { %>, EntityManager em<% } _%>) {
-<%_ if (databaseTypeSql && reactive) { _%>
-        userRepository.deleteAllUserAuthorities().block();
-<%_ } _%>
-        userRepository.deleteAll()<% if (reactive) { %>.block()<% } %>;
-        <%= user.persistClass %> user = createEntity(<% if (databaseTypeSql ) { %>em<% } _%>);
+    public static <%= user.persistClass %> initTestUser(<% if (databaseTypeSql) { %>EntityManager em<% } _%>) {
+        <%= user.persistClass %> persistUser = createEntity(<% if (databaseTypeSql ) { %>em<% } _%>);
 <%_ if (databaseTypeSql) { _%>
-        user.setLogin(DEFAULT_LOGIN);
-        user.setEmail(DEFAULT_EMAIL);
+        persistUser.setLogin(DEFAULT_LOGIN);
+        persistUser.setEmail(DEFAULT_EMAIL);
 <%_ } _%>
-        return user;
+        return persistUser;
     }
 
     @BeforeEach
     public void initTest() {
-        user = initTestUser(userRepository<% if (databaseTypeSql) { %>, em<% } _%>);
+        user = initTestUser(<% if (databaseTypeSql) { %>em<% } _%>);
+    }
+
+    @AfterEach
+    public void cleanupAndCheck() {
+<%_ if (cacheProviderAny) { _%>
+    cacheManager.getCacheNames().stream()
+        .map(cacheName -> this.cacheManager.getCache(cacheName))
+        .filter(Objects::nonNull)
+        .forEach(Cache::clear);
+<%_ } _%>
+<%_ if (requiresDeleteAllUsers) { _%>
+    <%_ if (databaseTypeSql && reactive) { _%>
+        userRepository.deleteAllUserAuthorities()<%- reactorBlock %>;
+    <%_ } _%>
+        userRepository.deleteAll()<%- reactorBlock %>;
+<%_ } else { _%>
+        userService.deleteUser(DEFAULT_LOGIN)<%- reactorBlock %>;
+        userService.deleteUser(UPDATED_LOGIN)<%- reactorBlock %>;
+        userService.deleteUser(user.getLogin())<%- reactorBlock %>;
+        userService.deleteUser("anotherlogin")<%- reactorBlock %>;
+<%_ } _%>
+<%_ if (!databaseTypeCassandra && !requiresDeleteAllUsers) { _%>
+        assertThat(userRepository.count()<%- reactorBlock %>).isEqualTo(numberOfUsers);
+        numberOfUsers = null;
+<%_ } _%>
     }
 <%_ if (!authenticationTypeOauth2) { _%>
 
@@ -286,54 +310,52 @@ class UserResourceIT {
     @Transactional
   <%_ } _%>
     void createUser() throws Exception {
-        int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
-            .collectList().block()<% } %>.size();
-
         // Create the User
-        <%= user.adminUserDto %> user = new <%= user.adminUserDto %>();
-        user.setLogin(DEFAULT_LOGIN);
-        user.setFirstName(DEFAULT_FIRSTNAME);
-        user.setLastName(DEFAULT_LASTNAME);
-        user.setEmail(DEFAULT_EMAIL);
-        user.setActivated(true);
+        <%= user.adminUserDto %> userDTO = new <%= user.adminUserDto %>();
+        userDTO.setLogin(DEFAULT_LOGIN);
+        userDTO.setFirstName(DEFAULT_FIRSTNAME);
+        userDTO.setLastName(DEFAULT_LASTNAME);
+        userDTO.setEmail(DEFAULT_EMAIL);
+        userDTO.setActivated(true);
   <%_ if (!databaseTypeCassandra) { _%>
-        user.setImageUrl(DEFAULT_IMAGEURL);
+        userDTO.setImageUrl(DEFAULT_IMAGEURL);
   <%_ } _%>
-        user.setLangKey(DEFAULT_LANGKEY);
-        user.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+        userDTO.setLangKey(DEFAULT_LANGKEY);
+        userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
 
   <%_ if (reactive) { _%>
-        webTestClient.post().uri("/api/admin/users")
+        var returned<%- restClass %> = webTestClient.post().uri("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(om.writeValueAsBytes(user))
+            .bodyValue(om.writeValueAsBytes(userDTO))
             .exchange()
-            .expectStatus().isCreated();
+            .expectStatus().isCreated()
+            .expectBody(<%= user.adminUserDto %>.class)
+            .returnResult()
+            .getResponseBody();
   <%_ } else { _%>
-        restUserMockMvc.perform(post("/api/admin/users")
-            .contentType(MediaType.APPLICATION_JSON)
-            .content(om.writeValueAsBytes(user))<% if (authenticationUsesCsrf) { %>
-            .with(csrf())<% } %>)
-            .andExpect(status().isCreated());
-  <%_ } _%>
-
-        // Validate the User in the database
-        assertPersistedUsers(users -> {
-            assertThat(users).hasSize(databaseSizeBeforeCreate + 1);
-            <%= user.persistClass %> testUser = users.get(users.size() - 1);
-            assertThat(testUser.getLogin()).isEqualTo(DEFAULT_LOGIN);
-            assertThat(testUser.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
-            assertThat(testUser.getLastName()).isEqualTo(DEFAULT_LASTNAME);
-            assertThat(testUser.getEmail()).isEqualTo(DEFAULT_EMAIL);
+        var returned<%- restClass %> = om.readValue(
+            restUserMockMvc.perform(post("/api/admin/users")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(om.writeValueAsBytes(userDTO))<% if (authenticationUsesCsrf) { %>
+                .with(csrf())<% } %>)
+                .andExpect(status().isCreated())
+                .andReturn()
+                .getResponse()
+                .getContentAsString(),
+            <%= user.adminUserDto %>.class
+        );
+  <%_ } _%>
+
+        <%= user.persistClass %> convertedUser = userMapper.userDTOToUser(returned<%- restClass %>);
+        // Validate the returned User
+        assertThat(convertedUser.getLogin()).isEqualTo(DEFAULT_LOGIN);
+        assertThat(convertedUser.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
+        assertThat(convertedUser.getLastName()).isEqualTo(DEFAULT_LASTNAME);
+        assertThat(convertedUser.getEmail()).isEqualTo(DEFAULT_EMAIL);
   <%_ if (!databaseTypeCassandra) { _%>
-            assertThat(testUser.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
-  <%_ } _%>
-            assertThat(testUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
-        });
-  <%_ if (!databaseTypeSql) {_%>
-            userRepository.deleteAll();
-  <% } else if (searchEngineElasticsearch) { %>
-            userSearchRepository.deleteAll();
+        assertThat(convertedUser.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
   <%_ } _%>
+        assertThat(convertedUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
     }
 
     @Test
@@ -344,47 +366,42 @@ class UserResourceIT {
         int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
             .collectList().block()<% } %>.size();
 
-        <%= user.adminUserDto %> user = new <%= user.adminUserDto %>();
+        <%= user.adminUserDto %> userDTO = new <%= user.adminUserDto %>();
   <%_ if (databaseTypeCassandra) { _%>
-        user.setId(UUID.randomUUID().toString());
+        userDTO.setId(UUID.randomUUID().toString());
   <%_ } else if (databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
-        user.setId("1L");
+        userDTO.setId("1L");
   <%_ } else { _%>
-        user.setId(DEFAULT_ID);
+        userDTO.setId(DEFAULT_ID);
   <%_ } _%>
-        user.setLogin(DEFAULT_LOGIN);
-        user.setFirstName(DEFAULT_FIRSTNAME);
-        user.setLastName(DEFAULT_LASTNAME);
-        user.setEmail(DEFAULT_EMAIL);
-        user.setActivated(true);
+        userDTO.setLogin(DEFAULT_LOGIN);
+        userDTO.setFirstName(DEFAULT_FIRSTNAME);
+        userDTO.setLastName(DEFAULT_LASTNAME);
+        userDTO.setEmail(DEFAULT_EMAIL);
+        userDTO.setActivated(true);
   <%_ if (!databaseTypeCassandra) { _%>
-        user.setImageUrl(DEFAULT_IMAGEURL);
+        userDTO.setImageUrl(DEFAULT_IMAGEURL);
   <%_ } _%>
-        user.setLangKey(DEFAULT_LANGKEY);
-        user.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+        userDTO.setLangKey(DEFAULT_LANGKEY);
+        userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
 
         // An entity with an existing ID cannot be created, so this API call must fail
   <%_ if (reactive) { _%>
         webTestClient.post().uri("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(om.writeValueAsBytes(user))
+            .bodyValue(om.writeValueAsBytes(userDTO))
             .exchange()
             .expectStatus().isBadRequest();
   <%_ } else { _%>
         restUserMockMvc.perform(post("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
-            .content(om.writeValueAsBytes(user))<% if (authenticationUsesCsrf) { %>
+            .content(om.writeValueAsBytes(userDTO))<% if (authenticationUsesCsrf) { %>
             .with(csrf())<% } %>)
             .andExpect(status().isBadRequest());
   <%_ } _%>
 
         // Validate the User in the database
         assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
-  <%_ if (!databaseTypeSql) {_%>
-        userRepository.deleteAll();
-  <% } else if (searchEngineElasticsearch) { %>
-        userSearchRepository.deleteAll();
-  <%_ } _%>
     }
 
     @Test
@@ -400,40 +417,35 @@ class UserResourceIT {
         int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
             .collectList().block()<% } %>.size();
 
-        <%= user.adminUserDto %> user = new <%= user.adminUserDto %>();
-        user.setLogin(DEFAULT_LOGIN);// this login should already be used
-        user.setFirstName(DEFAULT_FIRSTNAME);
-        user.setLastName(DEFAULT_LASTNAME);
-        user.setEmail("anothermail@localhost");
-        user.setActivated(true);
+        <%= user.adminUserDto %> userDTO = new <%= user.adminUserDto %>();
+        userDTO.setLogin(DEFAULT_LOGIN);// this login should already be used
+        userDTO.setFirstName(DEFAULT_FIRSTNAME);
+        userDTO.setLastName(DEFAULT_LASTNAME);
+        userDTO.setEmail("anothermail@localhost");
+        userDTO.setActivated(true);
   <%_ if (!databaseTypeCassandra) { _%>
-        user.setImageUrl(DEFAULT_IMAGEURL);
+        userDTO.setImageUrl(DEFAULT_IMAGEURL);
   <%_ } _%>
-        user.setLangKey(DEFAULT_LANGKEY);
-        user.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+        userDTO.setLangKey(DEFAULT_LANGKEY);
+        userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
 
         // Create the User
   <%_ if (reactive) { _%>
         webTestClient.post().uri("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(om.writeValueAsBytes(user))
+            .bodyValue(om.writeValueAsBytes(userDTO))
             .exchange()
             .expectStatus().isBadRequest();
   <%_ } else { _%>
         restUserMockMvc.perform(post("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
-            .content(om.writeValueAsBytes(user))<% if (authenticationUsesCsrf) { %>
+            .content(om.writeValueAsBytes(userDTO))<% if (authenticationUsesCsrf) { %>
             .with(csrf())<% } %>)
             .andExpect(status().isBadRequest());
   <%_ } _%>
 
         // Validate the User in the database
         assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
-  <%_ if (!databaseTypeSql) {_%>
-        userRepository.deleteAll();
-  <% } else if (searchEngineElasticsearch) { %>
-        userSearchRepository.deleteAll();
-  <%_ } _%>
     }
 
     @Test
@@ -449,17 +461,17 @@ class UserResourceIT {
         int databaseSizeBeforeCreate = userRepository.findAll()<% if (reactive) { %>
             .collectList().block()<% } %>.size();
 
-        <%= user.adminUserDto %> user = new <%= user.adminUserDto %>();
-        user.setLogin("anotherlogin");
-        user.setFirstName(DEFAULT_FIRSTNAME);
-        user.setLastName(DEFAULT_LASTNAME);
-        user.setEmail(DEFAULT_EMAIL);// this email should already be used
-        user.setActivated(true);
+        <%= user.adminUserDto %> userDTO = new <%= user.adminUserDto %>();
+        userDTO.setLogin("anotherlogin");
+        userDTO.setFirstName(DEFAULT_FIRSTNAME);
+        userDTO.setLastName(DEFAULT_LASTNAME);
+        userDTO.setEmail(DEFAULT_EMAIL);// this email should already be used
+        userDTO.setActivated(true);
   <%_ if (!databaseTypeCassandra) { _%>
-        user.setImageUrl(DEFAULT_IMAGEURL);
+        userDTO.setImageUrl(DEFAULT_IMAGEURL);
   <%_ } _%>
-        user.setLangKey(DEFAULT_LANGKEY);
-        user.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+        userDTO.setLangKey(DEFAULT_LANGKEY);
+        userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
 
         // Create the User
   <%_ if (reactive) { _%>
@@ -471,18 +483,13 @@ class UserResourceIT {
   <%_ } else { _%>
         restUserMockMvc.perform(post("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
-            .content(om.writeValueAsBytes(user))<% if (authenticationUsesCsrf) { %>
+            .content(om.writeValueAsBytes(userDTO))<% if (authenticationUsesCsrf) { %>
             .with(csrf())<% } %>)
             .andExpect(status().isBadRequest());
   <%_ } _%>
 
         // Validate the User in the database
         assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
-  <%_ if (!databaseTypeSql) {_%>
-        userRepository.deleteAll();
-  <% } else if (searchEngineElasticsearch) { %>
-        userSearchRepository.deleteAll();
-  <%_ } _%>
     }
 
     @Test
@@ -492,12 +499,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) { _%>
@@ -516,9 +517,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))
@@ -532,11 +530,6 @@ 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();
   <%_ } _%>
     }
 
@@ -547,12 +540,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);
@@ -576,12 +563,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())
@@ -602,11 +584,6 @@ class UserResourceIT {
         }
   <%_ } else if (cacheProviderAny) { _%>
         assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNotNull();
-  <%_ } _%>
-  <%_ if (!databaseTypeSql) {_%>
-        userRepository.deleteAll();
-  <% } else if (searchEngineElasticsearch) { %>
-        userSearchRepository.deleteAll();
   <%_ } _%>
     }
 
@@ -638,35 +615,35 @@ class UserResourceIT {
         // Update the user
         <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>orElseThrow<% } %>();
 
-        <%= user.adminUserDto %> user = new <%= user.adminUserDto %>();
-        user.setId(updatedUser.getId());
-        user.setLogin(updatedUser.getLogin());
-        user.setFirstName(UPDATED_FIRSTNAME);
-        user.setLastName(UPDATED_LASTNAME);
-        user.setEmail(UPDATED_EMAIL);
-        user.setActivated(updatedUser.isActivated());
+        <%= user.adminUserDto %> userDTO = new <%= user.adminUserDto %>();
+        userDTO.setId(updatedUser.getId());
+        userDTO.setLogin(updatedUser.getLogin());
+        userDTO.setFirstName(UPDATED_FIRSTNAME);
+        userDTO.setLastName(UPDATED_LASTNAME);
+        userDTO.setEmail(UPDATED_EMAIL);
+        userDTO.setActivated(updatedUser.isActivated());
   <%_ if (!databaseTypeCassandra) { _%>
-        user.setImageUrl(UPDATED_IMAGEURL);
+        userDTO.setImageUrl(UPDATED_IMAGEURL);
   <%_ } _%>
-        user.setLangKey(UPDATED_LANGKEY);
+        userDTO.setLangKey(UPDATED_LANGKEY);
   <%_ if (!databaseTypeCassandra) { _%>
-        user.setCreatedBy(updatedUser.getCreatedBy());
-        user.setCreatedDate(updatedUser.getCreatedDate());
-        user.setLastModifiedBy(updatedUser.getLastModifiedBy());
-        user.setLastModifiedDate(updatedUser.getLastModifiedDate());
+        userDTO.setCreatedBy(updatedUser.getCreatedBy());
+        userDTO.setCreatedDate(updatedUser.getCreatedDate());
+        userDTO.setLastModifiedBy(updatedUser.getLastModifiedBy());
+        userDTO.setLastModifiedDate(updatedUser.getLastModifiedDate());
   <%_ } _%>
-        user.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+        userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
 
   <%_ if (reactive) { _%>
         webTestClient.put().uri("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(om.writeValueAsBytes(user))
+            .bodyValue(om.writeValueAsBytes(userDTO))
             .exchange()
             .expectStatus().isOk();
   <%_ } else { _%>
         restUserMockMvc.perform(put("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
-            .content(om.writeValueAsBytes(user))<% if (authenticationUsesCsrf) { %>
+            .content(om.writeValueAsBytes(userDTO))<% if (authenticationUsesCsrf) { %>
             .with(csrf())<% } %>)
             .andExpect(status().isOk());
   <%_ } _%>
@@ -683,11 +660,6 @@ class UserResourceIT {
   <%_ } _%>
             assertThat(testUser.getLangKey()).isEqualTo(UPDATED_LANGKEY);
         });
-  <%_ if (!databaseTypeSql) {_%>
-        userRepository.deleteAll();
-  <% } else if (searchEngineElasticsearch) { %>
-        userSearchRepository.deleteAll();
-  <%_ } _%>
     }
 
     @Test
@@ -703,35 +675,35 @@ class UserResourceIT {
         // Update the user
         <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>orElseThrow<% } %>();
 
-        <%= user.adminUserDto %> user = new <%= user.adminUserDto %>();
-        user.setId(updatedUser.getId());
-        user.setLogin(UPDATED_LOGIN);
-        user.setFirstName(UPDATED_FIRSTNAME);
-        user.setLastName(UPDATED_LASTNAME);
-        user.setEmail(UPDATED_EMAIL);
-        user.setActivated(updatedUser.isActivated());
+        <%= user.adminUserDto %> userDTO = new <%= user.adminUserDto %>();
+        userDTO.setId(updatedUser.getId());
+        userDTO.setLogin(UPDATED_LOGIN);
+        userDTO.setFirstName(UPDATED_FIRSTNAME);
+        userDTO.setLastName(UPDATED_LASTNAME);
+        userDTO.setEmail(UPDATED_EMAIL);
+        userDTO.setActivated(updatedUser.isActivated());
   <%_ if (!databaseTypeCassandra) { _%>
-        user.setImageUrl(UPDATED_IMAGEURL);
+        userDTO.setImageUrl(UPDATED_IMAGEURL);
   <%_ } _%>
-        user.setLangKey(UPDATED_LANGKEY);
+        userDTO.setLangKey(UPDATED_LANGKEY);
   <%_ if (!databaseTypeCassandra) { _%>
-        user.setCreatedBy(updatedUser.getCreatedBy());
-        user.setCreatedDate(updatedUser.getCreatedDate());
-        user.setLastModifiedBy(updatedUser.getLastModifiedBy());
-        user.setLastModifiedDate(updatedUser.getLastModifiedDate());
+        userDTO.setCreatedBy(updatedUser.getCreatedBy());
+        userDTO.setCreatedDate(updatedUser.getCreatedDate());
+        userDTO.setLastModifiedBy(updatedUser.getLastModifiedBy());
+        userDTO.setLastModifiedDate(updatedUser.getLastModifiedDate());
   <%_ } _%>
-        user.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+        userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
 
   <%_ if (reactive) { _%>
         webTestClient.put().uri("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(om.writeValueAsBytes(user))
+            .bodyValue(om.writeValueAsBytes(userDTO))
             .exchange()
             .expectStatus().isOk();
   <%_ } else { _%>
         restUserMockMvc.perform(put("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
-            .content(om.writeValueAsBytes(user))<% if (authenticationUsesCsrf) { %>
+            .content(om.writeValueAsBytes(userDTO))<% if (authenticationUsesCsrf) { %>
             .with(csrf())<% } %>)
             .andExpect(status().isOk());
   <%_ } _%>
@@ -749,11 +721,6 @@ class UserResourceIT {
   <%_ } _%>
             assertThat(testUser.getLangKey()).isEqualTo(UPDATED_LANGKEY);
         });
-  <%_ if (!databaseTypeSql) {_%>
-        userRepository.deleteAll();
-  <% } else if (searchEngineElasticsearch) { %>
-        userSearchRepository.deleteAll();
-  <%_ } _%>
     }
 
     @Test
@@ -792,42 +759,37 @@ class UserResourceIT {
         // Update the user
         <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>orElseThrow<% } %>();
 
-        <%= user.adminUserDto %> user = new <%= user.adminUserDto %>();
-        user.setId(updatedUser.getId());
-        user.setLogin(updatedUser.getLogin());
-        user.setFirstName(updatedUser.getFirstName());
-        user.setLastName(updatedUser.getLastName());
-        user.setEmail("jhipster@localhost");// this email should already be used by anotherUser
-        user.setActivated(updatedUser.isActivated());
+        <%= user.adminUserDto %> userDTO = new <%= user.adminUserDto %>();
+        userDTO.setId(updatedUser.getId());
+        userDTO.setLogin(updatedUser.getLogin());
+        userDTO.setFirstName(updatedUser.getFirstName());
+        userDTO.setLastName(updatedUser.getLastName());
+        userDTO.setEmail("jhipster@localhost");// this email should already be used by anotherUser
+        userDTO.setActivated(updatedUser.isActivated());
   <%_ if (!databaseTypeCassandra) { _%>
-        user.setImageUrl(updatedUser.getImageUrl());
+        userDTO.setImageUrl(updatedUser.getImageUrl());
   <%_ } _%>
-        user.setLangKey(updatedUser.getLangKey());
+        userDTO.setLangKey(updatedUser.getLangKey());
   <%_ if (!databaseTypeCassandra) { _%>
-        user.setCreatedBy(updatedUser.getCreatedBy());
-        user.setCreatedDate(updatedUser.getCreatedDate());
-        user.setLastModifiedBy(updatedUser.getLastModifiedBy());
-        user.setLastModifiedDate(updatedUser.getLastModifiedDate());
+        userDTO.setCreatedBy(updatedUser.getCreatedBy());
+        userDTO.setCreatedDate(updatedUser.getCreatedDate());
+        userDTO.setLastModifiedBy(updatedUser.getLastModifiedBy());
+        userDTO.setLastModifiedDate(updatedUser.getLastModifiedDate());
   <%_ } _%>
-        user.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+        userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
 
   <%_ if (reactive) { _%>
         webTestClient.put().uri("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(om.writeValueAsBytes(user))
+            .bodyValue(om.writeValueAsBytes(userDTO))
             .exchange()
             .expectStatus().isBadRequest();
   <%_ } else { _%>
         restUserMockMvc.perform(put("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
-            .content(om.writeValueAsBytes(user))<% if (authenticationUsesCsrf) { %>
+            .content(om.writeValueAsBytes(userDTO))<% if (authenticationUsesCsrf) { %>
             .with(csrf())<% } %>)
             .andExpect(status().isBadRequest());
-  <%_ } _%>
-  <%_ if (!databaseTypeSql) {_%>
-        userRepository.deleteAll();
-  <% } else if (searchEngineElasticsearch) { %>
-        userSearchRepository.deleteAll();
   <%_ } _%>
     }
 
@@ -867,42 +829,37 @@ class UserResourceIT {
         // Update the user
         <%= user.persistClass %> updatedUser = userRepository.findById(user.getId()).<% if (reactive) { %>block<% } else { %>orElseThrow<% } %>();
 
-        <%= user.adminUserDto %> user = new <%= user.adminUserDto %>();
-        user.setId(updatedUser.getId());
-        user.setLogin("jhipster");// this login should already be used by anotherUser
-        user.setFirstName(updatedUser.getFirstName());
-        user.setLastName(updatedUser.getLastName());
-        user.setEmail(updatedUser.getEmail());
-        user.setActivated(updatedUser.isActivated());
+        <%= user.adminUserDto %> userDTO = new <%= user.adminUserDto %>();
+        userDTO.setId(updatedUser.getId());
+        userDTO.setLogin("jhipster");// this login should already be used by anotherUser
+        userDTO.setFirstName(updatedUser.getFirstName());
+        userDTO.setLastName(updatedUser.getLastName());
+        userDTO.setEmail(updatedUser.getEmail());
+        userDTO.setActivated(updatedUser.isActivated());
   <%_ if (!databaseTypeCassandra) { _%>
-        user.setImageUrl(updatedUser.getImageUrl());
+        userDTO.setImageUrl(updatedUser.getImageUrl());
   <%_ } _%>
-        user.setLangKey(updatedUser.getLangKey());
+        userDTO.setLangKey(updatedUser.getLangKey());
   <%_ if (!databaseTypeCassandra) { _%>
-        user.setCreatedBy(updatedUser.getCreatedBy());
-        user.setCreatedDate(updatedUser.getCreatedDate());
-        user.setLastModifiedBy(updatedUser.getLastModifiedBy());
-        user.setLastModifiedDate(updatedUser.getLastModifiedDate());
+        userDTO.setCreatedBy(updatedUser.getCreatedBy());
+        userDTO.setCreatedDate(updatedUser.getCreatedDate());
+        userDTO.setLastModifiedBy(updatedUser.getLastModifiedBy());
+        userDTO.setLastModifiedDate(updatedUser.getLastModifiedDate());
   <%_ } _%>
-        user.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
+        userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
 
   <%_ if (reactive) { _%>
         webTestClient.put().uri("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
-            .bodyValue(om.writeValueAsBytes(user))
+            .bodyValue(om.writeValueAsBytes(userDTO))
             .exchange()
             .expectStatus().isBadRequest();
   <%_ } else { _%>
         restUserMockMvc.perform(put("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
-            .content(om.writeValueAsBytes(user))<% if (authenticationUsesCsrf) { %>
+            .content(om.writeValueAsBytes(userDTO))<% if (authenticationUsesCsrf) { %>
             .with(csrf())<% } %>)
             .andExpect(status().isBadRequest());
-  <%_ } _%>
-  <%_ if (!databaseTypeSql) {_%>
-        userRepository.deleteAll();
-  <% } else if (searchEngineElasticsearch) { %>
-        userSearchRepository.deleteAll();
   <%_ } _%>
     }
 
@@ -952,86 +909,6 @@ class UserResourceIT {
         assertThat(user1).isNotEqualTo(user2);
     }
 
-    @Test
-    void testUserDTOtoUser() {
-        <%= user.adminUserDto %> userDTO = new <%= user.adminUserDto %>();
-        userDTO.setId(DEFAULT_ID);
-        userDTO.setLogin(DEFAULT_LOGIN);
-        userDTO.setFirstName(DEFAULT_FIRSTNAME);
-        userDTO.setLastName(DEFAULT_LASTNAME);
-        userDTO.setEmail(DEFAULT_EMAIL);
-        userDTO.setActivated(true);
-<%_ if (!databaseTypeCassandra) { _%>
-        userDTO.setImageUrl(DEFAULT_IMAGEURL);
-<%_ } _%>
-        userDTO.setLangKey(DEFAULT_LANGKEY);
-<%_ if (!databaseTypeCassandra) { _%>
-        userDTO.setCreatedBy(DEFAULT_LOGIN);
-        userDTO.setLastModifiedBy(DEFAULT_LOGIN);
-<%_ } _%>
-        userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
-
-        <%= user.persistClass %> user = userMapper.userDTOToUser(userDTO);
-        assertThat(user.getId()).isEqualTo(DEFAULT_ID);
-        assertThat(user.getLogin()).isEqualTo(DEFAULT_LOGIN);
-        assertThat(user.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
-        assertThat(user.getLastName()).isEqualTo(DEFAULT_LASTNAME);
-        assertThat(user.getEmail()).isEqualTo(DEFAULT_EMAIL);
-        assertThat(user.isActivated()).isTrue();
-<%_ if (!databaseTypeCassandra) { _%>
-        assertThat(user.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
-<%_ } _%>
-        assertThat(user.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
-<%_ if (!databaseTypeCassandra) { _%>
-        assertThat(user.getCreatedBy()).isNull();
-        assertThat(user.getCreatedDate()).isNotNull();
-        assertThat(user.getLastModifiedBy()).isNull();
-        assertThat(user.getLastModifiedDate()).isNotNull();
-<%_ } _%>
-        assertThat(user.getAuthorities())<% if (!databaseTypeCassandra && !databaseTypeCouchbase) { %>.extracting("name")<%_ } _%>.containsExactly(AuthoritiesConstants.USER);
-    }
-
-    @Test
-    void testUserToUserDTO() {
-        user.setId(DEFAULT_ID);
-<%_ if (!databaseTypeCassandra) { _%>
-        user.setCreatedBy(DEFAULT_LOGIN);
-        user.setCreatedDate(Instant.now());
-        user.setLastModifiedBy(DEFAULT_LOGIN);
-        user.setLastModifiedDate(Instant.now());
-<%_ } _%>
-<%_ if (!databaseTypeCassandra && !databaseTypeCouchbase) { _%>
-        Set<Authority> authorities = new HashSet<>();
-        Authority authority = new Authority();
-        authority.setName(AuthoritiesConstants.USER);
-        authorities.add(authority);
-        user.setAuthorities(authorities);
-<%_ } else { _%>
-        user.setAuthorities(Stream.of(AuthoritiesConstants.USER).collect(Collectors.toSet()));
-<%_ } _%>
-
-        <%= user.adminUserDto %> userDTO = userMapper.userToAdminUserDTO(user);
-
-        assertThat(userDTO.getId()).isEqualTo(DEFAULT_ID);
-        assertThat(userDTO.getLogin()).isEqualTo(DEFAULT_LOGIN);
-        assertThat(userDTO.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
-        assertThat(userDTO.getLastName()).isEqualTo(DEFAULT_LASTNAME);
-        assertThat(userDTO.getEmail()).isEqualTo(DEFAULT_EMAIL);
-        assertThat(userDTO.isActivated()).isTrue();
-<%_ if (!databaseTypeCassandra) { _%>
-        assertThat(userDTO.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
-<%_ } _%>
-        assertThat(userDTO.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
-<%_ if (!databaseTypeCassandra) { _%>
-        assertThat(userDTO.getCreatedBy()).isEqualTo(DEFAULT_LOGIN);
-        assertThat(userDTO.getCreatedDate()).isEqualTo(user.getCreatedDate());
-        assertThat(userDTO.getLastModifiedBy()).isEqualTo(DEFAULT_LOGIN);
-        assertThat(userDTO.getLastModifiedDate()).isEqualTo(user.getLastModifiedDate());
-<%_ } _%>
-        assertThat(userDTO.getAuthorities()).containsExactly(AuthoritiesConstants.USER);
-        assertThat(userDTO.toString()).isNotNull();
-    }
-
     private void assertPersistedUsers(Consumer<List<<%= user.persistClass %>>> userAssertion) {
 <%_ if (databaseTypeCouchbase) { _%>
         // The security filter chain clears the security context after remote calls