You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ie...@apache.org on 2020/06/30 20:51:54 UTC
[james-project] 20/23: JAMES-3260 Reproducible tests for
spring-jpa-tests
This is an automated email from the ASF dual-hosted git repository.
ieugen pushed a commit to branch JAMES-3260-gradle-poc
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 2c2f71f8164cda0f86de6fa7fdac5e51a625485d
Author: Eugen Stan <ie...@apache.org>
AuthorDate: Fri Jun 26 09:58:04 2020 +0300
JAMES-3260 Reproducible tests for spring-jpa-tests
* Moved database properties on the test classpath instead of resource path
* Configuration should be supplied during deployment
* Enabled tests for jpa-guice module
---
mailbox/jpa/src/{main => test}/resources/james-database.properties | 2 +-
.../src/test/resources/META-INF/org/apache/james/database.properties | 2 +-
.../src/test/resources/META-INF/spring/mailbox-index-lucene-test.xml | 2 +-
.../src/main => spring/src/test}/resources/james-database.properties | 2 +-
server/container/guice/jpa-guice/build.gradle | 2 --
5 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/mailbox/jpa/src/main/resources/james-database.properties b/mailbox/jpa/src/test/resources/james-database.properties
similarity index 96%
copy from mailbox/jpa/src/main/resources/james-database.properties
copy to mailbox/jpa/src/test/resources/james-database.properties
index 22770d0..7fd7d9f 100644
--- a/mailbox/jpa/src/main/resources/james-database.properties
+++ b/mailbox/jpa/src/test/resources/james-database.properties
@@ -22,7 +22,7 @@
# Use derby as default
database.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
-database.url=jdbc:derby:../var/store/derby;create=true
+database.url=jdbc:derby:build/var/store/derby;create=true
database.username=app
database.password=app
diff --git a/mailbox/spring/src/test/resources/META-INF/org/apache/james/database.properties b/mailbox/spring/src/test/resources/META-INF/org/apache/james/database.properties
index 8477c6b..ac2dd64 100644
--- a/mailbox/spring/src/test/resources/META-INF/org/apache/james/database.properties
+++ b/mailbox/spring/src/test/resources/META-INF/org/apache/james/database.properties
@@ -19,7 +19,7 @@
# See http://james.apache.org/server/3/config.html for usage
database.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
-database.url=jdbc:derby:target/var/store/derby;create=true
+database.url=jdbc:derby:build/var/store/derby;create=true
database.username=app
database.password=app
vendorAdapter.database=DERBY
diff --git a/mailbox/spring/src/test/resources/META-INF/spring/mailbox-index-lucene-test.xml b/mailbox/spring/src/test/resources/META-INF/spring/mailbox-index-lucene-test.xml
index bf7036e..e8115f3 100644
--- a/mailbox/spring/src/test/resources/META-INF/spring/mailbox-index-lucene-test.xml
+++ b/mailbox/spring/src/test/resources/META-INF/spring/mailbox-index-lucene-test.xml
@@ -36,7 +36,7 @@
<property name="enableSuffixMatch" value="true"/>
</bean>
<bean id="fsDirectory" class="org.apache.lucene.store.FSDirectory" factory-method="open">
- <constructor-arg index="0" value="../var/store/lucene"/>
+ <constructor-arg index="0" value="build/var/store/lucene"/>
</bean>
<alias name="jpa-mailboxIdFactory" alias="mailboxIdFactory"/>
<alias name="jpa-mailboxmanager" alias="mailboxmanager"/>
diff --git a/mailbox/jpa/src/main/resources/james-database.properties b/mailbox/spring/src/test/resources/james-database.properties
similarity index 96%
rename from mailbox/jpa/src/main/resources/james-database.properties
rename to mailbox/spring/src/test/resources/james-database.properties
index 22770d0..7fd7d9f 100644
--- a/mailbox/jpa/src/main/resources/james-database.properties
+++ b/mailbox/spring/src/test/resources/james-database.properties
@@ -22,7 +22,7 @@
# Use derby as default
database.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
-database.url=jdbc:derby:../var/store/derby;create=true
+database.url=jdbc:derby:build/var/store/derby;create=true
database.username=app
database.password=app
diff --git a/server/container/guice/jpa-guice/build.gradle b/server/container/guice/jpa-guice/build.gradle
index a93ee16..902b60e 100644
--- a/server/container/guice/jpa-guice/build.gradle
+++ b/server/container/guice/jpa-guice/build.gradle
@@ -59,8 +59,6 @@ dependencies {
test {
useJUnitPlatform()
- // TODO: @ieugen: Disabled temporarily. Fails with ` Database connection refused.` Part of https://issues.apache.org/jira/browse/JAMES-3260
- enabled = false
}
description = 'Apache James :: Server :: JPA - guice injection'
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org