generator-jhipster 7.5.0 → 7.8.0

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.
@@ -18,9 +18,6 @@
 -%>
 package <%= packageName %>.web.rest;
 
-<%_ if (databaseTypeCassandra) { _%>
-import <%= packageName %>.AbstractCassandraTest;
-<%_ } _%>
 import <%= packageName %>.IntegrationTest;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.config.Constants;
@@ -40,7 +37,7 @@ import <%= packageName %>.security.AuthoritiesConstants;
 import <%= packageName %>.service.dto.<%= asDto('AdminUser') %>;
 import <%= packageName %>.service.dto.<%= asDto('User') %>;
 <%_ if (databaseTypeSql && reactive) { _%>
-import <%= packageName %>.service.EntityManager;
+import <%= packageName %>.repository.EntityManager;
 <%_ } _%>
 import <%= packageName %>.service.mapper.UserMapper;
 <%_ if (!authenticationTypeOauth2) { _%>
@@ -50,10 +47,10 @@ import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-<%_ if (!reactive) { _%>
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-<%_ } else { _%>
+<%_ if (reactive) { _%>
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
+<%_ } else { _%>
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 <%_ } _%>
 <%_ if (cacheManagerIsAvailable) { _%>
 import org.springframework.cache.CacheManager;
@@ -69,8 +66,7 @@ import org.springframework.security.test.context.TestSecurityContextHolder;
 import org.springframework.security.test.context.support.WithMockUser;
 <%_ if (reactive) { _%>
 import org.springframework.test.web.reactive.server.WebTestClient;
-<%_ } _%>
-<%_ if (!reactive) { _%>
+<%_ } else { _%>
 import org.springframework.test.web.servlet.MockMvc;
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive) { _%>
@@ -97,31 +93,31 @@ import static org.assertj.core.api.Assertions.assertThat;
 <%_ if (reactive && searchEngineElasticsearch) { _%>
 import static org.mockito.Mockito.*;
 <%_ } _%>
-<%_ if (!reactive) { _%>
-    <%_ if (databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) { _%>
+<%_ 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) { _%>
+  <%_ if (testsNeedCsrf) { _%>
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
-    <%_ } _%>
+  <%_ } _%>
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-<%_ } else if (testsNeedCsrf) { _%>
-import static org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.csrf;
 <%_ } _%>
 
 /**
  * Integration tests for the {@link UserResource} REST controller.
  */
-<%_ if (!reactive) { _%>
-@AutoConfigureMockMvc
+<%_ if (reactive) { _%>
+@AutoConfigureWebTestClient(timeout = IntegrationTest.DEFAULT_TIMEOUT)
 <%_ } else { _%>
-@AutoConfigureWebTestClient
+@AutoConfigureMockMvc
 <%_ } _%>
 @WithMockUser(authorities = AuthoritiesConstants.ADMIN)
 @IntegrationTest
-class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandraTest <% } %>{
+class UserResourceIT {
 
     private static final String DEFAULT_LOGIN = "johndoe";
 <%_ if (!authenticationTypeOauth2) { _%>
@@ -129,7 +125,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
 <%_ } _%>
 
 <%_ if (databaseTypeCouchbase) { _%>
-    private static final String DEFAULT_ID = <%= asEntity('User') %>.PREFIX + DEFAULT_LOGIN;
+    private static final String DEFAULT_ID = DEFAULT_LOGIN;
 <%_ } else { _%>
     private static final <%= user.primaryKey.type %> DEFAULT_ID = <%- getPrimaryKeyValue(user.primaryKey.type) %>;
 <%_ } _%>
@@ -267,7 +263,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
     /**
      * Setups the database with one user.
      */
-    public static <%= asEntity('User') %> initTestUser(UserRepository userRepository<% if (databaseTypeSql ) { %>, EntityManager em<% } _%>) {
+    public static <%= asEntity('User') %> initTestUser(UserRepository userRepository<% if (databaseTypeSql) { %>, EntityManager em<% } _%>) {
 <%_ if (databaseTypeSql && reactive) { _%>
         userRepository.deleteAllUserAuthorities().block();
 <%_ } _%>
@@ -315,18 +311,18 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
         managedUserVM.setLangKey(DEFAULT_LANGKEY);
         managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
 
-  <%_ if (!reactive) { _%>
-        restUserMockMvc.perform(post("/api/admin/users")
-            .contentType(MediaType.APPLICATION_JSON)
-            .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
-            .with(csrf())<% } %>)
-            .andExpect(status().isCreated());
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
         webTestClient.post().uri("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
             .exchange()
             .expectStatus().isCreated();
+  <%_ } else { _%>
+        restUserMockMvc.perform(post("/api/admin/users")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
+            .with(csrf())<% } %>)
+            .andExpect(status().isCreated());
   <%_ } _%>
 
         // Validate the User in the database
@@ -337,9 +333,9 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
             assertThat(testUser.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
             assertThat(testUser.getLastName()).isEqualTo(DEFAULT_LASTNAME);
             assertThat(testUser.getEmail()).isEqualTo(DEFAULT_EMAIL);
-            <%_ if (!databaseTypeCassandra) { _%>
+  <%_ if (!databaseTypeCassandra) { _%>
             assertThat(testUser.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
-            <%_ } _%>
+  <%_ } _%>
             assertThat(testUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
         });
     }
@@ -373,18 +369,18 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
         managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
 
         // An entity with an existing ID cannot be created, so this API call must fail
-  <%_ if (!reactive) { _%>
-        restUserMockMvc.perform(post("/api/admin/users")
-            .contentType(MediaType.APPLICATION_JSON)
-            .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
-            .with(csrf())<% } %>)
-            .andExpect(status().isBadRequest());
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
         webTestClient.post().uri("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
             .exchange()
             .expectStatus().isBadRequest();
+  <%_ } else { _%>
+        restUserMockMvc.perform(post("/api/admin/users")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
+            .with(csrf())<% } %>)
+            .andExpect(status().isBadRequest());
   <%_ } _%>
 
         // Validate the User in the database
@@ -418,18 +414,18 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
         managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
 
         // Create the User
-  <%_ if (!reactive) { _%>
-        restUserMockMvc.perform(post("/api/admin/users")
-            .contentType(MediaType.APPLICATION_JSON)
-            .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
-            .with(csrf())<% } %>)
-            .andExpect(status().isBadRequest());
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
         webTestClient.post().uri("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
             .exchange()
             .expectStatus().isBadRequest();
+  <%_ } else { _%>
+        restUserMockMvc.perform(post("/api/admin/users")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
+            .with(csrf())<% } %>)
+            .andExpect(status().isBadRequest());
   <%_ } _%>
 
         // Validate the User in the database
@@ -463,55 +459,41 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
         managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
 
         // Create the User
-  <%_ if (!reactive) { _%>
-        restUserMockMvc.perform(post("/api/admin/users")
-            .contentType(MediaType.APPLICATION_JSON)
-            .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
-            .with(csrf())<% } %>)
-            .andExpect(status().isBadRequest());
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
         webTestClient.post().uri("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
             .exchange()
             .expectStatus().isBadRequest();
+  <%_ } else { _%>
+        restUserMockMvc.perform(post("/api/admin/users")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
+            .with(csrf())<% } %>)
+            .andExpect(status().isBadRequest());
   <%_ } _%>
 
         // Validate the User in the database
         assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
     }
-<%_ } _%>
 
     @Test
-<%_ if (databaseTypeSql && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-<%_ } _%>
+  <%_ } _%>
     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()<% } %>;
