From e6d82e8cedc0b9df2e9929abcf573dfabc5cea4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Walter=20G=C3=B3mez?= <Warlord08@users.noreply.github.com>
Date: Thu, 19 Oct 2017 06:08:45 -0600
Subject: [PATCH] Fix/hibernate tests fix (#2758)

* Add project for hibernate immutable article
Add Event entity
Add hibernate configuration file
Add hibernateutil for configuration
Add test to match snippets from article

* Update master

* Update hibernate tests
Change sesssion handling
Modify event creation
---
 .../HibernateImmutableIntegrationTest.java     | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/spring-hibernate5/src/test/java/com/baeldung/hibernate/immutable/HibernateImmutableIntegrationTest.java b/spring-hibernate5/src/test/java/com/baeldung/hibernate/immutable/HibernateImmutableIntegrationTest.java
index b8cc3dc1a6..d6ecdb29d6 100644
--- a/spring-hibernate5/src/test/java/com/baeldung/hibernate/immutable/HibernateImmutableIntegrationTest.java
+++ b/spring-hibernate5/src/test/java/com/baeldung/hibernate/immutable/HibernateImmutableIntegrationTest.java
@@ -23,11 +23,8 @@ public class HibernateImmutableIntegrationTest {
 
     @Before
     public void before() {
-        session = HibernateUtil.getSessionFactory().getCurrentSession();
+        session = HibernateUtil.getSessionFactory().openSession();
         session.beginTransaction();
-        createEvent();
-        createEventGenerated();
-        session.setCacheMode(CacheMode.REFRESH);
     }
 
     @BeforeClass
@@ -40,8 +37,6 @@ public class HibernateImmutableIntegrationTest {
         HibernateUtil.getSessionFactory().close();
     }
 
-    //
-
     @Test
     public void addEvent() {
         Event event = new Event();
@@ -49,15 +44,18 @@ public class HibernateImmutableIntegrationTest {
         event.setTitle("Public Event");
         session.save(event);
         session.getTransaction().commit();
+        session.close();
     }
 
     @Test
     public void updateEvent() {
+        createEvent();
         Event event = (Event) session.createQuery("FROM Event WHERE title='New Event'").list().get(0);
         event.setTitle("Private Event");
         session.update(event);
         session.flush();
         session.refresh(event);
+        session.close();
 
         assertThat(event.getTitle(), equalTo("New Event"));
         assertThat(event.getId(), equalTo(5L));
@@ -65,13 +63,16 @@ public class HibernateImmutableIntegrationTest {
 
     @Test
     public void deleteEvent() {
+        createEvent();
         Event event = (Event) session.createQuery("FROM Event WHERE title='New Event'").list().get(0);
         session.delete(event);
         session.getTransaction().commit();
+        session.close();
     }
 
     @Test
     public void addGuest() {
+        createEvent();
         Event event = (Event) session.createQuery("FROM Event WHERE title='New Event'").list().get(0);
         String newGuest = "Sara";
         event.getGuestList().add(newGuest);
@@ -79,6 +80,7 @@ public class HibernateImmutableIntegrationTest {
         exception.expect(PersistenceException.class);
         session.save(event);
         session.getTransaction().commit();
+        session.close();
     }
 
     @Test
@@ -94,18 +96,18 @@ public class HibernateImmutableIntegrationTest {
 
     @Test
     public void updateEventGenerated() {
+        createEventGenerated();
         EventGeneratedId eventGeneratedId = (EventGeneratedId) session.createQuery("FROM EventGeneratedId WHERE name LIKE '%John%'").list().get(0);
         eventGeneratedId.setName("Mike");
         session.update(eventGeneratedId);
         session.flush();
         session.refresh(eventGeneratedId);
+        session.close();
 
         assertThat(eventGeneratedId.getName(), equalTo("John"));
         assertThat(eventGeneratedId.getId(), equalTo(1L));
     }
 
-    //
-
     private static void createEvent() {
         Event event = new Event(5L, "New Event", Sets.newHashSet("guest"));
         session.save(event);