Deleted second Test config. Refactoring Beans

src/test/java/de/kreth/vaadin/clubhelper/H2MemoryConfiguration.java

@@ -8,7 +8,7 @@ public class H2MemoryConfiguration extends AbstractHibernateConfiguration {
 	public void configure(Configuration configuration) {
 		super.configure(configuration);
 		configuration.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
-		configuration.setProperty("hibernate.connection.driver_class", "org.h2.Driver");
+//		configuration.setProperty("hibernate.connection.driver_class", "org.h2.Driver");
 		configuration.setProperty("hibernate.connection.url", getUrl());
 	}
 

src/test/java/de/kreth/vaadin/clubhelper/HibernateHolder.java

@@ -1,5 +1,8 @@
 package de.kreth.vaadin.clubhelper;
 
+import java.util.Properties;
+
+import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
 
 public enum HibernateHolder {
@@ -15,7 +18,15 @@ public enum HibernateHolder {
 		return configuration;
 	}
 
-	public static Configuration configuration() {
-		return INSTANCE.configuration;
+	public static Properties getProperties() {
+		return INSTANCE.configuration.getProperties();
+	}
+
+	public static SessionFactory sessionFactory() {
+		return INSTANCE.configuration.buildSessionFactory();
 	}
+
+//	public static Configuration configuration() {
+//		return INSTANCE.configuration;
+//	}
 }

src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/AbstractDatabaseTest.java

@@ -20,7 +20,6 @@ import javax.persistence.EntityTransaction;
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.cfg.Configuration;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -40,12 +39,7 @@ public abstract class AbstractDatabaseTest {
 
 	@BeforeAll
 	public static void setUpDatabase() throws Exception {
-
-		// setup the session factory
-		Configuration configuration = HibernateHolder.configuration();
-
-		sessionFactory = configuration.buildSessionFactory();
-
+		sessionFactory = HibernateHolder.sessionFactory();
 	}
 
 	public enum DB_TYPE {

src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/dao/DatabaseTestBean.java

@@ -1,26 +0,0 @@
-package de.kreth.vaadin.clubhelper.vaadinclubhelper.dao;
-
-import org.hibernate.cfg.Configuration;
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
-
-import de.kreth.vaadin.clubhelper.HibernateHolder;
-
-@SpringBootConfiguration
-@EnableAutoConfiguration
-public class DatabaseTestBean {
-
-	@Bean
-	public LocalSessionFactoryBean sessionFactory() throws Exception {
-
-		Configuration config = HibernateHolder.configuration();
-
-		LocalSessionFactoryBean sessionFactoryBean = new LocalSessionFactoryBean();
-		sessionFactoryBean.setHibernateProperties(config.getProperties());
-
-		return sessionFactoryBean;
-	}
-
-}

src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/tests/TestConfiguration.java

@@ -5,6 +5,7 @@ import javax.persistence.EntityManager;
 import org.hibernate.SessionFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 
 import de.kreth.vaadin.clubhelper.HibernateHolder;
 import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.EventBusiness;
@@ -14,13 +15,23 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.ClubEventDao;
 import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.ClubEventDaoImpl;
 
 @Configuration
+//@SpringBootConfiguration
+//@EnableAutoConfiguration
 public class TestConfiguration {
 
 	private SessionFactory sessionFactory;
 
 	public TestConfiguration() {
-		org.hibernate.cfg.Configuration configuration = HibernateHolder.configuration();
-		sessionFactory = configuration.buildSessionFactory();
+		sessionFactory = HibernateHolder.sessionFactory();
+	}
+
+	@Bean
+	public LocalSessionFactoryBean sessionFactory() throws Exception {
+
+		LocalSessionFactoryBean sessionFactoryBean = new LocalSessionFactoryBean();
+		sessionFactoryBean.setHibernateProperties(HibernateHolder.getProperties());
+
+		return sessionFactoryBean;
 	}
 
 	@Bean

src/test/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/tests/TestPflichten.java

@@ -8,7 +8,6 @@ import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
 
 import org.hibernate.SessionFactory;
-import org.hibernate.cfg.Configuration;
 
 import de.kreth.vaadin.clubhelper.HibernateHolder;
 import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Pflicht;
@@ -28,8 +27,7 @@ public class TestPflichten {
 	}
 
 	public static void main(String[] args) {
-		Configuration config = HibernateHolder.configuration();
-		SessionFactory sf = config.buildSessionFactory();
+		SessionFactory sf = HibernateHolder.sessionFactory();
 		EntityManager em = sf.createEntityManager();
 
 		List<Pflicht> pflichten = getFixedPflichten();