Align after merge from 6.1.x

This commit is contained in:
Juergen Hoeller
2024-06-12 13:34:53 +02:00
parent 4bb755e2d2
commit 8b8604db73
2 changed files with 27 additions and 25 deletions

View File

@@ -679,6 +679,32 @@ class ScheduledAnnotationBeanPostProcessorTests {
}
static ScheduledMethodRunnableAssert assertThatScheduledRunnable(Runnable runnable) {
return new ScheduledMethodRunnableAssert(runnable);
}
static class ScheduledMethodRunnableAssert extends AbstractAssert<ScheduledMethodRunnableAssert, Runnable> {
public ScheduledMethodRunnableAssert(Runnable actual) {
super(actual, ScheduledMethodRunnableAssert.class);
assertThat(actual).extracting("runnable").isInstanceOf(ScheduledMethodRunnable.class);
}
public ScheduledMethodRunnableAssert hasTarget(Object target) {
isNotNull();
assertThat(actual).extracting("runnable.target").isEqualTo(target);
return this;
}
public ScheduledMethodRunnableAssert hasMethodName(String name) {
isNotNull();
assertThat(actual).extracting("runnable.method.name").isEqualTo(name);
return this;
}
}
static class FixedDelay {
@Scheduled(fixedDelay = 5_000)
@@ -1019,29 +1045,4 @@ class ScheduledAnnotationBeanPostProcessorTests {
}
}
static ScheduledMethodRunnableAssert assertThatScheduledRunnable(Runnable runnable) {
return new ScheduledMethodRunnableAssert(runnable);
}
static class ScheduledMethodRunnableAssert extends AbstractAssert<ScheduledMethodRunnableAssert, Runnable> {
public ScheduledMethodRunnableAssert(Runnable actual) {
super(actual, ScheduledMethodRunnableAssert.class);
assertThat(actual).extracting("runnable").isInstanceOf(ScheduledMethodRunnable.class);
}
public ScheduledMethodRunnableAssert hasTarget(Object target) {
isNotNull();
assertThat(actual).extracting("runnable.target").isEqualTo(target);
return this;
}
public ScheduledMethodRunnableAssert hasMethodName(String name) {
isNotNull();
assertThat(actual).extracting("runnable.method.name").isEqualTo(name);
return this;
}
}
}