[BAEL-7620] - Fixed integration tests in spring-hibernate4 module by …

spring-hibernate4/pom.xml

@@ -127,6 +127,12 @@
             <version>${hsqldb.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 
@@ -153,6 +159,7 @@
         <tomcat-dbcp.version>8.5.8</tomcat-dbcp.version>
         <jta.version>1.1</jta.version>
         <hsqldb.version>2.3.4</hsqldb.version>
+        <h2.version>1.4.193</h2.version>
 
         <!-- various -->
         <hibernate-validator.version>5.3.3.Final</hibernate-validator.version>

spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/UserEager.java

@@ -16,7 +16,7 @@ public class UserEager implements Serializable {
     @Column(name = "USER_ID")
     private Long userId;
 
-    @OneToMany(fetch = FetchType.EAGER, mappedBy = "user")
+    @OneToMany(fetch = FetchType.EAGER)
     private Set<OrderDetail> orderDetail = new HashSet();
 
     public UserEager() {

spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/model/UserLazy.java

@@ -16,7 +16,7 @@ public class UserLazy implements Serializable {
     @Column(name = "USER_ID")
     private Long userId;
 
-    @OneToMany(fetch = FetchType.LAZY, mappedBy = "user")
+    @OneToMany(fetch = FetchType.LAZY)
     private Set<OrderDetail> orderDetail = new HashSet();
 
     public UserLazy() {

spring-hibernate4/src/main/java/com/baeldung/hibernate/fetching/view/FetchingAppView.java

@@ -20,7 +20,7 @@ public FetchingAppView() {
     public Set<OrderDetail> lazyLoaded() {
         final Session sessionLazy = HibernateUtil.getHibernateSession("lazy");
         List<UserLazy> users = sessionLazy.createQuery("From UserLazy").list();
-        UserLazy userLazyLoaded = users.get(3);
+        UserLazy userLazyLoaded = users.get(0);
         // since data is lazyloaded so data won't be initialized
         return (userLazyLoaded.getOrderDetail());
     }
@@ -31,7 +31,7 @@ public Set<OrderDetail> eagerLoaded() {
         // data should be loaded in the following line
         // also note the queries generated
         List<UserEager> user = sessionEager.createQuery("From UserEager").list();
-        UserEager userEagerLoaded = user.get(3);
+        UserEager userEagerLoaded = user.get(0);
         return userEagerLoaded.getOrderDetail();
     }
 

spring-hibernate4/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java

@@ -5,11 +5,6 @@
 
 import java.util.List;
 
-import com.baeldung.persistence.model.Foo;
-import com.baeldung.persistence.service.IBarAuditableService;
-import com.baeldung.persistence.service.IFooAuditableService;
-import com.baeldung.spring.PersistenceConfig;
-import com.baeldung.persistence.model.Bar;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.junit.After;
@@ -26,8 +21,14 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.persistence.model.Bar;
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.service.IBarAuditableService;
+import com.baeldung.persistence.service.IFooAuditableService;
+import com.baeldung.spring.config.PersistenceTestConfig;
+
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+@ContextConfiguration(classes = { PersistenceTestConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class EnversFooBarAuditIntegrationTest {
 
     private static Logger logger = LoggerFactory.getLogger(EnversFooBarAuditIntegrationTest.class);

spring-hibernate4/src/test/java/com/baeldung/persistence/audit/JPABarAuditIntegrationTest.java

@@ -7,10 +7,6 @@
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-import com.baeldung.persistence.model.Bar;
-import com.baeldung.persistence.model.Bar.OPERATION;
-import com.baeldung.persistence.service.IBarService;
-import com.baeldung.spring.PersistenceConfig;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -25,8 +21,13 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.persistence.model.Bar;
+import com.baeldung.persistence.model.Bar.OPERATION;
+import com.baeldung.persistence.service.IBarService;
+import com.baeldung.spring.config.PersistenceTestConfig;
+
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+@ContextConfiguration(classes = { PersistenceTestConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class JPABarAuditIntegrationTest {
 
     private static Logger logger = LoggerFactory.getLogger(JPABarAuditIntegrationTest.class);

spring-hibernate4/src/test/java/com/baeldung/persistence/audit/SpringDataJPABarAuditIntegrationTest.java

@@ -6,9 +6,6 @@
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-import com.baeldung.persistence.model.Bar;
-import com.baeldung.persistence.service.IBarService;
-import com.baeldung.spring.PersistenceConfig;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -24,8 +21,12 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.persistence.model.Bar;
+import com.baeldung.persistence.service.IBarService;
+import com.baeldung.spring.config.PersistenceTestConfig;
+
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+@ContextConfiguration(classes = { PersistenceTestConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class SpringDataJPABarAuditIntegrationTest {
 
     private static Logger logger = LoggerFactory.getLogger(SpringDataJPABarAuditIntegrationTest.class);

spring-hibernate4/src/test/java/com/baeldung/persistence/hibernate/FooPaginationPersistenceIntegrationTest.java

@@ -7,9 +7,6 @@
 
 import java.util.List;
 
-import com.baeldung.persistence.model.Foo;
-import com.baeldung.persistence.service.IFooService;
-import com.baeldung.spring.PersistenceConfig;
 import org.hibernate.Criteria;
 import org.hibernate.Query;
 import org.hibernate.ScrollMode;
@@ -26,10 +23,13 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.persistence.service.IFooService;
+import com.baeldung.spring.config.PersistenceTestConfig;
 import com.google.common.collect.Lists;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+@ContextConfiguration(classes = { PersistenceTestConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class FooPaginationPersistenceIntegrationTest {
 
     @Autowired

spring-hibernate4/src/test/java/com/baeldung/persistence/hibernate/FooSortingPersistenceIntegrationTest.java

@@ -5,9 +5,6 @@
 import java.util.List;
 import java.util.Set;
 
-import com.baeldung.persistence.model.Bar;
-import com.baeldung.persistence.model.Foo;
-import com.baeldung.spring.PersistenceConfig;
 import org.hibernate.Criteria;
 import org.hibernate.NullPrecedence;
 import org.hibernate.Query;
@@ -23,8 +20,12 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.persistence.model.Bar;
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.spring.config.PersistenceTestConfig;
+
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+@ContextConfiguration(classes = { PersistenceTestConfig.class }, loader = AnnotationConfigContextLoader.class)
 @SuppressWarnings("unchecked")
 public class FooSortingPersistenceIntegrationTest {
 

spring-hibernate4/src/test/java/com/baeldung/persistence/service/FooServiceBasicPersistenceIntegrationTest.java

@@ -2,8 +2,6 @@
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
-import com.baeldung.persistence.model.Foo;
-import com.baeldung.spring.PersistenceConfig;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.junit.After;
@@ -15,8 +13,11 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.spring.config.PersistenceTestConfig;
+
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+@ContextConfiguration(classes = { PersistenceTestConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class FooServiceBasicPersistenceIntegrationTest {
 
     @Autowired

spring-hibernate4/src/test/java/com/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java

@@ -2,8 +2,6 @@
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
-import com.baeldung.persistence.model.Foo;
-import com.baeldung.spring.PersistenceConfig;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -16,8 +14,11 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.persistence.model.Foo;
+import com.baeldung.spring.config.PersistenceTestConfig;
+
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+@ContextConfiguration(classes = { PersistenceTestConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class FooServicePersistenceIntegrationTest {
 
     @Autowired

spring-hibernate4/src/test/java/com/baeldung/persistence/service/FooStoredProceduresIntegrationTest.java → spring-hibernate4/src/test/java/com/baeldung/persistence/service/FooStoredProceduresLiveTest.java

@@ -26,9 +26,9 @@
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
-public class FooStoredProceduresIntegrationTest {
+public class FooStoredProceduresLiveTest {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(FooStoredProceduresIntegrationTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FooStoredProceduresLiveTest.class);
 
     @Autowired
     private SessionFactory sessionFactory;

spring-hibernate4/src/test/java/com/baeldung/persistence/service/ParentServicePersistenceIntegrationTest.java

@@ -1,8 +1,5 @@
 package com.baeldung.persistence.service;
 
-import com.baeldung.persistence.model.Child;
-import com.baeldung.persistence.model.Parent;
-import com.baeldung.spring.PersistenceConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,8 +8,12 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.persistence.model.Child;
+import com.baeldung.persistence.model.Parent;
+import com.baeldung.spring.config.PersistenceTestConfig;
+
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
+@ContextConfiguration(classes = { PersistenceTestConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class ParentServicePersistenceIntegrationTest {
 
     @Autowired