From 91cc283c3922da3afa06cdd2272621d785d19c00 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 16 Sep 2020 11:53:48 +0200 Subject: [PATCH] Upgrade to JUnit Jupiter 5.7.0 Closes gh-23351 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- .../mockmvc/WebMvcTestPrintDefaultIntegrationTests.java | 4 ++-- .../WebMvcTestWebDriverCustomScopeIntegrationTests.java | 4 ++-- .../servlet/mockmvc/WebMvcTestWebDriverIntegrationTests.java | 4 ++-- .../mock/mockito/ResetMocksTestExecutionListenerTests.java | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 9b6c5d3376..4375d4a3d8 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -885,7 +885,7 @@ bom { ] } } - library("JUnit Jupiter", "5.6.2") { + library("JUnit Jupiter", "5.7.0") { group("org.junit") { imports = [ "junit-bom" diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestPrintDefaultIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestPrintDefaultIntegrationTests.java index d932291a80..eeca88780b 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestPrintDefaultIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestPrintDefaultIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,7 +45,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * @author Andy Wilkinson */ @ExtendWith(OutputCaptureExtension.class) -@TestMethodOrder(MethodOrderer.Alphanumeric.class) +@TestMethodOrder(MethodOrderer.MethodName.class) class WebMvcTestPrintDefaultIntegrationTests { @Test diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverCustomScopeIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverCustomScopeIntegrationTests.java index d56d4a1cb6..66a5172f6d 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverCustomScopeIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverCustomScopeIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Phillip Webb */ @WebMvcTest -@TestMethodOrder(MethodOrderer.Alphanumeric.class) +@TestMethodOrder(MethodOrderer.MethodName.class) class WebMvcTestWebDriverCustomScopeIntegrationTests { // gh-7454 diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverIntegrationTests.java index 9e9c341eb1..50faf940de 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestWebDriverIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; */ @WebMvcTest @WithMockUser -@TestMethodOrder(MethodOrderer.Alphanumeric.class) +@TestMethodOrder(MethodOrderer.MethodName.class) class WebMvcTestWebDriverIntegrationTests { private static WebDriver previousWebDriver; diff --git a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListenerTests.java b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListenerTests.java index 5f7728b23c..a90256d138 100644 --- a/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListenerTests.java +++ b/spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListenerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import static org.mockito.Mockito.mock; * @author Andy Wilkinson */ @ExtendWith(SpringExtension.class) -@TestMethodOrder(MethodOrderer.Alphanumeric.class) +@TestMethodOrder(MethodOrderer.MethodName.class) class ResetMocksTestExecutionListenerTests { @Autowired