Added new tables to sqlite (used for the test suite).
Change-Id: Ia3c85fb98d81cb6d09423c91cd333d9f14928484
diff --git a/full/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusDaoTest.java b/full/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusDaoTest.java
index d9b5ad2..d3def19 100644
--- a/full/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusDaoTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/dao/VirtualCorpusDaoTest.java
@@ -1,4 +1,4 @@
-package de.ids_mannheim.de.korap.dao;
+package de.ids_mannheim.korap.dao;
import static org.junit.Assert.assertEquals;
diff --git a/full/src/test/resources/test-config.xml b/full/src/test/resources/test-config.xml
index b720834..c5c47af 100644
--- a/full/src/test/resources/test-config.xml
+++ b/full/src/test/resources/test-config.xml
@@ -60,7 +60,7 @@
<property name="url" value="${jdbc.url}" />
<property name="username" value="${jdbc.username}" />
<property name="password" value="${jdbc.password}" />
- <property name="maxTotal" value="1" />
+ <property name="maxTotal" value="4" />
<property name="maxIdle" value="1" />
<property name="minIdle" value="1" />
<property name="maxWaitMillis" value="15000" />
@@ -70,7 +70,7 @@
<!-- use SingleConnection only for testing! -->
<bean id="sqliteDataSource"
class="org.springframework.jdbc.datasource.SingleConnectionDataSource"
- lazy-init="true" destroy-method="destroy">
+ lazy-init="true">
<!-- <property name="driverClassName" value="${jdbc.driverClassName}" /> -->
<property name="url" value="${jdbc.url}" />
<property name="username" value="${jdbc.username}" />
@@ -87,7 +87,7 @@
<property name="jdbcUrl" value="${jdbc.url}" />
<property name="user" value="${jdbc.username}" />
<property name="password" value="${jdbc.password}" />
- <property name="maxPoolSize" value="1" />
+ <property name="maxPoolSize" value="4" />
<property name="minPoolSize" value="1" />
<property name="maxStatements" value="1" />
<property name="testConnectionOnCheckout" value="true" />
@@ -102,16 +102,19 @@
<property name="baselineOnMigrate" value="false" />
<property name="locations" value="${jdbc.schemaPath}" />
<property name="dataSource" ref="sqliteDataSource" />
+ <!-- <property name="dataSource" ref="dataSource" /> -->
</bean>
<bean id="kustvakt_db" class="de.ids_mannheim.korap.handlers.JDBCClient">
+ <!-- <constructor-arg index="0" ref="dataSource" /> -->
<constructor-arg index="0" ref="sqliteDataSource" />
- <property name="database" value="sqlite" />
+ <property name="database" value="${jdbc.database}" />
</bean>
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
- <property name="dataSource" ref="dataSource" />
+ <!-- <property name="dataSource" ref="dataSource" /> -->
+ <property name="dataSource" ref="sqliteDataSource" />
<property name="packagesToScan" value="de.ids_mannheim.korap.entity" />
<property name="jpaVendorAdapter">
<bean id="jpaVendorAdapter"
diff --git a/full/src/test/resources/test-jdbc.properties b/full/src/test/resources/test-jdbc.properties
index ef7749d..7311a23 100644
--- a/full/src/test/resources/test-jdbc.properties
+++ b/full/src/test/resources/test-jdbc.properties
@@ -3,9 +3,9 @@
jdbc.database=sqlite
jdbc.driverClassName=org.sqlite.JDBC
-#jdbc.url=jdbc:sqlite:dbtest.sqlite
jdbc.url=jdbc:sqlite::memory:
-# jdbc.url=jdbc:sqlite:kustvakt_init_test.sqlite
+#jdbc.url=jdbc:sqlite:testDB.sqlite
jdbc.username=pc
jdbc.password=pc
jdbc.schemaPath=classpath:db.sqlite
+#jdbc.schemaPath=classpath:db.new-sqlite
\ No newline at end of file