generator-jhipster 7.8.1 → 7.9.2

package/generators/server/templates/src/test/java/package/config/{NoOpMailConfiguration.java.ejs → SpringBootTestClassOrderer.java.ejs}

@@ -16,27 +16,27 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-package <%=packageName%>.config;
+package <%= packageName %>.config;
 
-import <%=packageName%>.service.MailService;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
+import org.junit.jupiter.api.ClassDescriptor;
+import org.junit.jupiter.api.ClassOrderer;
+import org.junit.jupiter.api.ClassOrdererContext;
+import <%= packageName %>.IntegrationTest;
 
-@Configuration
-public class NoOpMailConfiguration {
-    private final MailService mockMailService;
+import java.util.Comparator;
 
-    public NoOpMailConfiguration() {
-        mockMailService = mock(MailService.class);
-        doNothing().when(mockMailService).sendActivationEmail(any());
+public class SpringBootTestClassOrderer implements ClassOrderer {
+
+    @Override
+    public void orderClasses(ClassOrdererContext context) {
+        context.getClassDescriptors().sort(Comparator.comparingInt(SpringBootTestClassOrderer::getOrder));
     }
 
-    @Bean
-    public MailService mailService() {
-        return mockMailService;
+    private static int getOrder(ClassDescriptor classDescriptor) {
+        if (classDescriptor.findAnnotation(IntegrationTest.class).isPresent()) {
+            return 2;
+        }
+        return 1;
     }
 }

package/generators/server/templates/src/test/java/package/config/TestContainersSpringContextCustomizerFactory.java.ejs

@@ -23,6 +23,10 @@ import java.util.List;
 <%_ if (databaseTypeCassandra) { _%>
 import org.cassandraunit.CQLDataLoader;
 <%_ } _%>
+<%_ if (databaseTypeSql) { _%>
+import java.util.Arrays;
+import tech.jhipster.config.JHipsterConstants;
+<%_ } _%>
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,6 +37,7 @@ import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.test.context.ContextConfigurationAttributes;
 import org.springframework.test.context.ContextCustomizer;
 import org.springframework.test.context.ContextCustomizerFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.boot.test.util.TestPropertyValues;
 <%_ if (databaseTypeCassandra) { _%>
 import org.testcontainers.containers.CassandraContainer;
@@ -41,10 +46,13 @@ import org.testcontainers.containers.CassandraContainer;
 import org.testcontainers.containers.KafkaContainer;
 <%_ } _%>
 
-
 public class TestContainersSpringContextCustomizerFactory implements ContextCustomizerFactory {
 
     private Logger log = LoggerFactory.getLogger(TestContainersSpringContextCustomizerFactory.class);
+
+<%_ if (cacheProviderRedis) { _%>
+    private static RedisTestContainer redisBean;
+<%_ } _%>
 <%_ if (messageBrokerKafka) { _%>
     private static KafkaTestContainer kafkaBean;
 <%_ } _%>
@@ -54,6 +62,21 @@ public class TestContainersSpringContextCustomizerFactory implements ContextCust
 <%_ if (databaseTypeCassandra) { _%>
     private static CassandraTestContainer cassandraBean;
 <%_ } _%>
+<%_ if (searchEngineElasticsearch) { _%>
+    private static ElasticsearchTestContainer elasticsearchBean;
+<%_ } _%>
+<%_ if (databaseTypeCouchbase || searchEngineCouchbase) { _%>
+    private static CouchbaseTestContainer couchbaseBean;
+<%_ } _%>
+<%_ if (databaseTypeNeo4j) { _%>
+    private static Neo4jTestContainer neo4jBean;
+<%_ } _%>
+<%_ if (devDatabaseTypeMysql || devDatabaseTypeMariadb || devDatabaseTypeMssql || devDatabaseTypePostgres) { _%>
+    private static SqlTestContainer devTestContainer;
+<%_ } _%>
+<%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb || prodDatabaseTypeMssql || prodDatabaseTypePostgres) { _%>
+    private static SqlTestContainer prodTestContainer;
+<%_ } _%>
 
     @Override
     public ContextCustomizer createContextCustomizer(Class<?> testClass, List<ContextConfigurationAttributes> configAttributes) {
@@ -61,52 +84,165 @@ public class TestContainersSpringContextCustomizerFactory implements ContextCust
         return (context, mergedConfig) -> {
             ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
             TestPropertyValues testValues = TestPropertyValues.empty();
+<%_ if (databaseTypeCouchbase || searchEngineCouchbase) { _%>
+            EmbeddedCouchbase couchbaseAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedCouchbase.class);
+            if (null != couchbaseAnnotation) {
+                log.debug("detected the EmbeddedCouchbase annotation on class {}", testClass.getName());
+                log.info("Warming up the Couchbase database");
+                if (null == couchbaseBean) {
+                    couchbaseBean = beanFactory.createBean(CouchbaseTestContainer.class);
+                    beanFactory.registerSingleton(CouchbaseTestContainer.class.getName(), couchbaseBean);
+                    // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(CouchbaseTestContainer.class.getName(), couchbaseBean);
+                }
+                testValues = testValues.and("spring.couchbase.connection-string=" + couchbaseBean.getCouchbaseContainer().getConnectionString());
+                testValues = testValues.and("spring.couchbase.username=" + couchbaseBean.getCouchbaseContainer().getUsername());
+                testValues = testValues.and("spring.couchbase.password=" + couchbaseBean.getCouchbaseContainer().getPassword());
+                testValues = testValues.and("jhipster.database.couchbase.bucket-name=" + couchbaseBean.getBucketName());
+                testValues = testValues.and("jhipster.database.couchbase.scope-name=testScope");
+            }
+<%_ } _%>
 <%_ if (databaseTypeMongodb) { _%>
-        EmbeddedMongo mongoAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedMongo.class);
-        if (null != mongoAnnotation) {
-            log.debug("detected the EmbeddedMongo annotation on class {}", testClass.getName());
-            if (mongoDbBean == null) {
-                log.info("Warming up the mongo database");
-                mongoDbBean =  new MongoDbTestContainer();
-                beanFactory.initializeBean(mongoDbBean, MongoDbTestContainer.class.getName().toLowerCase());
-                beanFactory.registerSingleton(MongoDbTestContainer.class.getName().toLowerCase(), mongoDbBean);
-                ((DefaultSingletonBeanRegistry)beanFactory).registerDisposableBean(MongoDbTestContainer.class.getName().toLowerCase(), mongoDbBean);
+                EmbeddedMongo mongoAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedMongo.class);
+                if (null != mongoAnnotation) {
+                    log.debug("detected the EmbeddedMongo annotation on class {}", testClass.getName());
+                    log.info("Warming up the mongo database");
+                    if (null == mongoDbBean) {
+                        mongoDbBean = beanFactory.createBean(MongoDbTestContainer.class);
+                        beanFactory.registerSingleton(MongoDbTestContainer.class.getName(), mongoDbBean);
+                        // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(MongoDbTestContainer.class.getName(), mongoDbBean);
+                    }
+                    testValues = testValues.and("spring.data.mongodb.uri=" + mongoDbBean.getMongoDBContainer().getReplicaSetUrl());
+                }
+<%_ } _%>
+<%_ if (cacheProviderRedis) { _%>
+                EmbeddedRedis redisAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedRedis.class);
+                if (null != redisAnnotation) {
+                    log.debug("detected the EmbeddedRedis annotation on class {}", testClass.getName());
+                    log.info("Warming up the redis database");
+                    if (null == redisBean) {
+                        redisBean = beanFactory.createBean(RedisTestContainer.class);
+                        beanFactory.registerSingleton(RedisTestContainer.class.getName(), redisBean);
+                        // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(RedisTestContainer.class.getName(), redisBean);
+                    }
+                    testValues = testValues.and("jhipster.cache.redis.server=redis://" + redisBean.getRedisContainer().getContainerIpAddress() + ":" + redisBean.getRedisContainer().getMappedPort(6379));
+                }
+<%_ } _%>
+<%_ if (databaseTypeSql) { _%>
+            EmbeddedSQL sqlAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedSQL.class);
+            if (null != sqlAnnotation) {
+                log.debug("detected the EmbeddedSQL annotation on class {}", testClass.getName());
+                log.info("Warming up the sql database");
+  <%_ if (devDatabaseTypeMysql || devDatabaseTypeMariadb || devDatabaseTypeMssql || devDatabaseTypePostgres) { _%>
+                if (Arrays.asList(context.getEnvironment().getActiveProfiles()).contains("test" + JHipsterConstants.SPRING_PROFILE_DEVELOPMENT)) {
+                    if (null == devTestContainer) {
+                        try {
+                            Class<? extends SqlTestContainer> containerClass = (Class<? extends SqlTestContainer>) Class.forName(this.getClass().getPackageName() + ".<% if (devDatabaseTypeMysql) { %>Mysql<% } else if (devDatabaseTypeMariadb) { %>Mariadb<% } else if (devDatabaseTypeMssql) { %>MsSql<% } else if (devDatabaseTypePostgres) { %>PostgreSql<% } %>TestContainer");
+                            devTestContainer = beanFactory.createBean(containerClass);
+                            beanFactory.registerSingleton(containerClass.getName(), devTestContainer);
+                            // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(containerClass.getName(), devTestContainer);
+                        } catch (ClassNotFoundException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+    <%_ if (reactive) { _%>
+                    testValues = testValues.and("spring.r2dbc.url=" + devTestContainer.getTestContainer().getJdbcUrl().replace("jdbc", "r2dbc")<% if (devDatabaseTypeMysql) { %>.replace("mysql", "mariadb")<% } %> + "<%- getDBCExtraOption(devDatabaseType) %>");
+                    testValues = testValues.and("spring.r2dbc.username=" + devTestContainer.getTestContainer().getUsername());
+                    testValues = testValues.and("spring.r2dbc.password=" + devTestContainer.getTestContainer().getPassword());
+                    testValues = testValues.and("spring.liquibase.url=" + devTestContainer.getTestContainer().getJdbcUrl() + "<%- getDBCExtraOption(devDatabaseType) %>" );
+    <%_ } else { _%>
+                    testValues = testValues.and("spring.datasource.url=" + devTestContainer.getTestContainer().getJdbcUrl() + "<%- getDBCExtraOption(devDatabaseType) %>");
+                    testValues = testValues.and("spring.datasource.username=" + devTestContainer.getTestContainer().getUsername());
+                    testValues = testValues.and("spring.datasource.password=" + devTestContainer.getTestContainer().getPassword());
+    <%_ } _%>
+                }
+  <%_ } _%>
+  <%_ if (prodDatabaseTypeMysql || prodDatabaseTypeMariadb || prodDatabaseTypeMssql || prodDatabaseTypePostgres) { _%>
+                if (Arrays.asList(context.getEnvironment().getActiveProfiles()).contains("test" + JHipsterConstants.SPRING_PROFILE_PRODUCTION)) {
+                    if (null == prodTestContainer) {
+                        try {
+                            Class<? extends SqlTestContainer> containerClass = (Class<? extends SqlTestContainer>) Class.forName(this.getClass().getPackageName() + ".<% if (prodDatabaseTypeMysql) { %>Mysql<% } else if (prodDatabaseTypeMariadb) { %>Mariadb<% } else if (prodDatabaseTypeMssql) { %>MsSql<% } else if (prodDatabaseTypePostgres) { %>PostgreSql<% } %>TestContainer");
+                            prodTestContainer = beanFactory.createBean(containerClass);
+                            beanFactory.registerSingleton(containerClass.getName(), prodTestContainer);
+                            // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(containerClass.getName(), prodTestContainer);
+                        } catch (ClassNotFoundException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+    <%_ if (reactive) { _%>
+                    testValues = testValues.and("spring.r2dbc.url=" + prodTestContainer.getTestContainer().getJdbcUrl().replace("jdbc", "r2dbc")<% if (prodDatabaseTypeMysql) { %>.replace("mysql", "mariadb")<% } %> + "<%- getDBCExtraOption(prodDatabaseType) %>");
+                    testValues = testValues.and("spring.r2dbc.username=" + prodTestContainer.getTestContainer().getUsername());
+                    testValues = testValues.and("spring.r2dbc.password=" + prodTestContainer.getTestContainer().getPassword());
+                    testValues = testValues.and("spring.liquibase.url=" + prodTestContainer.getTestContainer().getJdbcUrl()  + "<%- getDBCExtraOption(prodDatabaseType) %>");
+    <%_ } else { _%>
+                    testValues = testValues.and("spring.datasource.url=" + prodTestContainer.getTestContainer().getJdbcUrl() + "<%- getDBCExtraOption(prodDatabaseType) %>");
+                    testValues = testValues.and("spring.datasource.username=" + prodTestContainer.getTestContainer().getUsername());
+                    testValues = testValues.and("spring.datasource.password=" + prodTestContainer.getTestContainer().getPassword());
+    <%_ } _%>
+                }
+  <%_ } _%>
             }
-            testValues = testValues.and("spring.data.mongodb.uri=" + mongoDbBean.getMongoDBContainer().getReplicaSetUrl());
-        }
 <%_ } _%>
 <%_ if (databaseTypeCassandra) { _%>
-        EmbeddedCassandra cassandraAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedCassandra.class);
-        if (null != cassandraAnnotation) {
-            log.debug("detected the EmbeddedCassandra annotation on class {}", testClass.getName());
-            if (cassandraBean == null) {
+            EmbeddedCassandra cassandraAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedCassandra.class);
+            if (null != cassandraAnnotation) {
+                log.debug("detected the EmbeddedCassandra annotation on class {}", testClass.getName());
                 log.info("Warming up the cassandra database");
-                cassandraBean =  new CassandraTestContainer();
-                beanFactory.initializeBean(cassandraBean, CassandraTestContainer.class.getName().toLowerCase());
-                beanFactory.registerSingleton(CassandraTestContainer.class.getName().toLowerCase(), cassandraBean);
-                ((DefaultSingletonBeanRegistry)beanFactory).registerDisposableBean(CassandraTestContainer.class.getName().toLowerCase(), cassandraBean);
-            }
-            testValues = testValues.and("spring.data.cassandra.port=" +  cassandraBean.getCassandraContainer().getMappedPort(CassandraContainer.CQL_PORT))
+                if (null == cassandraBean) {
+                    cassandraBean = beanFactory.createBean(CassandraTestContainer.class);
+                    beanFactory.registerSingleton(CassandraTestContainer.class.getName(), cassandraBean);
+                    // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(CassandraTestContainer.class.getName(), cassandraBean);
+                }
+                testValues = testValues.and("spring.data.cassandra.port=" +  cassandraBean.getCassandraContainer().getMappedPort(CassandraContainer.CQL_PORT))
                     .and("spring.data.cassandra.contact-points=" +  cassandraBean.getCassandraContainer().getHost())
                     .and("spring.data.cassandra.keyspace-name=" + CQLDataLoader.DEFAULT_KEYSPACE_NAME)
                     .and("spring.data.cassandra.local-datacenter=" + cassandraBean.getCassandraContainer().getCluster().getMetadata().getAllHosts().iterator().next().getDatacenter())
                     .and("spring.data.cassandra.cluster-name=" + cassandraBean.getCassandraContainer().getCluster().getMetadata().getClusterName());
-        }
+            }
+<%_ } _%>
+<%_ if (databaseTypeNeo4j) { _%>
+            EmbeddedNeo4j neo4jAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedNeo4j.class);
+            if (null != neo4jAnnotation) {
+                log.debug("detected the EmbeddedNeo4j annotation on class {}", testClass.getName());
+                log.info("Warming up the neo4j database");
+                if (null == neo4jBean) {
+                    neo4jBean = beanFactory.createBean(Neo4jTestContainer.class);
+                    beanFactory.registerSingleton(Neo4jTestContainer.class.getName(), neo4jBean);
+                    // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(Neo4jTestContainer.class.getName(), neo4jBean);
+                }
+                testValues =
+                    testValues.and(
+                        "spring.neo4j.uri=" + neo4jBean.getNeo4jContainer().getBoltUrl()
+                    );
+            }
 <%_ } _%>
-
 <%_ if (messageBrokerKafka) { _%>
             EmbeddedKafka kafkaAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedKafka.class);
             if (null != kafkaAnnotation) {
                 log.debug("detected the EmbeddedKafka annotation on class {}", testClass.getName());
-                if (kafkaBean == null) {
-                    log.info("Warming up the kafka broker");
-                    kafkaBean = new KafkaTestContainer();
-                    beanFactory.initializeBean(kafkaBean, KafkaTestContainer.class.getName().toLowerCase());
-                    beanFactory.registerSingleton(KafkaTestContainer.class.getName().toLowerCase(), kafkaBean);
-                    ((DefaultSingletonBeanRegistry)beanFactory).registerDisposableBean(KafkaTestContainer.class.getName().toLowerCase(), kafkaBean);
+                log.info("Warming up the kafka broker");
+                if (null == kafkaBean) {
+                    kafkaBean = beanFactory.createBean(KafkaTestContainer.class);
+                    beanFactory.registerSingleton(KafkaTestContainer.class.getName(), kafkaBean);
+                    // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(KafkaTestContainer.class.getName(), kafkaBean);
                 }
                 testValues = testValues.and("spring.cloud.stream.kafka.binder.brokers=" + kafkaBean.getKafkaContainer().getHost() + ':' + kafkaBean.getKafkaContainer().getMappedPort(KafkaContainer.KAFKA_PORT));
             }
+<%_ } _%>
+<%_ if (searchEngineElasticsearch) { _%>
+            EmbeddedElasticsearch elasticsearchAnnotation = AnnotatedElementUtils.findMergedAnnotation(testClass, EmbeddedElasticsearch.class);
+            if (null != elasticsearchAnnotation) {
+                log.debug("detected the EmbeddedElasticsearch annotation on class {}", testClass.getName());
+                log.info("Warming up the elastic database");
+                if (null == elasticsearchBean) {
+                    elasticsearchBean = beanFactory.createBean(ElasticsearchTestContainer.class);
+                    beanFactory.registerSingleton(ElasticsearchTestContainer.class.getName(), elasticsearchBean);
+                    // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(ElasticsearchTestContainer.class.getName(), elasticsearchBean);
+                }
+                testValues =
+                    testValues.and(
+                        "spring.elasticsearch.uris=http://" + elasticsearchBean.getElasticsearchContainer().getHttpHostAddress()
+                    );
+            }
 <%_ } _%>
             testValues.applyTo(context);
         };

package/generators/server/templates/src/test/java/package/config/WebConfigurerTest.java.ejs

@@ -20,9 +20,6 @@ package <%= packageName %>.config;
 
 import tech.jhipster.config.JHipsterConstants;
 import tech.jhipster.config.JHipsterProperties;
-<%_ if (devDatabaseTypeH2Any) { _%>
-import org.h2.server.web.WebServlet;
-<%_ } _%>
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 <%_ if (!skipClient) { _%>
@@ -79,26 +76,6 @@ class WebConfigurerTest {
         webConfigurer = new WebConfigurer(env, props);
     }
 
-    @Test
-    void shouldStartUpProdServletContext() throws ServletException {
-        env.setActiveProfiles(JHipsterConstants.SPRING_PROFILE_PRODUCTION);
-
-        assertThatCode(() -> webConfigurer.onStartup(servletContext)).doesNotThrowAnyException();
-<%_ if (devDatabaseTypeH2Any) { _%>
-        verify(servletContext, never()).addServlet(eq("H2Console"), any(WebServlet.class));
-<%_ } _%>
-    }
-
-    @Test
-    void shouldStartUpDevServletContext() throws ServletException {
-        env.setActiveProfiles(JHipsterConstants.SPRING_PROFILE_DEVELOPMENT);
-
-        assertThatCode(() -> webConfigurer.onStartup(servletContext)).doesNotThrowAnyException();
-<%_ if (devDatabaseTypeH2Any) { _%>
-        verify(servletContext).addServlet(eq("H2Console"), any(WebServlet.class));
-<%_ } _%>
-    }
-
 <%_ if (!skipClient) { _%>
     @Test
     void shouldCustomizeServletContainer() {

package/generators/server/templates/src/test/java/package/security/DomainUserDetailsServiceIT.java.ejs

@@ -29,6 +29,7 @@ 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;
+import org.springframework.beans.factory.annotation.Qualifier;
 <%_ if (reactive) { _%>
 import org.springframework.security.core.userdetails.ReactiveUserDetailsService;
 <%_ } _%>
@@ -74,6 +75,7 @@ class DomainUserDetailsServiceIT {
     private UserRepository userRepository;
 
     @Autowired
+    @Qualifier("userDetailsService")
     private <% if (reactive) { %>Reactive<% } %>UserDetailsService domainUserDetailsService;
 
     @BeforeEach
@@ -90,7 +92,7 @@ class DomainUserDetailsServiceIT {
         userOne.setId(UUID.randomUUID().toString());
 <%_ } _%>
         userOne.setLogin(USER_ONE_LOGIN);
-        userOne.setPassword(RandomStringUtils.random(60));
+        userOne.setPassword(RandomStringUtils.randomAlphanumeric(60));
         userOne.setActivated(true);
         userOne.setEmail(USER_ONE_EMAIL);
         userOne.setFirstName("userOne");
@@ -106,7 +108,7 @@ class DomainUserDetailsServiceIT {
         userTwo.setId(UUID.randomUUID().toString());
 <%_ } _%>
         userTwo.setLogin(USER_TWO_LOGIN);
-        userTwo.setPassword(RandomStringUtils.random(60));
+        userTwo.setPassword(RandomStringUtils.randomAlphanumeric(60));
         userTwo.setActivated(true);
         userTwo.setEmail(USER_TWO_EMAIL);
         userTwo.setFirstName("userTwo");
@@ -122,7 +124,7 @@ class DomainUserDetailsServiceIT {
         userThree.setId(UUID.randomUUID().toString());
 <%_ } _%>
         userThree.setLogin(USER_THREE_LOGIN);
-        userThree.setPassword(RandomStringUtils.random(60));
+        userThree.setPassword(RandomStringUtils.randomAlphanumeric(60));
         userThree.setActivated(false);
         userThree.setEmail(USER_THREE_EMAIL);
         userThree.setFirstName("userThree");

package/generators/server/templates/src/test/java/package/service/MailServiceIT.java.ejs

@@ -26,15 +26,12 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
-import org.mockito.MockitoAnnotations;
-import org.mockito.Spy;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.MessageSource;
 import org.springframework.mail.MailSendException;
-import org.springframework.mail.javamail.JavaMailSenderImpl;
-import org.thymeleaf.spring5.SpringTemplateEngine;
+import org.springframework.mail.javamail.JavaMailSender;
 
 import javax.mail.Multipart;
+import javax.mail.Session;
 import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMultipart;
@@ -48,6 +45,7 @@ import java.nio.charset.Charset;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.springframework.boot.test.mock.mockito.MockBean;
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
@@ -68,25 +66,19 @@ class MailServiceIT {
     @Autowired
     private JHipsterProperties jHipsterProperties;
 
-    @Autowired
-    private MessageSource messageSource;
-
-    @Autowired
-    private SpringTemplateEngine templateEngine;
-
-    @Spy
-    private JavaMailSenderImpl javaMailSender;
+    @MockBean
+    private JavaMailSender javaMailSender;
 
     @Captor
     private ArgumentCaptor<MimeMessage> messageCaptor;
 
+    @Autowired
     private MailService mailService;
 
     @BeforeEach
     public void setup() {
-        MockitoAnnotations.openMocks(this);
         doNothing().when(javaMailSender).send(any(MimeMessage.class));
-        mailService = new MailService(jHipsterProperties, javaMailSender, messageSource, templateEngine);
+        when(javaMailSender.createMimeMessage()).thenReturn(new MimeMessage((Session)null));
     }
 
     @Test

package/generators/server/templates/src/test/java/package/service/UserServiceIT.java.ejs

@@ -50,6 +50,9 @@ 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 (searchEngineElasticsearch) { _%>
+import org.springframework.boot.test.mock.mockito.SpyBean;
+<%_ } _%>
 <%_ if (databaseTypeSql && !reactive && !authenticationTypeOauth2) { _%>
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.auditing.AuditingHandler;
@@ -167,8 +170,8 @@ class UserServiceIT {
      *
      * @see <%= packageName %>.repository.search.UserSearchRepositoryMockConfiguration
      */
-    @Autowired
-    private UserSearchRepository mockUserSearchRepository;
+    @SpyBean
+    private UserSearchRepository spiedUserSearchRepository;
 <%_ } _%>
 <%_ if (databaseTypeSql && !reactive && !authenticationTypeOauth2) { _%>
 
@@ -208,7 +211,7 @@ class UserServiceIT {
   <%_ } _%>
         user.setLogin(DEFAULT_LOGIN);
   <%_ if (!authenticationTypeOauth2) { _%>
-        user.setPassword(RandomStringUtils.random(60));
+        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
   <%_ } _%>
         user.setActivated(true);
         user.setEmail(DEFAULT_EMAIL);
@@ -350,12 +353,6 @@ class UserServiceIT {
         Instant now = Instant.now();
   <%_ if (databaseTypeSql && !reactive) { _%>
         when(dateTimeProvider.getNow()).thenReturn(Optional.of(now.minus(4, ChronoUnit.DAYS)));
-  <%_ } _%>
-  <%_ if (searchEngineElasticsearch && reactive) { _%>
-        // Configure the mock search repository
-        when(mockUserSearchRepository.save(any()))
-            .thenAnswer(invocation -> Mono.just(invocation.getArgument(0)));
-        when(mockUserSearchRepository.delete(any())).thenReturn(Mono.empty());
   <%_ } _%>
         user.setActivated(false);
         user.setActivationKey(RandomStringUtils.random(20));
@@ -377,7 +374,7 @@ class UserServiceIT {
   <%_ if (searchEngineElasticsearch) { _%>
 
         // Verify Elasticsearch mock
-        verify(mockUserSearchRepository, times(1)).delete(user);
+        verify(spiedUserSearchRepository, times(1)).delete(user);
   <%_ } _%>
     }
 
@@ -408,7 +405,7 @@ class UserServiceIT {
   <%_ if (searchEngineElasticsearch) { _%>
 
         // Verify Elasticsearch mock
-        verify(mockUserSearchRepository, never()).delete(user);
+        verify(spiedUserSearchRepository, never()).delete(user);
   <%_ } _%>
     }
 <%_ } _%>

package/generators/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.ejs

@@ -59,7 +59,7 @@ class UserMapperTest {
         user = new <%= asEntity('User') %>();
         user.setLogin(DEFAULT_LOGIN);
 <%_ if (!authenticationTypeOauth2) { _%>
-        user.setPassword(RandomStringUtils.random(60));
+        user.setPassword(RandomStringUtils.randomAlphanumeric(60));
 <%_ } _%>
         user.setActivated(true);
         user.setEmail("johndoe@localhost");