Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing - Switch to TestWatcher

Browse Source 
TestWatchMan is deprecated.
This commit is contained in:
Gary Russell
2013-09-27 08:28:08 -04:00
parent be87cfc365
commit 65328b951b
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-integration-test/src/main/java/org/springframework/integration/test/support/LongRunningIntegrationTest.java
View File

@@ -17,9 +17,8 @@ package org.springframework.integration.test.support;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Assume;
import org.junit.rules.TestWatchman;
import org.junit.runners.model.FrameworkMethod;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
/**
@@ -30,18 +29,26 @@ import org.junit.runners.model.Statement;
* @since 3.0
*
*/
public class LongRunningIntegrationTest extends TestWatchman {
public class LongRunningIntegrationTest extends TestWatcher {
private final static Log logger = LogFactory.getLog(LongRunningIntegrationTest.class);
@Override
public Statement apply(Statement base, FrameworkMethod method, Object target) {
public Statement apply(Statement base, Description description) {
boolean shouldRun = "true".equalsIgnoreCase(System.getenv("RUN_LONG_INTEGRATION_TESTS"));
if (!shouldRun) {
logger.info("Skipping long running test " + this.getClass().getSimpleName() + "." + method.getName());
logger.info("Skipping long running test " + description.getDisplayName());
return new Statement() {
@Override
public void evaluate() throws Throwable {
}
};
}
else {
return super.apply(base, description);
}
Assume.assumeTrue(shouldRun);
return super.apply(base, method, target);
}
}