Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
99a48a9a
Commit
99a48a9a
authored
Jan 24, 2017
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to Narayana 5.5.1.Final
Closes gh-8096
parent
e42ae879
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
pom.xml
spring-boot-dependencies/pom.xml
+1
-1
NarayanaDataSourceBeanTests.java
...mework/boot/jta/narayana/NarayanaDataSourceBeanTests.java
+2
-2
No files found.
spring-boot-dependencies/pom.xml
View file @
99a48a9a
...
@@ -136,7 +136,7 @@
...
@@ -136,7 +136,7 @@
<mockito.version>
1.10.19
</mockito.version>
<mockito.version>
1.10.19
</mockito.version>
<mongodb.version>
3.4.1
</mongodb.version>
<mongodb.version>
3.4.1
</mongodb.version>
<mysql.version>
5.1.40
</mysql.version>
<mysql.version>
5.1.40
</mysql.version>
<narayana.version>
5.5.
0
.Final
</narayana.version>
<narayana.version>
5.5.
1
.Final
</narayana.version>
<nekohtml.version>
1.9.22
</nekohtml.version>
<nekohtml.version>
1.9.22
</nekohtml.version>
<neo4j-ogm.version>
2.1.1
</neo4j-ogm.version>
<neo4j-ogm.version>
2.1.1
</neo4j-ogm.version>
<postgresql.version>
9.4.1212.jre7
</postgresql.version>
<postgresql.version>
9.4.1212.jre7
</postgresql.version>
...
...
spring-boot/src/test/java/org/springframework/boot/jta/narayana/NarayanaDataSourceBeanTests.java
View file @
99a48a9a
...
@@ -83,7 +83,7 @@ public class NarayanaDataSourceBeanTests {
...
@@ -83,7 +83,7 @@ public class NarayanaDataSourceBeanTests {
Connection
mockConnection
=
mock
(
Connection
.
class
);
Connection
mockConnection
=
mock
(
Connection
.
class
);
XAConnection
mockXaConnection
=
mock
(
XAConnection
.
class
);
XAConnection
mockXaConnection
=
mock
(
XAConnection
.
class
);
given
(
mockXaConnection
.
getConnection
()).
willReturn
(
mockConnection
);
given
(
mockXaConnection
.
getConnection
()).
willReturn
(
mockConnection
);
given
(
this
.
dataSource
.
getXAConnection
()).
willReturn
(
mockXaConnection
);
given
(
this
.
dataSource
.
getXAConnection
(
""
,
""
)).
willReturn
(
mockXaConnection
);
Properties
properties
=
new
Properties
();
Properties
properties
=
new
Properties
();
properties
.
put
(
TransactionalDriver
.
XADataSource
,
this
.
dataSource
);
properties
.
put
(
TransactionalDriver
.
XADataSource
,
this
.
dataSource
);
...
@@ -93,7 +93,7 @@ public class NarayanaDataSourceBeanTests {
...
@@ -93,7 +93,7 @@ public class NarayanaDataSourceBeanTests {
connection
.
commit
();
connection
.
commit
();
verify
(
this
.
dataSource
,
times
(
1
)).
getXAConnection
();
verify
(
this
.
dataSource
,
times
(
1
)).
getXAConnection
(
""
,
""
);
verify
(
mockXaConnection
,
times
(
1
)).
getConnection
();
verify
(
mockXaConnection
,
times
(
1
)).
getConnection
();
verify
(
mockConnection
,
times
(
1
)).
commit
();
verify
(
mockConnection
,
times
(
1
)).
commit
();
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment