Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
c4bbc9df
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
c4bbc9df
编写于
7月 25, 2015
作者:
S
Sam Brannen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Migrate @TxConfig usage to @Rollback & @Transactional qualifiers
Issue: SPR-13276, SPR-13277
上级
3f8b5128
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
70 addition
and
40 deletion
+70
-40
spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndNameTests.java
...context/junit4/spr9645/LookUpTxMgrByTypeAndNameTests.java
+2
-4
spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/CommitForRequiredEjbTxDaoTestNGTests.java
...transaction/ejb/CommitForRequiredEjbTxDaoTestNGTests.java
+5
-5
spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/CommitForRequiresNewEjbTxDaoTestNGTests.java
...nsaction/ejb/CommitForRequiresNewEjbTxDaoTestNGTests.java
+5
-5
spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/RollbackForRequiredEjbTxDaoTestNGTests.java
...ansaction/ejb/RollbackForRequiredEjbTxDaoTestNGTests.java
+5
-5
spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/RollbackForRequiresNewEjbTxDaoTestNGTests.java
...action/ejb/RollbackForRequiresNewEjbTxDaoTestNGTests.java
+5
-5
spring-test/src/test/java/org/springframework/test/context/transaction/Commit.java
.../org/springframework/test/context/transaction/Commit.java
+37
-0
spring-test/src/test/java/org/springframework/test/context/transaction/TransactionalTestExecutionListenerTests.java
.../transaction/TransactionalTestExecutionListenerTests.java
+0
-5
spring-test/src/test/java/org/springframework/test/context/transaction/ejb/CommitForRequiredEjbTxDaoTests.java
...ntext/transaction/ejb/CommitForRequiredEjbTxDaoTests.java
+2
-2
spring-test/src/test/java/org/springframework/test/context/transaction/ejb/CommitForRequiresNewEjbTxDaoTests.java
...xt/transaction/ejb/CommitForRequiresNewEjbTxDaoTests.java
+3
-3
spring-test/src/test/java/org/springframework/test/context/transaction/ejb/RollbackForRequiredEjbTxDaoTests.java
...ext/transaction/ejb/RollbackForRequiredEjbTxDaoTests.java
+3
-3
spring-test/src/test/java/org/springframework/test/context/transaction/ejb/RollbackForRequiresNewEjbTxDaoTests.java
.../transaction/ejb/RollbackForRequiresNewEjbTxDaoTests.java
+3
-3
未找到文件。
spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndNameTests.java
浏览文件 @
c4bbc9df
/*
* Copyright 2002-201
3
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -25,7 +25,6 @@ import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.transaction.AfterTransaction
;
import
org.springframework.test.context.transaction.BeforeTransaction
;
import
org.springframework.test.context.transaction.TransactionConfiguration
;
import
org.springframework.tests.transaction.CallCountingTransactionManager
;
import
org.springframework.transaction.PlatformTransactionManager
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -41,8 +40,7 @@ import static org.junit.Assert.*;
*/
@RunWith
(
SpringJUnit4ClassRunner
.
class
)
@ContextConfiguration
@Transactional
@TransactionConfiguration
(
transactionManager
=
"txManager1"
)
@Transactional
(
"txManager1"
)
public
class
LookUpTxMgrByTypeAndNameTests
{
private
static
final
CallCountingTransactionManager
txManager1
=
new
CallCountingTransactionManager
();
...
...
spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/CommitForRequiredEjbTxDaoTestNGTests.java
浏览文件 @
c4bbc9df
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -16,13 +16,13 @@
package
org.springframework.test.context.testng.transaction.ejb
;
import
org.testng.annotations.Test
;
import
org.springframework.test.context.ContextConfiguration
;
import
org.springframework.test.context.transaction.
TransactionConfiguration
;
import
org.springframework.test.context.transaction.
Commit
;
import
org.springframework.test.context.transaction.TransactionalTestExecutionListener
;
import
org.springframework.test.context.transaction.ejb.dao.RequiredEjbTxTestEntityDao
;
import
org.testng.annotations.Test
;
/**
* Concrete subclass of {@link AbstractEjbTxDaoTestNGTests} which uses the
* {@link RequiredEjbTxTestEntityDao} and sets the default rollback semantics
...
...
@@ -34,7 +34,7 @@ import org.springframework.test.context.transaction.ejb.dao.RequiredEjbTxTestEnt
*/
@Test
(
suiteName
=
"Commit for REQUIRED"
)
@ContextConfiguration
(
"/org/springframework/test/context/transaction/ejb/required-tx-config.xml"
)
@
TransactionConfiguration
(
defaultRollback
=
false
)
@
Commit
public
class
CommitForRequiredEjbTxDaoTestNGTests
extends
AbstractEjbTxDaoTestNGTests
{
/* test methods in superclass */
...
...
spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/CommitForRequiresNewEjbTxDaoTestNGTests.java
浏览文件 @
c4bbc9df
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -16,13 +16,13 @@
package
org.springframework.test.context.testng.transaction.ejb
;
import
org.testng.annotations.Test
;
import
org.springframework.test.context.ContextConfiguration
;
import
org.springframework.test.context.transaction.
TransactionConfiguration
;
import
org.springframework.test.context.transaction.
Commit
;
import
org.springframework.test.context.transaction.TransactionalTestExecutionListener
;
import
org.springframework.test.context.transaction.ejb.dao.RequiresNewEjbTxTestEntityDao
;
import
org.testng.annotations.Test
;
/**
* Concrete subclass of {@link AbstractEjbTxDaoTestNGTests} which uses the
* {@link RequiresNewEjbTxTestEntityDao} and sets the default rollback semantics
...
...
@@ -34,7 +34,7 @@ import org.springframework.test.context.transaction.ejb.dao.RequiresNewEjbTxTest
*/
@Test
(
suiteName
=
"Commit for REQUIRES_NEW"
)
@ContextConfiguration
(
"/org/springframework/test/context/transaction/ejb/requires-new-tx-config.xml"
)
@
TransactionConfiguration
(
defaultRollback
=
false
)
@
Commit
public
class
CommitForRequiresNewEjbTxDaoTestNGTests
extends
AbstractEjbTxDaoTestNGTests
{
/* test methods in superclass */
...
...
spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/RollbackForRequiredEjbTxDaoTestNGTests.java
浏览文件 @
c4bbc9df
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -16,11 +16,11 @@
package
org.springframework.test.context.testng.transaction.ejb
;
import
org.testng.annotations.Test
;
import
org.springframework.test.context.transaction.TransactionConfiguration
;
import
org.springframework.test.annotation.Rollback
;
import
org.springframework.test.context.transaction.TransactionalTestExecutionListener
;
import
org.testng.annotations.Test
;
import
static
org
.
testng
.
AssertJUnit
.*;
/**
...
...
@@ -35,7 +35,7 @@ import static org.testng.AssertJUnit.*;
* @since 4.0.1
*/
@Test
(
suiteName
=
"Rollback for REQUIRED"
)
@
TransactionConfiguration
(
defaultRollback
=
true
)
@
Rollback
public
class
RollbackForRequiredEjbTxDaoTestNGTests
extends
CommitForRequiredEjbTxDaoTestNGTests
{
/**
...
...
spring-test/src/test/java/org/springframework/test/context/testng/transaction/ejb/RollbackForRequiresNewEjbTxDaoTestNGTests.java
浏览文件 @
c4bbc9df
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -16,11 +16,11 @@
package
org.springframework.test.context.testng.transaction.ejb
;
import
org.testng.annotations.Test
;
import
org.springframework.test.context.transaction.TransactionConfiguration
;
import
org.springframework.test.annotation.Rollback
;
import
org.springframework.test.context.transaction.TransactionalTestExecutionListener
;
import
org.testng.annotations.Test
;
/**
* Extension of {@link CommitForRequiresNewEjbTxDaoTestNGTests} which sets the default
* rollback semantics for the {@link TransactionalTestExecutionListener} to
...
...
@@ -37,7 +37,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi
* @since 4.0.1
*/
@Test
(
suiteName
=
"Rollback for REQUIRES_NEW"
)
@
TransactionConfiguration
(
defaultRollback
=
true
)
@
Rollback
public
class
RollbackForRequiresNewEjbTxDaoTestNGTests
extends
CommitForRequiresNewEjbTxDaoTestNGTests
{
/* test methods in superclass */
...
...
spring-test/src/test/java/org/springframework/test/context/transaction/Commit.java
0 → 100644
浏览文件 @
c4bbc9df
/*
* Copyright 2002-2015 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.springframework.test.context.transaction
;
import
java.lang.annotation.Documented
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.Target
;
import
org.springframework.test.annotation.Rollback
;
import
static
java
.
lang
.
annotation
.
ElementType
.*;
import
static
java
.
lang
.
annotation
.
RetentionPolicy
.*;
/**
* @author Sam Brannen
* @since 4.2
*/
@Documented
@Retention
(
RUNTIME
)
@Target
({
TYPE
,
METHOD
,
ANNOTATION_TYPE
})
@Rollback
(
false
)
public
@interface
Commit
{
}
spring-test/src/test/java/org/springframework/test/context/transaction/TransactionalTestExecutionListenerTests.java
浏览文件 @
c4bbc9df
...
...
@@ -355,11 +355,6 @@ public class TransactionalTestExecutionListenerTests {
String
transactionManager
()
default
"metaTxMgr"
;
}
@Rollback
(
false
)
@Retention
(
RetentionPolicy
.
RUNTIME
)
private
static
@interface
Commit
{
}
private
static
abstract
class
Invocable
{
boolean
invoked
=
false
;
...
...
spring-test/src/test/java/org/springframework/test/context/transaction/ejb/CommitForRequiredEjbTxDaoTests.java
浏览文件 @
c4bbc9df
...
...
@@ -17,7 +17,7 @@
package
org.springframework.test.context.transaction.ejb
;
import
org.springframework.test.context.ContextConfiguration
;
import
org.springframework.test.context.transaction.
TransactionConfiguration
;
import
org.springframework.test.context.transaction.
Commit
;
import
org.springframework.test.context.transaction.TransactionalTestExecutionListener
;
import
org.springframework.test.context.transaction.ejb.dao.RequiredEjbTxTestEntityDao
;
...
...
@@ -31,7 +31,7 @@ import org.springframework.test.context.transaction.ejb.dao.RequiredEjbTxTestEnt
* @since 4.0.1
*/
@ContextConfiguration
(
"required-tx-config.xml"
)
@
TransactionConfiguration
(
defaultRollback
=
false
)
@
Commit
public
class
CommitForRequiredEjbTxDaoTests
extends
AbstractEjbTxDaoTests
{
/* test methods in superclass */
...
...
spring-test/src/test/java/org/springframework/test/context/transaction/ejb/CommitForRequiresNewEjbTxDaoTests.java
浏览文件 @
c4bbc9df
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -17,7 +17,7 @@
package
org.springframework.test.context.transaction.ejb
;
import
org.springframework.test.context.ContextConfiguration
;
import
org.springframework.test.context.transaction.
TransactionConfiguration
;
import
org.springframework.test.context.transaction.
Commit
;
import
org.springframework.test.context.transaction.TransactionalTestExecutionListener
;
import
org.springframework.test.context.transaction.ejb.dao.RequiresNewEjbTxTestEntityDao
;
...
...
@@ -31,7 +31,7 @@ import org.springframework.test.context.transaction.ejb.dao.RequiresNewEjbTxTest
* @since 4.0.1
*/
@ContextConfiguration
(
"requires-new-tx-config.xml"
)
@
TransactionConfiguration
(
defaultRollback
=
false
)
@
Commit
public
class
CommitForRequiresNewEjbTxDaoTests
extends
AbstractEjbTxDaoTests
{
/* test methods in superclass */
...
...
spring-test/src/test/java/org/springframework/test/context/transaction/ejb/RollbackForRequiredEjbTxDaoTests.java
浏览文件 @
c4bbc9df
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -20,7 +20,7 @@ import org.junit.FixMethodOrder;
import
org.junit.Test
;
import
org.junit.runners.MethodSorters
;
import
org.springframework.test.
context.transaction.TransactionConfiguration
;
import
org.springframework.test.
annotation.Rollback
;
import
org.springframework.test.context.transaction.TransactionalTestExecutionListener
;
import
static
org
.
junit
.
Assert
.*;
...
...
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
* @since 4.0.1
*/
@FixMethodOrder
(
MethodSorters
.
NAME_ASCENDING
)
@
TransactionConfiguration
(
defaultRollback
=
true
)
@
Rollback
public
class
RollbackForRequiredEjbTxDaoTests
extends
CommitForRequiredEjbTxDaoTests
{
/**
...
...
spring-test/src/test/java/org/springframework/test/context/transaction/ejb/RollbackForRequiresNewEjbTxDaoTests.java
浏览文件 @
c4bbc9df
/*
* Copyright 2002-201
4
the original author or authors.
* Copyright 2002-201
5
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.
...
...
@@ -16,7 +16,7 @@
package
org.springframework.test.context.transaction.ejb
;
import
org.springframework.test.
context.transaction.TransactionConfiguration
;
import
org.springframework.test.
annotation.Rollback
;
import
org.springframework.test.context.transaction.TransactionalTestExecutionListener
;
/**
...
...
@@ -34,7 +34,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi
* @author Sam Brannen
* @since 4.0.1
*/
@
TransactionConfiguration
(
defaultRollback
=
true
)
@
Rollback
public
class
RollbackForRequiresNewEjbTxDaoTests
extends
CommitForRequiresNewEjbTxDaoTests
{
/* test methods in superclass */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录