-<%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
+  <%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
         authorityRepository
             .findById(AuthoritiesConstants.USER)
             .flatMap(authority -> userRepository.saveUserAuthority(user.getId(), authority.getName()))
             .block();
-<%_ } _%>
+  <%_ } _%>
 
         // Get all the users
-<%_ if (!reactive) { _%>
-        restUserMockMvc.perform(get("/api/admin/users<% if (databaseTypeSql) { %>?sort=id,desc<% } %>")
-            .accept(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk())
-            .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
-            .andExpect(jsonPath("$.[*].login").value(hasItem(DEFAULT_LOGIN)))
-            .andExpect(jsonPath("$.[*].firstName").value(hasItem(DEFAULT_FIRSTNAME)))
-            .andExpect(jsonPath("$.[*].lastName").value(hasItem(DEFAULT_LASTNAME)))
-            .andExpect(jsonPath("$.[*].email").value(hasItem(DEFAULT_EMAIL)))
-  <%_ if (!databaseTypeCassandra) { _%>
-            .andExpect(jsonPath("$.[*].imageUrl").value(hasItem(DEFAULT_IMAGEURL)))
-  <%_ } _%>
-            .andExpect(jsonPath("$.[*].langKey").value(hasItem(DEFAULT_LANGKEY)));
-<%_ } else { _%>
-        <%= asDto('AdminUser') %> foundUser = webTestClient.get().uri("/api/admin/users?sort=id,DESC")
+  <%_ if (reactive) { _%>
+        <%= asDto('AdminUser') %> foundUser = webTestClient.get().uri("/api/admin/users?sort=id,desc")
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
             .expectStatus().isOk()
@@ -522,52 +504,53 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
         assertThat(foundUser.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
         assertThat(foundUser.getLastName()).isEqualTo(DEFAULT_LASTNAME);
         assertThat(foundUser.getEmail()).isEqualTo(DEFAULT_EMAIL);
-  <%_ if (!databaseTypeCassandra) { _%>
+    <%_ if (!databaseTypeCassandra) { _%>
         assertThat(foundUser.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
-  <%_ } _%>
+    <%_ } _%>
         assertThat(foundUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
-  <%_ if (databaseTypeSql && !applicationTypeMicroservice) { _%>
+    <%_ 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))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(jsonPath("$.[*].login").value(hasItem(DEFAULT_LOGIN)))
+            .andExpect(jsonPath("$.[*].firstName").value(hasItem(DEFAULT_FIRSTNAME)))
+            .andExpect(jsonPath("$.[*].lastName").value(hasItem(DEFAULT_LASTNAME)))
+            .andExpect(jsonPath("$.[*].email").value(hasItem(DEFAULT_EMAIL)))
+    <%_ if (!databaseTypeCassandra) { _%>
+            .andExpect(jsonPath("$.[*].imageUrl").value(hasItem(DEFAULT_IMAGEURL)))
+    <%_ } _%>
+            .andExpect(jsonPath("$.[*].langKey").value(hasItem(DEFAULT_LANGKEY)));
   <%_ } _%>
-<%_ } _%>
     }
 
     @Test
-<%_ if (databaseTypeSql && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-<%_ } _%>
+  <%_ } _%>
     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()<% } %>;
