From 8dc82b968941c506c9814264951d1bd14f3ecbb4 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Mon, 25 Feb 2019 14:09:39 +0100 Subject: [PATCH] Re-enable @Ignore'd TxMgt integration test See: gh-12857 --- .../EnableTransactionManagementIntegrationTests.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java index 25a21718d8..51f7d3156e 100644 --- a/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java +++ b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java @@ -21,7 +21,6 @@ import java.util.Collections; import java.util.List; import javax.sql.DataSource; -import org.junit.Ignore; import org.junit.Test; import org.springframework.aop.Advisor; @@ -51,6 +50,7 @@ import static org.junit.Assert.*; * Integration tests for the @EnableTransactionManagement annotation. * * @author Chris Beams + * @author Sam Brannen * @since 3.1 */ @SuppressWarnings("resource") @@ -89,13 +89,9 @@ public class EnableTransactionManagementIntegrationTests { assertTxProxying(ctx); } - @Ignore @Test // TODO SPR-8207 + @Test public void repositoryIsTxProxy_withNonConventionalTxManagerName_fallsBackToByTypeLookup() { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - ctx.register(Config.class, NonConventionalTxManagerNameConfig.class); - ctx.refresh(); - - assertTxProxying(ctx); + assertTxProxying(new AnnotationConfigApplicationContext(Config.class, NonConventionalTxManagerNameConfig.class)); } @Test