From 6a998465b51fe337504e9b787cc13aa3bfa708d7 Mon Sep 17 00:00:00 2001
From: Joze RIHTARSIC <joze.rihtarsic@ext.ec.europa.eu>
Date: Fri, 31 Aug 2018 09:04:12 +0200
Subject: [PATCH] enable two datasources for test - old configured by maven and
new h2 for unit testing
---
.../smp/config/H2JPATestConfiguration.java | 22 ++++++++++++-------
.../smp/config/SmpServicesTestConfig.java | 2 --
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/H2JPATestConfiguration.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/H2JPATestConfiguration.java
index 21a050be9..dc42bdffc 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/H2JPATestConfiguration.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/H2JPATestConfiguration.java
@@ -22,29 +22,35 @@ import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource;
@Configuration
-@PropertySource("persistence-test-h2.properties")
+//@PropertySource("persistence-test-h2.properties")
@EnableTransactionManagement
public class H2JPATestConfiguration {
@Autowired
private Environment env;
- @Bean
- @Profile("db-h2-integration-test")
- public DataSource dataSource() {
+ @Bean(name = "h2DataSource")
+ public DataSource h2DataSource() {
DriverManagerDataSource dataSource = new DriverManagerDataSource();
-
+/*
dataSource.setDriverClassName(env.getProperty("jdbc.driverClassName"));
dataSource.setUrl(env.getProperty("jdbc.url"));
dataSource.setUsername(env.getProperty("jdbc.user"));
- dataSource.setPassword(env.getProperty("jdbc.pass"));
+ dataSource.setPassword(env.getProperty("jdbc.pass"));*/
+
+ dataSource.setDriverClassName("org.h2.Driver");
+ dataSource.setUrl("jdbc:h2:file:./target/myDb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=TRUE;AUTO_SERVER=TRUE");
+ dataSource.setUsername("smp-dev");
+ dataSource.setPassword("smp-dev");
+
+
return dataSource;
}
@Bean
- public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource, JpaVendorAdapter jpaVendorAdapter) {
+ public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource h2DataSource, JpaVendorAdapter jpaVendorAdapter) {
LocalContainerEntityManagerFactoryBean lef = new LocalContainerEntityManagerFactoryBean();
- lef.setDataSource(dataSource);
+ lef.setDataSource(h2DataSource);
lef.setJpaVendorAdapter(jpaVendorAdapter);
lef.setPackagesToScan("eu.europa.ec.edelivery.smp.data.ui");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SmpServicesTestConfig.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SmpServicesTestConfig.java
index 8ac5bff57..1bd2793fa 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SmpServicesTestConfig.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SmpServicesTestConfig.java
@@ -58,8 +58,6 @@ public class SmpServicesTestConfig {
driverManagerDataSource.setUsername(username);
driverManagerDataSource.setPassword(password);
-
-
return driverManagerDataSource;
}
--
GitLab