SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JUnit 5 migration related to boot 2.6

Browse Source
This commit is contained in:
Oleg Zhurakousky
2021-07-13 13:09:26 +02:00
parent 6be9c461a5
commit ac5124dabf
4 changed files with 53 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-cloud-stream-test-support-internal/src/main/java/org/springframework/cloud/stream/test/junit/AbstractExternalResourceTestSupport.java
View File

@@ -20,7 +20,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.Assume;
import org.junit.Rule;
import org.junit.rules.TestRule;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@ -39,7 +40,7 @@ import static org.junit.Assert.fail;
* @author Eric Bottard
* @author Gary Russell
*/
public abstract class AbstractExternalResourceTestSupport<R> implements TestRule {
public abstract class AbstractExternalResourceTestSupport<R> implements BeforeEachCallback {
/**
* SCS external servers required environment variable.
@@ -58,6 +59,18 @@ public abstract class AbstractExternalResourceTestSupport<R> implements TestRule
}
@Override
public void beforeEach(ExtensionContext context) throws Exception {
try {
obtainResource();
}
catch (Exception e) {
maybeCleanup();
failOrSkip(e);
}
}
// @Override
public Statement apply(final Statement base, Description description) {
try {
obtainResource();