From 7dd430ce539ccdfebc5191b0b3207e2e1ea716ed Mon Sep 17 00:00:00 2001 From: AlexCD Date: Sun, 12 Sep 2021 19:27:29 +0300 Subject: [PATCH 1/3] allow manual usage --- .../boot/test/autoconfigure/web/servlet/WebDriverScope.java | 2 +- .../web/servlet/WebDriverTestExecutionListener.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverScope.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverScope.java index 40c3d36aaa99..b8001334ff1e 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverScope.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverScope.java @@ -39,7 +39,7 @@ * @see WebDriverContextCustomizerFactory * @see WebDriverTestExecutionListener */ -class WebDriverScope implements Scope { +public class WebDriverScope implements Scope { public static final String NAME = "webDriver"; diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverTestExecutionListener.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverTestExecutionListener.java index f192bbb11820..c51c0f2f1a0a 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverTestExecutionListener.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverTestExecutionListener.java @@ -29,7 +29,7 @@ * @see WebDriverContextCustomizerFactory * @see WebDriverScope */ -class WebDriverTestExecutionListener extends AbstractTestExecutionListener { +public class WebDriverTestExecutionListener extends AbstractTestExecutionListener { @Override public int getOrder() { From 0932a80eea5e474cb4e62d4d36169711312909d6 Mon Sep 17 00:00:00 2001 From: AlexCD Date: Mon, 13 Sep 2021 13:20:20 +0300 Subject: [PATCH 2/3] javadoc @since --- .../boot/test/autoconfigure/web/servlet/WebDriverScope.java | 1 + .../web/servlet/WebDriverTestExecutionListener.java | 1 + 2 files changed, 2 insertions(+) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverScope.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverScope.java index b8001334ff1e..475fb1a4b18e 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverScope.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverScope.java @@ -38,6 +38,7 @@ * @author Phillip Webb * @see WebDriverContextCustomizerFactory * @see WebDriverTestExecutionListener + * @since 2.6.0 */ public class WebDriverScope implements Scope { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverTestExecutionListener.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverTestExecutionListener.java index c51c0f2f1a0a..2488cc1d570f 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverTestExecutionListener.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverTestExecutionListener.java @@ -28,6 +28,7 @@ * @author Phillip Webb * @see WebDriverContextCustomizerFactory * @see WebDriverScope + * @since 2.6.0 */ public class WebDriverTestExecutionListener extends AbstractTestExecutionListener { From fe7c4f2d801bdfa8515ddc913fb5d52f8b9bcea1 Mon Sep 17 00:00:00 2001 From: AlexCD Date: Mon, 20 Sep 2021 17:39:16 +0300 Subject: [PATCH 3/3] fix checkstyle --- .../boot/test/autoconfigure/web/servlet/WebDriverScope.java | 5 ++++- .../web/servlet/WebDriverTestExecutionListener.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverScope.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverScope.java index 475fb1a4b18e..7d1a6748d969 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverScope.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverScope.java @@ -36,12 +36,15 @@ * {@link WebDriverTestExecutionListener}. * * @author Phillip Webb + * @since 2.6.0 * @see WebDriverContextCustomizerFactory * @see WebDriverTestExecutionListener - * @since 2.6.0 */ public class WebDriverScope implements Scope { + /** + * WebDriver bean scope name. + */ public static final String NAME = "webDriver"; private static final String WEB_DRIVER_CLASS = "org.openqa.selenium.WebDriver"; diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverTestExecutionListener.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverTestExecutionListener.java index 2488cc1d570f..d43a28a73eec 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverTestExecutionListener.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/WebDriverTestExecutionListener.java @@ -26,9 +26,9 @@ * {@link TestExecutionListener} to reset the {@link WebDriverScope}. * * @author Phillip Webb + * @since 2.6.0 * @see WebDriverContextCustomizerFactory * @see WebDriverScope - * @since 2.6.0 */ public class WebDriverTestExecutionListener extends AbstractTestExecutionListener {