Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Rossen Stoyanchev
2013-05-06 16:44:35 -04:00
9 changed files with 0 additions and 9 deletions
@@ -73,7 +73,6 @@ import org.springframework.transaction.annotation.Transactional;
*/
@TestExecutionListeners(TransactionalTestExecutionListener.class)
@Transactional
@SuppressWarnings("deprecation")
public abstract class AbstractTransactionalJUnit4SpringContextTests extends AbstractJUnit4SpringContextTests {
/**
@@ -64,7 +64,6 @@ import org.springframework.transaction.annotation.Transactional;
*/
@TestExecutionListeners(TransactionalTestExecutionListener.class)
@Transactional
@SuppressWarnings("deprecation")
public abstract class AbstractTransactionalTestNGSpringContextTests extends AbstractTestNGSpringContextTests {
/**
@@ -93,7 +93,6 @@ import org.springframework.util.StringUtils;
* @see BeforeTransaction
* @see AfterTransaction
*/
@SuppressWarnings("deprecation")
public class TransactionalTestExecutionListener extends AbstractTestExecutionListener {
private static final Log logger = LogFactory.getLog(TransactionalTestExecutionListener.class);
@@ -50,7 +50,6 @@ import org.springframework.transaction.annotation.Transactional;
* @author Sam Brannen
* @since 2.5
*/
@SuppressWarnings("deprecation")
@ContextConfiguration
public class ConcreteTransactionalJUnit4SpringContextTests extends AbstractTransactionalJUnit4SpringContextTests
implements BeanNameAware, InitializingBean {
@@ -37,7 +37,6 @@ import org.springframework.test.context.TestExecutionListeners;
* @author Sam Brannen
* @since 3.0
*/
@SuppressWarnings("deprecation")
@RunWith(JUnit4.class)
public class ExpectedExceptionSpringRunnerTests {
@@ -38,7 +38,6 @@ import org.springframework.transaction.annotation.Transactional;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration("transactionalTests-context.xml")
@Transactional
@SuppressWarnings("deprecation")
public class TimedTransactionalSpringRunnerTests {
@Test
@@ -54,7 +54,6 @@ import org.testng.annotations.Test;
* @author Sam Brannen
* @since 3.1
*/
@SuppressWarnings("deprecation")
@ContextConfiguration
public class AnnotationConfigTransactionalTestNGSpringContextTests extends
AbstractTransactionalTestNGSpringContextTests {
@@ -48,7 +48,6 @@ import org.testng.annotations.Test;
* @author Sam Brannen
* @since 2.5
*/
@SuppressWarnings("deprecation")
@ContextConfiguration
public class ConcreteTransactionalTestNGSpringContextTests extends AbstractTransactionalTestNGSpringContextTests
implements BeanNameAware, InitializingBean {
@@ -53,7 +53,6 @@ public class DirtiesContextTransactionalTestNGSpringContextTests extends Abstrac
private ApplicationContext dirtiedApplicationContext;
@SuppressWarnings("deprecation")
private void performCommonAssertions() {
assertInTransaction(true);
assertNotNull(super.applicationContext,