From 93df24af164cdd78555b1fd40c4dd7ed54352200 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sat, 10 Nov 2018 15:38:42 +0100 Subject: [PATCH] Polishing --- ...sts.java => IsolatedTransactionModeSqlScriptsTests.java} | 6 +++--- .../test/context/junit4/SpringJUnit4TestSuite.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename spring-test/src/test/java/org/springframework/test/context/jdbc/{RequiresNewTransactionSqlScriptsTests.java => IsolatedTransactionModeSqlScriptsTests.java} (88%) diff --git a/spring-test/src/test/java/org/springframework/test/context/jdbc/RequiresNewTransactionSqlScriptsTests.java b/spring-test/src/test/java/org/springframework/test/context/jdbc/IsolatedTransactionModeSqlScriptsTests.java similarity index 88% rename from spring-test/src/test/java/org/springframework/test/context/jdbc/RequiresNewTransactionSqlScriptsTests.java rename to spring-test/src/test/java/org/springframework/test/context/jdbc/IsolatedTransactionModeSqlScriptsTests.java index 280e3c51b04..93f57b40c77 100644 --- a/spring-test/src/test/java/org/springframework/test/context/jdbc/RequiresNewTransactionSqlScriptsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/jdbc/IsolatedTransactionModeSqlScriptsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2018 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. @@ -29,14 +29,14 @@ import static org.junit.Assert.*; /** * Transactional integration tests that verify commit semantics for - * {@link SqlConfig#requireNewTransaction}. + * {@link SqlConfig#transactionMode} and {@link TransactionMode#ISOLATED}. * * @author Sam Brannen * @since 4.1 */ @ContextConfiguration(classes = PopulatedSchemaDatabaseConfig.class) @DirtiesContext -public class RequiresNewTransactionSqlScriptsTests extends AbstractTransactionalJUnit4SpringContextTests { +public class IsolatedTransactionModeSqlScriptsTests extends AbstractTransactionalJUnit4SpringContextTests { @BeforeTransaction public void beforeTransaction() { diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4TestSuite.java b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4TestSuite.java index 18ec53257ec..8e4ee2a925a 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4TestSuite.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4TestSuite.java @@ -21,7 +21,7 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; import org.springframework.test.context.cache.ClassLevelDirtiesContextTests; import org.springframework.test.context.cache.SpringRunnerContextCacheTests; -import org.springframework.test.context.jdbc.RequiresNewTransactionSqlScriptsTests; +import org.springframework.test.context.jdbc.IsolatedTransactionModeSqlScriptsTests; import org.springframework.test.context.junit4.annotation.AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests; import org.springframework.test.context.junit4.annotation.BeanOverridingDefaultConfigClassesInheritedTests; import org.springframework.test.context.junit4.annotation.BeanOverridingExplicitConfigClassesInheritedTests; @@ -111,7 +111,7 @@ StandardJUnit4FeaturesTests.class,// BeforeAndAfterTransactionAnnotationTests.class,// TimedTransactionalSpringRunnerTests.class,// ProgrammaticTxMgmtTests.class,// - RequiresNewTransactionSqlScriptsTests.class,// + IsolatedTransactionModeSqlScriptsTests.class,// HibernateSessionFlushingTests.class // }) public class SpringJUnit4TestSuite {