Bael 4461 3 (#4695)

* [BAEL-7574] - Fixed integration tests for spring-rest-simple module

* Fixed integration tests for spring-all, data-flow-server, spring-cloud-rest-books-api, spring-cloud-rest-reviews-api modules

spring-all/src/test/java/org/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java

@@ -25,7 +25,7 @@ public class CacheRefinementsIntegrationTest extends AbstractJUnit4SpringContext
             executorService.execute(() -> service.getFoo("test").printInstanceNumber());
         }
         executorService.awaitTermination(1, TimeUnit.SECONDS);
-        assertEquals(Foo.getInstanceCount(), 1);
+        assertEquals(1, Foo.getInstanceCount());
     }
 
 }

spring-cloud-data-flow/data-flow-server/pom.xml

@@ -11,10 +11,10 @@
     <description>Demo project for Spring Boot</description>
 
     <parent>
-        <artifactId>parent-boot-1</artifactId>
+        <groupId>org.springframework.boot</groupId>
-        <groupId>com.baeldung</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.4.3.RELEASE</version>
-        <relativePath>../../parent-boot-1</relativePath>
+        <relativePath />
     </parent>
 
     <dependencies>

spring-cloud-data-flow/data-flow-server/src/test/java/org/baeldung/spring/cloud/DataFlowServerApplicationIntegrationTest.java

@@ -2,7 +2,14 @@ package org.baeldung.spring.cloud;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
@@ -13,4 +20,24 @@ public class DataFlowServerApplicationIntegrationTest {
     public void contextLoads() {
     }
 
+    @EnableRedisHttpSession
+    @Configuration
+    static class Config {
+
+        @Bean
+        @SuppressWarnings("unchecked")
+        public RedisSerializer<Object> defaultRedisSerializer() {
+            return Mockito.mock(RedisSerializer.class);
+        }
+
+        @Bean
+        public RedisConnectionFactory connectionFactory() {
+
+            RedisConnectionFactory factory = Mockito.mock(RedisConnectionFactory.class);
+            RedisConnection connection = Mockito.mock(RedisConnection.class);
+            Mockito.when(factory.getConnection()).thenReturn(connection);
+
+            return factory;
+        }
+    }
 }

spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/org/baeldung/BooksApiIntegrationTest.java

@@ -2,7 +2,14 @@ package org.baeldung;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
@@ -13,4 +20,24 @@ public class BooksApiIntegrationTest {
     public void contextLoads() {
     }
 
+    @EnableRedisHttpSession
+    @Configuration
+    static class Config {
+
+        @Bean
+        @SuppressWarnings("unchecked")
+        public RedisSerializer<Object> defaultRedisSerializer() {
+            return Mockito.mock(RedisSerializer.class);
+        }
+
+        @Bean
+        public RedisConnectionFactory connectionFactory() {
+
+            RedisConnectionFactory factory = Mockito.mock(RedisConnectionFactory.class);
+            RedisConnection connection = Mockito.mock(RedisConnection.class);
+            Mockito.when(factory.getConnection()).thenReturn(connection);
+
+            return factory;
+        }
+    }
 }

spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/org/baeldung/BookReviewsApiIntegrationTest.java

@@ -1,36 +1,43 @@
 package org.baeldung;
 
-import java.io.IOException;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.test.context.junit4.SpringRunner;
-import redis.embedded.RedisServer;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class BookReviewsApiIntegrationTest {
 
-    private static RedisServer redisServer;
-    private static int port;
-
-    @BeforeClass
-    public static void setUp() throws IOException {
-
-        redisServer = new RedisServer(6379);
-        redisServer.start();
-    }
-
-    @AfterClass
-    public static void destroy() {
-        redisServer.stop();
-    }
-
     @Test
     public void contextLoads() {
     }
 
+    @EnableRedisHttpSession
+    @Configuration
+    static class Config {
+
+        @Bean
+        @SuppressWarnings("unchecked")
+        public RedisSerializer<Object> defaultRedisSerializer() {
+            return Mockito.mock(RedisSerializer.class);
+        }
+
+        @Bean
+        public RedisConnectionFactory connectionFactory() {
+
+            RedisConnectionFactory factory = Mockito.mock(RedisConnectionFactory.class);
+            RedisConnection connection = Mockito.mock(RedisConnection.class);
+            Mockito.when(factory.getConnection()).thenReturn(connection);
+
+            return factory;
+        }
+    }
 }

spring-rest-simple/src/test/java/org/baeldung/web/controller/status/ExampleControllerIntegrationTest.java

@@ -8,6 +8,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.client.AutoConfigureWebClient;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -18,6 +19,7 @@ import org.springframework.web.context.WebApplicationContext;
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = WebConfig.class)
 @WebAppConfiguration
+@AutoConfigureWebClient
 public class ExampleControllerIntegrationTest {
 
     private MockMvc mockMvc;

spring-rest-simple/src/test/java/org/baeldung/web/test/BazzNewMappingsExampleIntegrationTest.java

@@ -15,6 +15,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.client.AutoConfigureWebClient;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -26,6 +27,7 @@ import org.springframework.web.context.WebApplicationContext;
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = WebConfig.class)
 @WebAppConfiguration
+@AutoConfigureWebClient
 public class BazzNewMappingsExampleIntegrationTest {
     
     private MockMvc mockMvc;