summaryrefslogtreecommitdiff
path: root/spring-tx/src/test/java/org/springframework
diff options
context:
space:
mode:
authorEmmanuel Bourg <ebourg@apache.org>2017-10-25 11:33:11 +0200
committerEmmanuel Bourg <ebourg@apache.org>2017-10-25 11:33:11 +0200
commit86ee2f0c49ee1002a7bcd624aa105caba0166617 (patch)
tree8cbe1246ec1113a082e23057c986bd09a569e5ef /spring-tx/src/test/java/org/springframework
parent0ffebdadce315ab1d00dd5de08d285bbf54a851e (diff)
New upstream version 4.3.12
Diffstat (limited to 'spring-tx/src/test/java/org/springframework')
-rw-r--r--spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java
index 871e6b1b..5c3b1616 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -38,11 +38,11 @@ public class TransactionSupportTests {
PlatformTransactionManager tm = new TestTransactionManager(false, true);
DefaultTransactionStatus status1 = (DefaultTransactionStatus)
tm.getTransaction(new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_SUPPORTS));
- assertTrue("Must not have transaction", status1.getTransaction() == null);
+ assertFalse("Must not have transaction", status1.hasTransaction());
DefaultTransactionStatus status2 = (DefaultTransactionStatus)
tm.getTransaction(new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_REQUIRED));
- assertTrue("Must have transaction", status2.getTransaction() != null);
+ assertTrue("Must have transaction", status2.hasTransaction());
assertTrue("Must be new transaction", status2.isNewTransaction());
try {