From da384be170461047cc46ecfd7922c3565007b691 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Mon, 28 Mar 2011 17:23:48 +0000 Subject: [PATCH] Polishing and fixed broken support for @IfProfileValue in AbstractJpaTests (even though it's deprecated). git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4118 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../test/ConditionalTestCase.java | 2 +- ...ractAnnotationAwareTransactionalTests.java | 4 +++- .../test/jpa/AbstractJpaTests.java | 24 ++++++++++++++++++- .../test/ConditionalTestCase.java | 2 +- ...ractAnnotationAwareTransactionalTests.java | 3 ++- .../test/jpa/AbstractJpaTests.java | 17 +++++++++++++ 6 files changed, 47 insertions(+), 5 deletions(-) diff --git a/org.springframework.orm/src/test/java/org/springframework/test/ConditionalTestCase.java b/org.springframework.orm/src/test/java/org/springframework/test/ConditionalTestCase.java index e44c9ac7963..9fd31193154 100644 --- a/org.springframework.orm/src/test/java/org/springframework/test/ConditionalTestCase.java +++ b/org.springframework.orm/src/test/java/org/springframework/test/ConditionalTestCase.java @@ -70,7 +70,7 @@ public abstract class ConditionalTestCase extends TestCase { // getName will return the name of the method being run if (isDisabledInThisEnvironment(getName())) { recordDisabled(); - this.logger.info("**** " + getClass().getName() + "." + getName() + " disabled in this environment: " + this.logger.info("**** " + getClass().getName() + "." + getName() + " is disabled in this environment: " + "Total disabled tests = " + getDisabledTestCount()); return; } diff --git a/org.springframework.orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/org.springframework.orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java index c7c0e3df790..d0653e546c1 100644 --- a/org.springframework.orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java +++ b/org.springframework.orm/src/test/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java @@ -67,6 +67,8 @@ import org.springframework.util.Assert; * @author Sam Brannen * @author Juergen Hoeller * @since 2.0 + * @deprecated as of Spring 3.0, in favor of using the listener-based test context framework + * ({@link org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests}) */ public abstract class AbstractAnnotationAwareTransactionalTests extends AbstractTransactionalDataSourceSpringContextTests { @@ -151,7 +153,7 @@ public abstract class AbstractAnnotationAwareTransactionalTests extends if (isDisabledInThisEnvironment(testMethod)) { recordDisabled(); - this.logger.info("**** " + getClass().getName() + "." + getName() + " disabled in this environment: " + this.logger.info("**** " + getClass().getName() + "." + getName() + " is disabled in this environment: " + "Total disabled tests=" + getDisabledTestCount()); return; } diff --git a/org.springframework.orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java b/org.springframework.orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java index 821539121f3..99ffd1dcfd4 100644 --- a/org.springframework.orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java +++ b/org.springframework.orm/src/test/java/org/springframework/test/jpa/AbstractJpaTests.java @@ -77,6 +77,8 @@ import org.springframework.util.StringUtils; * @author Rob Harrop * @author Juergen Hoeller * @since 2.0 + * @deprecated as of Spring 3.0, in favor of using the listener-based test context framework + * ({@link org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests}) */ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactionalTests { @@ -157,13 +159,31 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void runBare() throws Throwable { - if (!shouldUseShadowLoader()) { + + // getName will return the name of the method being run. + if (isDisabledInThisEnvironment(getName())) { + // Let superclass log that we didn't run the test. super.runBare(); return; } + final Method testMethod = getTestMethod(); + + if (isDisabledInThisEnvironment(testMethod)) { + recordDisabled(); + this.logger.info("**** " + getClass().getName() + "." + getName() + " is disabled in this environment: " + + "Total disabled tests=" + getDisabledTestCount()); + return; + } + + if (!shouldUseShadowLoader()) { + super.runBare(); + return; + } + String combinationOfContextLocationsForThisTestClass = cacheKeys(); ClassLoader classLoaderForThisTestClass = getClass().getClassLoader(); // save the TCCL @@ -305,6 +325,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio private final LoadTimeWeaver ltw; + @SuppressWarnings("unused") public LoadTimeWeaverInjectingBeanPostProcessor(LoadTimeWeaver ltw) { this.ltw = ltw; } @@ -325,6 +346,7 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio private final ClassLoader shadowingClassLoader; + @SuppressWarnings("unused") public ShadowingLoadTimeWeaver(ClassLoader shadowingClassLoader) { this.shadowingClassLoader = shadowingClassLoader; } diff --git a/org.springframework.test/src/main/java/org/springframework/test/ConditionalTestCase.java b/org.springframework.test/src/main/java/org/springframework/test/ConditionalTestCase.java index 769d42945e7..a8448f228c8 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/ConditionalTestCase.java +++ b/org.springframework.test/src/main/java/org/springframework/test/ConditionalTestCase.java @@ -70,7 +70,7 @@ public abstract class ConditionalTestCase extends TestCase { // getName will return the name of the method being run if (isDisabledInThisEnvironment(getName())) { recordDisabled(); - this.logger.info("**** " + getClass().getName() + "." + getName() + " disabled in this environment: " + this.logger.info("**** " + getClass().getName() + "." + getName() + " is disabled in this environment: " + "Total disabled tests = " + getDisabledTestCount()); return; } diff --git a/org.springframework.test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java b/org.springframework.test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java index 158acde8526..ae98226a1b3 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java +++ b/org.springframework.test/src/main/java/org/springframework/test/annotation/AbstractAnnotationAwareTransactionalTests.java @@ -143,6 +143,7 @@ public abstract class AbstractAnnotationAwareTransactionalTests extends */ @Override public void runBare() throws Throwable { + // getName will return the name of the method being run. if (isDisabledInThisEnvironment(getName())) { // Let superclass log that we didn't run the test. @@ -154,7 +155,7 @@ public abstract class AbstractAnnotationAwareTransactionalTests extends if (isDisabledInThisEnvironment(testMethod)) { recordDisabled(); - this.logger.info("**** " + getClass().getName() + "." + getName() + " disabled in this environment: " + this.logger.info("**** " + getClass().getName() + "." + getName() + " is disabled in this environment: " + "Total disabled tests=" + getDisabledTestCount()); return; } diff --git a/org.springframework.test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java b/org.springframework.test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java index f58d91c8eb1..fd18656aa9d 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java +++ b/org.springframework.test/src/main/java/org/springframework/test/jpa/AbstractJpaTests.java @@ -163,6 +163,23 @@ public abstract class AbstractJpaTests extends AbstractAnnotationAwareTransactio @Override @SuppressWarnings({ "rawtypes", "unchecked" }) public void runBare() throws Throwable { + + // getName will return the name of the method being run. + if (isDisabledInThisEnvironment(getName())) { + // Let superclass log that we didn't run the test. + super.runBare(); + return; + } + + final Method testMethod = getTestMethod(); + + if (isDisabledInThisEnvironment(testMethod)) { + recordDisabled(); + this.logger.info("**** " + getClass().getName() + "." + getName() + " is disabled in this environment: " + + "Total disabled tests=" + getDisabledTestCount()); + return; + } + if (!shouldUseShadowLoader()) { super.runBare(); return;