Skip to content

Commit aa6e762

Browse files
committed
Re-enable shadowed, overridden @test methods
Due to a bug (or "unintentional feature") in JUnit 4, overridden test methods not annotated with @test are still executed as test methods; however, JUnit Jupiter does not support that. Thus, prior to this commit, some overridden test methods in spring-core were no longer executed after the migration from JUnit 4 to JUnit Jupiter. This commit addresses this issue for such known use cases, but there are likely other such use cases within Spring's test suite. See gh-23451
1 parent fab96ca commit aa6e762

File tree

8 files changed

+15
-0
lines changed

8 files changed

+15
-0
lines changed

spring-core/src/test/java/org/springframework/core/codec/ByteArrayEncoderTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public void canEncode() {
5555
}
5656

5757
@Override
58+
@Test
5859
public void encode() {
5960
Flux<byte[]> input = Flux.just(this.fooBytes, this.barBytes);
6061

@@ -63,4 +64,5 @@ public void encode() {
6364
.consumeNextWith(expectBytes(this.barBytes))
6465
.verifyComplete());
6566
}
67+
6668
}

spring-core/src/test/java/org/springframework/core/codec/CharSequenceEncoderTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ class CharSequenceEncoderTests extends AbstractEncoderTestCase<CharSequenceEncod
4646

4747

4848
@Override
49+
@Test
4950
public void canEncode() throws Exception {
5051
assertThat(this.encoder.canEncode(ResolvableType.forClass(String.class),
5152
MimeTypeUtils.TEXT_PLAIN)).isTrue();
@@ -63,6 +64,7 @@ public void canEncode() throws Exception {
6364
}
6465

6566
@Override
67+
@Test
6668
public void encode() {
6769
Flux<CharSequence> input = Flux.just(this.foo, this.bar);
6870

spring-core/src/test/java/org/springframework/core/codec/DataBufferDecoderTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public void canDecode() {
5555
}
5656

5757
@Override
58+
@Test
5859
public void decode() {
5960
Flux<DataBuffer> input = Flux.just(
6061
this.bufferFactory.wrap(this.fooBytes),
@@ -67,6 +68,7 @@ public void decode() {
6768
}
6869

6970
@Override
71+
@Test
7072
public void decodeToMono() throws Exception {
7173
Flux<DataBuffer> input = Flux.concat(
7274
dataBuffer(this.fooBytes),

spring-core/src/test/java/org/springframework/core/codec/DataBufferEncoderTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public void canEncode() {
5757
}
5858

5959
@Override
60+
@Test
6061
public void encode() throws Exception {
6162
Flux<DataBuffer> input = Flux.just(this.fooBytes, this.barBytes)
6263
.flatMap(bytes -> Mono.defer(() -> {

spring-core/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public void decode() {
7979
}
8080

8181
@Override
82+
@Test
8283
public void decodeToMono() {
8384
Flux<DataBuffer> input = Flux.concat(
8485
dataBuffer(this.fooBytes),

spring-core/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public void canEncode() {
6464
}
6565

6666
@Override
67+
@Test
6768
public void encode() {
6869
Flux<Resource> input = Flux.just(new ByteArrayResource(this.bytes));
6970

spring-core/src/test/java/org/springframework/core/type/classreading/AnnotationMetadataReadingVisitorTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import java.io.BufferedInputStream;
2020
import java.io.InputStream;
2121

22+
import org.junit.jupiter.api.Test;
23+
2224
import org.springframework.asm.ClassReader;
2325
import org.springframework.core.io.DefaultResourceLoader;
2426
import org.springframework.core.io.Resource;
@@ -61,6 +63,7 @@ protected AnnotationMetadata get(Class<?> source) {
6163
}
6264

6365
@Override
66+
@Test
6467
public void getAnnotationsReturnsDirectAnnotations() {
6568
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(
6669
super::getAnnotationsReturnsDirectAnnotations);

spring-core/src/test/java/org/springframework/core/type/classreading/MethodMetadataReadingVisitorTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import java.io.BufferedInputStream;
2020
import java.io.InputStream;
2121

22+
import org.junit.jupiter.api.Test;
23+
2224
import org.springframework.asm.ClassReader;
2325
import org.springframework.core.io.DefaultResourceLoader;
2426
import org.springframework.core.io.Resource;
@@ -61,6 +63,7 @@ protected AnnotationMetadata get(Class<?> source) {
6163
}
6264

6365
@Override
66+
@Test
6467
public void getAnnotationsReturnsDirectAnnotations() {
6568
assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(
6669
super::getAnnotationsReturnsDirectAnnotations);

0 commit comments

Comments
 (0)