Test JUnit Jupiter 5.5 @Timeout support with Spring transactions

See gh-23076

spring-test/src/test/java/org/springframework/test/context/junit/jupiter/transaction/TimedTransactionalSpringExtensionTests.java

@@ -0,0 +1,123 @@
+/*
+ * Copyright 2002-2019 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.junit.jupiter.transaction;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import javax.sql.DataSource;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.junit.platform.testkit.engine.EngineTestKit;
+import org.junit.platform.testkit.engine.Events;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.test.context.junit.jupiter.FailingTestCase;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
+import static org.junit.platform.testkit.engine.EventConditions.event;
+import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure;
+import static org.junit.platform.testkit.engine.EventConditions.test;
+import static org.junit.platform.testkit.engine.TestExecutionResultConditions.instanceOf;
+import static org.junit.platform.testkit.engine.TestExecutionResultConditions.message;
+import static org.springframework.test.transaction.TransactionAssert.assertThatTransaction;
+
+/**
+ * JUnit Jupiter based integration tests which verify support for Spring's
+ * {@link Transactional @Transactional} annotation in conjunction with JUnit
+ * Jupiter's {@link Timeout @Timeout}.
+ *
+ * @author Sam Brannen
+ * @since 5.2
+ * @see org.springframework.test.context.junit4.TimedTransactionalSpringRunnerTests
+ */
+class TimedTransactionalSpringExtensionTests {
+
+	@Test
+	void springTransactionsWorkWithJUnitJupiterTimeouts() {
+		Events events = EngineTestKit.engine("junit-jupiter")
+				.selectors(selectClass(TestCase.class))
+				.execute()
+				.tests()
+				.assertStatistics(stats -> stats.started(4).succeeded(2).failed(2));
+
+		events.failed().assertThatEvents().haveAtMost(2,
+			event(test("WithExceededJUnitJupiterTimeout"),
+				finishedWithFailure(
+					instanceOf(TimeoutException.class),
+					message(msg -> msg.endsWith("timed out after 50 milliseconds")))));
+	}
+
+
+	@SpringJUnitConfig
+	@Transactional
+	@FailingTestCase
+	static class TestCase {
+
+		@Test
+		@Timeout(1)
+		void transactionalWithJUnitJupiterTimeout() {
+			assertThatTransaction().isActive();
+		}
+
+		@Test
+		@Timeout(value = 50, unit = TimeUnit.MILLISECONDS)
+		void transactionalWithExceededJUnitJupiterTimeout() throws Exception {
+			assertThatTransaction().isActive();
+			Thread.sleep(100);
+		}
+
+		@Test
+		@Timeout(1)
+		@Transactional(propagation = Propagation.NOT_SUPPORTED)
+		void notTransactionalWithJUnitJupiterTimeout() {
+			assertThatTransaction().isNotActive();
+		}
+
+		@Test
+		@Timeout(value = 50, unit = TimeUnit.MILLISECONDS)
+		@Transactional(propagation = Propagation.NOT_SUPPORTED)
+		void notTransactionalWithExceededJUnitJupiterTimeout() throws Exception {
+			assertThatTransaction().isNotActive();
+			Thread.sleep(100);
+		}
+
+
+		@Configuration
+		static class Config {
+
+			@Bean
+			PlatformTransactionManager transactionManager(DataSource dataSource) {
+				return new DataSourceTransactionManager(dataSource);
+			}
+
+			@Bean
+			DataSource dataSource() {
+				return new EmbeddedDatabaseBuilder().generateUniqueName(true).build();
+			}
+		}
+
+	}
+
+}

spring-test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java

@@ -35,6 +35,7 @@ import static org.springframework.test.transaction.TransactionAssert.assertThatT
  *
  * @author Sam Brannen
  * @since 2.5
+ * @see org.springframework.test.context.junit.jupiter.transaction.TimedTransactionalSpringExtensionTests
  */
 @RunWith(SpringRunner.class)
 @ContextConfiguration("transactionalTests-context.xml")