-<%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
+  <%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
         authorityRepository
             .findById(AuthoritiesConstants.USER)
             .flatMap(authority -> userRepository.saveUserAuthority(user.getId(), authority.getName()))
             .block();
-<%_ } _%>
+  <%_ } _%>
 
-<%_ if (searchEngineElasticsearch) { _%>
+  <%_ if (searchEngineElasticsearch) { _%>
         mockUserSearchRepository.save(user);
-<%_ } _%>
-<%_ if (cacheManagerIsAvailable) { _%>
+  <%_ } _%>
+  <%_ if (cacheManagerIsAvailable) { _%>
 
         assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNull();
-<%_ } _%>
+  <%_ } _%>
 
         // Get the user
-<%_ if (!reactive) { _%>
-        restUserMockMvc.perform(get("/api/admin/users/{login}", user.getLogin()))
-            .andExpect(status().isOk())
-            .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
-            .andExpect(jsonPath("$.login").value(user.getLogin()))
-            .andExpect(jsonPath("$.firstName").value(DEFAULT_FIRSTNAME))
-            .andExpect(jsonPath("$.lastName").value(DEFAULT_LASTNAME))
-            .andExpect(jsonPath("$.email").value(DEFAULT_EMAIL))
-  <%_ if (!databaseTypeCassandra) { _%>
-            .andExpect(jsonPath("$.imageUrl").value(DEFAULT_IMAGEURL))
-  <%_ } _%>
-            .andExpect(jsonPath("$.langKey").value(DEFAULT_LANGKEY));
-<%_ } else { _%>
+  <%_ if (reactive) { _%>
         webTestClient.get().uri("/api/admin/users/{login}", user.getLogin())
             .exchange()
             .expectStatus().isOk()
@@ -577,41 +560,52 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
             .jsonPath("$.firstName").isEqualTo(DEFAULT_FIRSTNAME)
             .jsonPath("$.lastName").isEqualTo(DEFAULT_LASTNAME)
             .jsonPath("$.email").isEqualTo(DEFAULT_EMAIL)
-  <%_ if (!databaseTypeCassandra) { _%>
+    <%_ if (!databaseTypeCassandra) { _%>
             .jsonPath("$.imageUrl").isEqualTo(DEFAULT_IMAGEURL)
-  <%_ } _%>
+    <%_ } _%>
             .jsonPath("$.langKey").isEqualTo(DEFAULT_LANGKEY)<%
                 if (!databaseTypeSql || applicationTypeMicroservice) { %>;
             <%_ } else { _%>
             .jsonPath("$.authorities")
             .isEqualTo(AuthoritiesConstants.USER);
             <% } %>
-<%_ } _%>
+  <%_ } else { _%>
+        restUserMockMvc.perform(get("/api/admin/users/{login}", user.getLogin()))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(jsonPath("$.login").value(user.getLogin()))
+            .andExpect(jsonPath("$.firstName").value(DEFAULT_FIRSTNAME))
+            .andExpect(jsonPath("$.lastName").value(DEFAULT_LASTNAME))
+            .andExpect(jsonPath("$.email").value(DEFAULT_EMAIL))
+    <%_ if (!databaseTypeCassandra) { _%>
+            .andExpect(jsonPath("$.imageUrl").value(DEFAULT_IMAGEURL))
+    <%_ } _%>
+            .andExpect(jsonPath("$.langKey").value(DEFAULT_LANGKEY));
+  <%_ } _%>
 
