Merge remote-tracking branch 'origin/master'

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 
-install: travis_wait 60 mvn -q test
+install: travis_wait 60 mvn -q test -fae
 
 before_script:
   - echo "MAVEN_OPTS='-Xmx2048M -Xss128M -XX:MaxPermSize=2048M -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:-UseGCOverheadLimit'" > ~/.mavenrc

spring-boot/src/test/java/org/baeldung/boot/boottest/EmployeeRestControllerIntegrationTest.java

@@ -19,18 +19,19 @@ import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.http.MediaType;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, classes = DemoApplication.class)
 @AutoConfigureMockMvc
-@TestPropertySource(locations = "classpath:application-integrationtest.properties")
+// @TestPropertySource(locations = "classpath:application-integrationtest.properties")
+@AutoConfigureTestDatabase
 public class EmployeeRestControllerIntegrationTest {
 
     @Autowired

spring-boot/src/test/resources/application-integrationtest.properties

@@ -1,2 +1,4 @@
-spring.datasource.url = jdbc:h2:mem:test
-spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.H2Dialect
+spring.datasource.url=jdbc:mysql://localhost:3306/employee_int_test
+spring.datasource.username=root
+spring.datasource.password=root
+