Re-enable shadowed, overridden @Test and lifecycle methods

Due to a bug (or "unintentional feature") in JUnit 4, overridden test
and lifecycle methods not annotated with @Test, @Before, @After, etc.
are still executed as test methods and lifecycle methods; however,
JUnit Jupiter does not support that. Thus, prior to this commit, some
overridden test and lifecycle methods 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
This commit is contained in:
Sam Brannen
2019-08-22 13:16:14 +02:00
parent 05c270d916
commit 3e2b977d5d
7 changed files with 10 additions and 2 deletions

View File

@@ -90,6 +90,7 @@ public class Jackson2CborDecoderTests extends AbstractDecoderTestCase<Jackson2Cb
}
@Override
@Test
public void decodeToMono() {
List<Pojo> expected = Arrays.asList(pojo1, pojo2);

View File

@@ -115,6 +115,7 @@ public class Jackson2JsonDecoderTests extends AbstractDecoderTestCase<Jackson2Js
}
@Override
@Test
public void decodeToMono() {
Flux<DataBuffer> input = Flux.concat(
stringBuffer("[{\"bar\":\"b1\",\"foo\":\"f1\"},"),

View File

@@ -57,7 +57,6 @@ import static org.springframework.http.codec.json.Jackson2CodecSupport.JSON_VIEW
*/
public class Jackson2JsonEncoderTests extends AbstractEncoderTestCase<Jackson2JsonEncoder> {
public Jackson2JsonEncoderTests() {
super(new Jackson2JsonEncoder());
}
@@ -78,6 +77,7 @@ public class Jackson2JsonEncoderTests extends AbstractEncoderTestCase<Jackson2Js
}
@Override
@Test
public void encode() throws Exception {
Flux<Object> input = Flux.just(new Pojo("foo", "bar"),
new Pojo("foofoo", "barbar"),

View File

@@ -67,6 +67,7 @@ public class Jackson2SmileDecoderTests extends AbstractDecoderTestCase<Jackson2S
}
@Override
@Test
public void decode() {
Flux<DataBuffer> input = Flux.just(this.pojo1, this.pojo2)
.map(this::writeObject)
@@ -90,6 +91,7 @@ public class Jackson2SmileDecoderTests extends AbstractDecoderTestCase<Jackson2S
}
@Override
@Test
public void decodeToMono() {
List<Pojo> expected = Arrays.asList(pojo1, pojo2);