From 6e30851328662ad81a65a83bcac72722d76fbb44 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 17 Jan 2014 14:54:36 +0100 Subject: [PATCH] Improve logging in TransactionalTEL This commit makes the logging in TransactionalTestExecutionListener consistent for both starting and ending transactions. Specifically, the current TestContext is now included in the informational log statement when starting a new transaction. Issue: SPR-11323 --- .../TransactionalTestExecutionListener.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java index 7223e3ff8f9..35197a5308f 100644 --- a/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java @@ -273,8 +273,9 @@ public class TransactionalTestExecutionListener extends AbstractTestExecutionLis txContext.startTransaction(); ++this.transactionsStarted; if (logger.isInfoEnabled()) { - logger.info("Began transaction (" + this.transactionsStarted + "): transaction manager [" - + txContext.transactionManager + "]; rollback [" + isRollback(testContext) + "]"); + logger.info(String.format( + "Began transaction (%s) for test context %s; transaction manager [%s]; rollback [%s]", + this.transactionsStarted, testContext, txContext.transactionManager, isRollback(testContext))); } } @@ -288,8 +289,9 @@ public class TransactionalTestExecutionListener extends AbstractTestExecutionLis private void endTransaction(TestContext testContext, TransactionContext txContext) throws Exception { boolean rollback = isRollback(testContext); if (logger.isTraceEnabled()) { - logger.trace("Ending transaction for test context " + testContext + "; transaction manager [" - + txContext.transactionStatus + "]; rollback [" + rollback + "]"); + logger.trace(String.format( + "Ending transaction for test context %s; transaction status [%s]; rollback [%s]", testContext, + txContext.transactionStatus, rollback)); } txContext.endTransaction(rollback); if (logger.isInfoEnabled()) {