-<%_ if (cacheProviderMemcached) { _%>
+  <%_ if (cacheProviderMemcached) { _%>
         if (!(cacheManager instanceof NoOpCacheManager)) {
             assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNotNull();
         }
-<%_ } else if (cacheManagerIsAvailable) { _%>
+  <%_ } else if (cacheManagerIsAvailable) { _%>
         assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNotNull();
-<%_ } _%>
+  <%_ } _%>
     }
 
     @Test
-<%_ if (databaseTypeSql && !reactive) { _%>
+  <%_ if (databaseTypeSql && !reactive) { _%>
     @Transactional
-<%_ } _%>
+  <%_ } _%>
     void getNonExistingUser()<% if (!reactive) { %> throws Exception<% } %> {
-<%_ if (!reactive) { _%>
-        restUserMockMvc.perform(get("/api/admin/users/unknown"))
-            .andExpect(status().isNotFound());
-<%_ } else { _%>
+  <%_ if (reactive) { _%>
         webTestClient.get().uri("/api/admin/users/unknown")
             .exchange()
             .expectStatus().isNotFound();
-<%_ } _%>
+  <%_ } else { _%>
+        restUserMockMvc.perform(get("/api/admin/users/unknown"))
+            .andExpect(status().isNotFound());
+  <%_ } _%>
     }
-<%_ if (!authenticationTypeOauth2) { _%>
 
     @Test
   <%_ if (databaseTypeSql && !reactive) { _%>
@@ -651,18 +645,18 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
   <%_ } _%>
         managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
 
-  <%_ if (!reactive) { _%>
-        restUserMockMvc.perform(put("/api/admin/users")
-            .contentType(MediaType.APPLICATION_JSON)
-            .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
-            .with(csrf())<% } %>)
-            .andExpect(status().isOk());
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
         webTestClient.put().uri("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
             .exchange()
             .expectStatus().isOk();
+  <%_ } else { _%>
+        restUserMockMvc.perform(put("/api/admin/users")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
+            .with(csrf())<% } %>)
+            .andExpect(status().isOk());
   <%_ } _%>
 
         // Validate the User in the database
