Skip to content

Commit 98223b0

Browse files
committed
Fix JdbcMessageStoreTests to use H2, not Derby
Looks like Derby is much slower than H2, plus it doesn't look so stable having so much sporadic failures. Looks like moving to H2 here saves for us `500 ms` test working time **Cherry-pick to 5.0.x** (cherry picked from commit 6dfe96d)
1 parent aca3212 commit 98223b0

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/JdbcMessageStoreTests-context.xml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,12 @@
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
5-
xmlns:context="http://www.springframework.org/schema/context"
65
xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
7-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
8-
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
6+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
97

10-
<jdbc:embedded-database id="dataSource" type="DERBY"/>
11-
12-
<jdbc:initialize-database data-source="dataSource">
13-
<jdbc:script location="${int.schema.script}"/>
14-
</jdbc:initialize-database>
15-
16-
<context:property-placeholder location="int-${ENVIRONMENT:derby}.properties"
17-
system-properties-mode="OVERRIDE"
18-
ignore-unresolvable="true"
19-
order="1"/>
8+
<jdbc:embedded-database id="dataSource" type="H2">
9+
<jdbc:script location="org/springframework/integration/jdbc/schema-h2.sql" />
10+
</jdbc:embedded-database>
2011

2112
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
2213
<property name="dataSource" ref="dataSource"/>

0 commit comments

Comments
 (0)