don't delete all users in some integration tests

generators/app/__snapshots__/generator.spec.ts.snap

@@ -738,7 +738,10 @@ exports[`generator - app with default config should match snapshot 1`] = `
   "projectDescription": "Description for JHipster",
   "projectVersion": "0.0.1-SNAPSHOT",
   "reactive": false,
+  "reactorBlock": "",
+  "reactorBlockOptional": "",
   "rememberMeKey": undefined,
+  "requiresDeleteAllUsers": false,
   "searchEngine": "no",
   "searchEngineAny": false,
   "searchEngineCouchbase": false,
@@ -1328,7 +1331,10 @@ exports[`generator - app with gateway should match snapshot 1`] = `
   "projectDescription": "Description for JHipster",
   "projectVersion": "0.0.1-SNAPSHOT",
   "reactive": true,
+  "reactorBlock": ".block()",
+  "reactorBlockOptional": ".blockOptional()",
   "rememberMeKey": undefined,
+  "requiresDeleteAllUsers": true,
   "routes": undefined,
   "searchEngine": "no",
   "searchEngineAny": false,
@@ -1864,7 +1870,10 @@ exports[`generator - app with microservice should match snapshot 1`] = `
   "projectDescription": "Description for JHipster",
   "projectVersion": "0.0.1-SNAPSHOT",
   "reactive": false,
+  "reactorBlock": "",
+  "reactorBlockOptional": "",
   "rememberMeKey": undefined,
+  "requiresDeleteAllUsers": false,
   "searchEngine": "no",
   "searchEngineAny": false,
   "searchEngineCouchbase": false,

generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs

@@ -34,11 +34,17 @@ import static org.mockito.Mockito.*;
 
 import <%= packageName %>.IntegrationTest;
 import <%= packageName %>.security.AuthoritiesConstants;
+<%_ if (syncUserWithIdp) { _%>
+import <%= packageName %>.repository.UserRepository;
+<%_ } _%>
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithMockUser;
+<%_ if (authenticationTypeOauth2) { _%>
+import org.junit.jupiter.api.AfterEach;
+<%_ } _%>
 <%_ if (reactive) { _%>
 import org.junit.jupiter.api.BeforeEach;
 import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
@@ -74,6 +80,11 @@ import org.springframework.transaction.annotation.Transactional;
 <%_ } _%>
 @IntegrationTest
 class AccountResourceIT {
+<%_ if (syncUserWithIdp) { _%>
+
+    @Autowired
+    private UserRepository userRepository;
+<%_ } _%>
 
 <%_ if (reactive) { _%>
     private Map<String, Object> claims;
@@ -106,6 +117,17 @@ class AccountResourceIT {
         claims.put("email", "jane.doe@jhipster.com");
     }
 
+<%_ } _%>
+<%_ if (syncUserWithIdp) { _%>
+    @AfterEach
+    public void cleanup() {
+        // Remove syncUserWithIdp users
+    <%_ if (databaseTypeSql && reactive) { _%>
+        userRepository.deleteAllUserAuthorities()<%- reactorBlock %>;
+    <%_ } _%>
+        userRepository.deleteAll()<%- reactorBlock %>;
+    }
+
 <%_ } _%>
     @Test
 <%_ if (databaseTypeSql && !reactive) { _%>

generators/server/types.d.ts

@@ -113,4 +113,7 @@ export type SpringBootApplication = JavaApplication &
     databaseMigrationLiquibase: boolean;
 
     communicationSpringWebsocket: boolean;
+    requiresDeleteAllUsers: boolean;
+    reactorBlock: string;
+    reactorBlockOptional: string;
   };

generators/spring-boot/generator.ts

@@ -282,6 +282,15 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
           (application.backendType ?? 'Java') === 'Java' &&
           (ADD_SPRING_MILESTONE_REPOSITORY || SPRING_BOOT_VERSION.includes('M') || SPRING_BOOT_VERSION.includes('RC'));
       },
+      prepare({ application }) {
+        application.requiresDeleteAllUsers =
+          application.authenticationTypeOauth2 ||
+          (application.reactive && application.databaseTypeSql) ||
+          (!application.reactive && application.databaseTypeMongodb);
+
+        application.reactorBlock = application.reactive ? '.block()' : '';
+        application.reactorBlockOptional = application.reactive ? '.blockOptional()' : '';
+      },
       registerSpringFactory({ source, application }) {
         source.addTestSpringFactory = ({ key, value }) => {
           const springFactoriesFile = `${application.srcTestResources}META-INF/spring.factories`;

generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs

@@ -47,6 +47,7 @@ import tech.jhipster.security.RandomUtil;
 <%_ if (!authenticationTypeOauth2) { _%>
 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;
@@ -137,9 +138,9 @@ import static org.mockito.Mockito.when;
 <%_ } _%>
 class UserServiceIT {
 
-    private static final String DEFAULT_LOGIN = "johndoe";
+    private static final String DEFAULT_LOGIN = "johndoe_service";
 
-    private static final String DEFAULT_EMAIL = "johndoe@localhost";
+    private static final String DEFAULT_EMAIL = "johndoe_service@localhost";
 
     private static final String DEFAULT_FIRSTNAME = "john";
 
@@ -189,21 +190,21 @@ class UserServiceIT {
 <%_ if (authenticationTypeOauth2) { _%>
     private Map<String, Object> userDetails;
 
+<%_ } _%>
+<%_ if (!databaseTypeCassandra && !requiresDeleteAllUsers) { _%>
+    private Long numberOfUsers;
+
+    @BeforeEach
+    public void countUsers() {
+        numberOfUsers = userRepository.count()<%- reactorBlock %>;
+    }
+
 <%_ } _%>
     @BeforeEach
     public void init() {
 <%_ if (databaseTypeCouchbase) { _%>
         mockAuthentication();
 <%_ } _%>
-<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
-        persistentTokenRepository.deleteAll();
-<%_ } _%>
-<%_ if (databaseTypeSql && reactive) { _%>
-        userRepository.deleteAllUserAuthorities().block();
-<%_ } _%>
-<%_ if ((reactive && !databaseTypeNo) || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCassandra || databaseTypeCouchbase) { _%>
-        userRepository.deleteAll()<% if (reactive) { %>.block()<% } %>;
-<%_ } _%>
 <%_ if (!databaseTypeNo) { _%>
         user = new <%= user.persistClass %>();
   <%_ if (databaseTypeCassandra) { _%>
@@ -240,6 +241,25 @@ class UserServiceIT {
 
         when(dateTimeProvider.getNow()).thenReturn(Optional.of(LocalDateTime.now()));
         auditingHandler.setDateTimeProvider(dateTimeProvider);
+<%_ } _%>
+    }
+
+    @AfterEach
+    public void cleanupAndCheck() {
+<%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>
+        persistentTokenRepository.deleteAll();
+<%_ } _%>
+<%_ if (requiresDeleteAllUsers) { _%>
+    <%_ if (databaseTypeSql && reactive) { _%>
+        userRepository.deleteAllUserAuthorities()<%- reactorBlock %>;
+    <%_ } _%>
+        userRepository.deleteAll()<%- reactorBlock %>;
+<%_ } else { _%>
+        userService.deleteUser(DEFAULT_LOGIN)<%- reactorBlock %>;
+<%_ } _%>
+<%_ if (!databaseTypeCassandra && !requiresDeleteAllUsers) { _%>
+        assertThat(userRepository.count()<%- reactorBlock %>).isEqualTo(numberOfUsers);
+        numberOfUsers = null;
 <%_ } _%>
     }
 <%_ if ((databaseTypeSql || databaseTypeMongodb || databaseTypeNeo4j || databaseTypeCouchbase) && authenticationTypeSession && !reactive) { _%>

generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/PublicUserResourceIT.java.ejs

@@ -18,6 +18,8 @@
 -%>
 package <%= packageName %>.web.rest;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import <%= packageName %>.IntegrationTest;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.config.Constants;
@@ -27,13 +29,17 @@ import <%= packageName %>.config.TestSecurityConfiguration;
 <%_ } _%>
 import <%= user.entityAbsoluteClass %>;
 import <%= packageName %>.repository.UserRepository;
+<%_ if (!requiresDeleteAllUsers) { _%>
+import <%= packageName %>.service.UserService;
+<%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
 import <%= packageName %>.repository.search.UserSearchRepository;
 <%_ } _%>
 import <%= packageName %>.security.AuthoritiesConstants;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.repository.EntityManager;
 <%_ } _%>
+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;
@@ -77,9 +83,6 @@ import java.util.stream.Stream;
 import java.util.UUID;
 <%_ } _%>
 
-<%_ if (reactive) { _%>
-import static org.assertj.core.api.Assertions.assertThat;
-<%_ } _%>
 <%_ if (reactive && searchEngineElasticsearch) { _%>
 import static org.mockito.Mockito.*;
 <%_ } _%>
@@ -115,6 +118,11 @@ class PublicUserResourceIT {
 
     @Autowired
     private UserRepository userRepository;
+<%_ if (!requiresDeleteAllUsers) { _%>
+
+    @Autowired
+    private UserService userService;
+<%_ } _%>
 <%_ if (searchEngineElasticsearch) { _%>
 
     /**
@@ -145,6 +153,15 @@ class PublicUserResourceIT {
 
     private <%= user.persistClass %> user;
 
+<%_ if (!databaseTypeCassandra && !requiresDeleteAllUsers) { _%>
+    private Long numberOfUsers;
+
+    @BeforeEach
+    public void countUsers() {
+        numberOfUsers = userRepository.count()<%- reactorBlock %>;
+    }
+
+<%_ } _%>
 <%_ if (cacheProviderAny) { _%>
     @BeforeEach
     public void setup() {
@@ -162,7 +179,23 @@ class PublicUserResourceIT {
 <%_ } _%>
     @BeforeEach
     public void initTest() {
-        user = UserResourceIT.initTestUser(userRepository<% if (databaseTypeSql) { %>, em<% } %>);
+        user = UserResourceIT.initTestUser(<% if (databaseTypeSql) { %>em<% } %>);
+    }
+
+    @AfterEach
+    public void cleanupAndCheck() {
+<%_ if (requiresDeleteAllUsers) { _%>
+    <%_ if (databaseTypeSql && reactive) { _%>
+        userRepository.deleteAllUserAuthorities()<%- reactorBlock %>;
+    <%_ } _%>
+        userRepository.deleteAll()<%- reactorBlock %>;
+<%_ } else { _%>
+        userService.deleteUser(DEFAULT_LOGIN)<%- reactorBlock %>;
+<%_ } _%>
+<%_ if (!databaseTypeCassandra && !requiresDeleteAllUsers) { _%>
+        assertThat(userRepository.count()<%- reactorBlock %>).isEqualTo(numberOfUsers);
+        numberOfUsers = null;
+<%_ } _%>
     }
 
     @Test