Consolidate TxMgr lookup tests in the TCF

This commit consolidates TransactionManager lookup tests in the Spring
TestContext Framework (TCF), migrates some to JUnit Jupiter, simplifies
their implementations, and removes duplicated test cases.

Author: sbrannen

spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndDefaultNameTests.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright 2002-2020 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
+ *
+ *      https://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.manager;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import org.springframework.test.context.transaction.AfterTransaction;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.testfixture.CallCountingTransactionManager;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Integration tests that verify the behavior requested in
+ * <a href="https://jira.spring.io/browse/SPR-9645">SPR-9645</a>.
+ *
+ * @author Sam Brannen
+ * @since 3.2
+ */
+@SpringJUnitConfig
+@Transactional
+class LookUpTxMgrByTypeAndDefaultNameTests {
+
+	@Autowired
+	CallCountingTransactionManager transactionManager;
+
+	@Autowired
+	CallCountingTransactionManager txManager2;
+
+
+	@Test
+	void transactionalTest() {
+		assertThat(transactionManager.begun).isEqualTo(1);
+		assertThat(transactionManager.inflight).isEqualTo(1);
+		assertThat(transactionManager.commits).isEqualTo(0);
+		assertThat(transactionManager.rollbacks).isEqualTo(0);
+
+		assertThat(txManager2.begun).isEqualTo(0);
+		assertThat(txManager2.inflight).isEqualTo(0);
+		assertThat(txManager2.commits).isEqualTo(0);
+		assertThat(txManager2.rollbacks).isEqualTo(0);
+	}
+
+	@AfterTransaction
+	void afterTransaction() {
+		assertThat(transactionManager.begun).isEqualTo(1);
+		assertThat(transactionManager.inflight).isEqualTo(0);
+		assertThat(transactionManager.commits).isEqualTo(0);
+		assertThat(transactionManager.rollbacks).isEqualTo(1);
+
+		assertThat(txManager2.begun).isEqualTo(0);
+		assertThat(txManager2.inflight).isEqualTo(0);
+		assertThat(txManager2.commits).isEqualTo(0);
+		assertThat(txManager2.rollbacks).isEqualTo(0);
+	}
+
+
+	@Configuration
+	static class Config {
+
+		@Bean
+		PlatformTransactionManager transactionManager() {
+			return new CallCountingTransactionManager();
+		}
+
+		@Bean
+		PlatformTransactionManager txManager2() {
+			return new CallCountingTransactionManager();
+		}
+
+	}
+
+}

spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndNameTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -14,17 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.test.context.junit4.spr9645;
+package org.springframework.test.context.transaction.manager;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import org.springframework.test.context.transaction.AfterTransaction;
-import org.springframework.test.context.transaction.BeforeTransaction;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.testfixture.CallCountingTransactionManager;
@@ -38,48 +36,57 @@
  * @author Sam Brannen
  * @since 3.2
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
+@SpringJUnitConfig
 @Transactional("txManager1")
-public class LookUpTxMgrByTypeAndQualifierAtClassLevelTests {
+class LookUpTxMgrByTypeAndQualifierAtClassLevelTests {
 
-	private static final CallCountingTransactionManager txManager1 = new CallCountingTransactionManager();
-	private static final CallCountingTransactionManager txManager2 = new CallCountingTransactionManager();
+	@Autowired
+	CallCountingTransactionManager txManager1;
 
-	@Configuration
-	static class Config {
-
-		@Bean
-		public PlatformTransactionManager txManager1() {
-			return txManager1;
-		}
-
-		@Bean
-		public PlatformTransactionManager txManager2() {
-			return txManager2;
-		}
-	}
+	@Autowired
+	CallCountingTransactionManager txManager2;
 
-	@BeforeTransaction
-	public void beforeTransaction() {
-		txManager1.clear();
-		txManager2.clear();
-	}
 
 	@Test
-	public void transactionalTest() {
+	void transactionalTest() {
 		assertThat(txManager1.begun).isEqualTo(1);
 		assertThat(txManager1.inflight).isEqualTo(1);
 		assertThat(txManager1.commits).isEqualTo(0);
 		assertThat(txManager1.rollbacks).isEqualTo(0);
+
+		assertThat(txManager2.begun).isEqualTo(0);
+		assertThat(txManager2.inflight).isEqualTo(0);
+		assertThat(txManager2.commits).isEqualTo(0);
+		assertThat(txManager2.rollbacks).isEqualTo(0);
 	}
 
 	@AfterTransaction
-	public void afterTransaction() {
+	void afterTransaction() {
 		assertThat(txManager1.begun).isEqualTo(1);
 		assertThat(txManager1.inflight).isEqualTo(0);
 		assertThat(txManager1.commits).isEqualTo(0);
 		assertThat(txManager1.rollbacks).isEqualTo(1);
+
+		assertThat(txManager2.begun).isEqualTo(0);
+		assertThat(txManager2.inflight).isEqualTo(0);
+		assertThat(txManager2.commits).isEqualTo(0);
+		assertThat(txManager2.rollbacks).isEqualTo(0);
+	}
+
+
+	@Configuration
+	static class Config {
+
+		@Bean
+		PlatformTransactionManager txManager1() {
+			return new CallCountingTransactionManager();
+		}
+
+		@Bean
+		PlatformTransactionManager txManager2() {
+			return new CallCountingTransactionManager();
+		}
+
 	}
 
 }