From 49482041d2b734f5e5a38735140bb58b4d69da1f Mon Sep 17 00:00:00 2001
From: Eugen Paraschiv <hanriseldon@gmail.com>
Date: Thu, 28 Sep 2017 14:28:52 +0300
Subject: [PATCH] testing cleanup

---
 ...utableEventGeneratedIdIntegrationTest.java | 56 -------------------
 .../HibernateImmutableIntegrationTest.java    | 25 +++++++++
 2 files changed, 25 insertions(+), 56 deletions(-)
 delete mode 100644 spring-hibernate5/src/test/java/com/baeldung/hibernate/immutable/HibernateImmutableEventGeneratedIdIntegrationTest.java

diff --git a/spring-hibernate5/src/test/java/com/baeldung/hibernate/immutable/HibernateImmutableEventGeneratedIdIntegrationTest.java b/spring-hibernate5/src/test/java/com/baeldung/hibernate/immutable/HibernateImmutableEventGeneratedIdIntegrationTest.java
deleted file mode 100644
index a0bd9fc950..0000000000
--- a/spring-hibernate5/src/test/java/com/baeldung/hibernate/immutable/HibernateImmutableEventGeneratedIdIntegrationTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.baeldung.hibernate.immutable;
-
-import com.baeldung.hibernate.immutable.entities.EventGeneratedId;
-import com.baeldung.hibernate.immutable.util.HibernateUtil;
-import org.hibernate.CacheMode;
-import org.hibernate.Session;
-import org.junit.*;
-import org.junit.rules.ExpectedException;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.IsEqual.equalTo;
-
-public class HibernateImmutableEventGeneratedIdIntegrationTest {
-
-    private static Session session;
-
-    @Rule
-    public final ExpectedException exception = ExpectedException.none();
-
-    @Before
-    public void before() {
-        session = HibernateUtil.getSessionFactory().getCurrentSession();
-        session.beginTransaction();
-        createEventGenerated();
-        session.setCacheMode(CacheMode.REFRESH);
-    }
-
-    @BeforeClass
-    public static void setup() {
-        session = HibernateUtil.getSessionFactory().getCurrentSession();
-    }
-
-    @AfterClass
-    public static void teardown() {
-        HibernateUtil.getSessionFactory().close();
-    }
-
-    @Test
-    public void updateEventGenerated() {
-        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);
-
-        assertThat(eventGeneratedId.getName(), equalTo("John"));
-        assertThat(eventGeneratedId.getId(), equalTo(1L));
-    }
-
-    private static void createEventGenerated() {
-        EventGeneratedId eventGeneratedId = new EventGeneratedId("John", "Doe");
-        eventGeneratedId.setId(4L);
-        session.save(eventGeneratedId);
-    }
-}
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 d6c238488f..b8cc3dc1a6 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
@@ -1,6 +1,7 @@
 package com.baeldung.hibernate.immutable;
 
 import com.baeldung.hibernate.immutable.entities.Event;
+import com.baeldung.hibernate.immutable.entities.EventGeneratedId;
 import com.baeldung.hibernate.immutable.util.HibernateUtil;
 import com.google.common.collect.Sets;
 import org.hibernate.CacheMode;
@@ -25,6 +26,7 @@ public class HibernateImmutableIntegrationTest {
         session = HibernateUtil.getSessionFactory().getCurrentSession();
         session.beginTransaction();
         createEvent();
+        createEventGenerated();
         session.setCacheMode(CacheMode.REFRESH);
     }
 
@@ -38,6 +40,8 @@ public class HibernateImmutableIntegrationTest {
         HibernateUtil.getSessionFactory().close();
     }
 
+    //
+
     @Test
     public void addEvent() {
         Event event = new Event();
@@ -88,8 +92,29 @@ public class HibernateImmutableIntegrationTest {
         session.getTransaction().commit();
     }
 
+    @Test
+    public void updateEventGenerated() {
+        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);
+
+        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);
     }
+
+    private static void createEventGenerated() {
+        EventGeneratedId eventGeneratedId = new EventGeneratedId("John", "Doe");
+        eventGeneratedId.setId(4L);
+        session.save(eventGeneratedId);
+    }
+
 }