@@ -717,18 +711,18 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
   <%_ } _%>
         managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
 
-  <%_ if (!reactive) { _%>
-        restUserMockMvc.perform(put("/api/admin/users")
-            .contentType(MediaType.APPLICATION_JSON)
-            .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
-            .with(csrf())<% } %>)
-            .andExpect(status().isOk());
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
         webTestClient.put().uri("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
             .exchange()
             .expectStatus().isOk();
+  <%_ } else { _%>
+        restUserMockMvc.perform(put("/api/admin/users")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
+            .with(csrf())<% } %>)
+            .andExpect(status().isOk());
   <%_ } _%>
 
         // Validate the User in the database
@@ -802,18 +796,18 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
   <%_ } _%>
         managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
 
-  <%_ if (!reactive) { _%>
-        restUserMockMvc.perform(put("/api/admin/users")
-            .contentType(MediaType.APPLICATION_JSON)
-            .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
-            .with(csrf())<% } %>)
-            .andExpect(status().isBadRequest());
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
         webTestClient.put().uri("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
             .exchange()
             .expectStatus().isBadRequest();
+  <%_ } else { _%>
+        restUserMockMvc.perform(put("/api/admin/users")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
+            .with(csrf())<% } %>)
+            .andExpect(status().isBadRequest());
   <%_ } _%>
     }
 
@@ -873,18 +867,18 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
   <%_ } _%>
         managedUserVM.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
 
-  <%_ if (!reactive) { _%>
-        restUserMockMvc.perform(put("/api/admin/users")
-            .contentType(MediaType.APPLICATION_JSON)
-            .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
-            .with(csrf())<% } %>)
-            .andExpect(status().isBadRequest());
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
         webTestClient.put().uri("/api/admin/users")
             .contentType(MediaType.APPLICATION_JSON)
             .bodyValue(TestUtil.convertObjectToJsonBytes(managedUserVM))
             .exchange()
             .expectStatus().isBadRequest();
+  <%_ } else { _%>
+        restUserMockMvc.perform(put("/api/admin/users")
+            .contentType(MediaType.APPLICATION_JSON)
+            .content(TestUtil.convertObjectToJsonBytes(managedUserVM))<% if (testsNeedCsrf) { %>
+            .with(csrf())<% } %>)
+            .andExpect(status().isBadRequest());
   <%_ } _%>
     }
 
@@ -903,16 +897,16 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
             .collectList().block()<% } %>.size();
 
         // Delete the user
-  <%_ if (!reactive) { _%>
-        restUserMockMvc.perform(delete("/api/admin/users/{login}", user.getLogin())
-            .accept(MediaType.APPLICATION_JSON)<% if (testsNeedCsrf) { %>
-            .with(csrf())<% } %>)
-            .andExpect(status().isNoContent());
-  <%_ } else { _%>
+  <%_ if (reactive) { _%>
         webTestClient.delete().uri("/api/admin/users/{login}", user.getLogin())
             .accept(MediaType.APPLICATION_JSON)
             .exchange()
             .expectStatus().isNoContent();
+  <%_ } else { _%>
+        restUserMockMvc.perform(delete("/api/admin/users/{login}", user.getLogin())
+            .accept(MediaType.APPLICATION_JSON)<% if (testsNeedCsrf) { %>
+            .with(csrf())<% } %>)
+            .andExpect(status().isNoContent());
   <%_ } _%>
   <%_ if (cacheManagerIsAvailable) { _%>
 

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

@@ -1,5 +1,5 @@
 <%#
- Copyright 2013-2021 the original author or authors from the JHipster project.
+ Copyright 2013-2022 the original author or authors from the JHipster project.
 
  This file is part of the JHipster project, see https://www.jhipster.tech/
  for more information.