Skip to content

#16573 unwrap double-wrapped webdriver #16575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
+11 −3
Open

#16573 unwrap double-wrapped webdriver #16575

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions java/src/org/openqa/selenium/support/decorators/WebDriverDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,15 @@ protected static class Definition {

public Definition(Decorated<?> decorated) {
this.decoratedClass = decorated.getClass();
this.originalClass = decorated.getOriginal().getClass();
this.originalClass = unwrapOriginal(decorated).getClass();
}

private static Object unwrapOriginal(Decorated<?> decorated) {
Object original = decorated.getOriginal();
while (original instanceof WrapsDriver) {
original = ((WrapsDriver) original).getWrappedDriver();
}
return original;
}

@Override
Expand Down Expand Up @@ -480,12 +488,12 @@ private static void extractInterfaces(final Set<Class<?>> collector, final Class
private <Z> Map<Class<?>, Function<Z, InvocationHandler>> deriveAdditionalInterfaces(Z sample) {
Map<Class<?>, Function<Z, InvocationHandler>> handlers = new HashMap<>();

if (sample instanceof WebDriver && !(sample instanceof WrapsDriver)) {
if (sample instanceof WebDriver) {
handlers.put(
WrapsDriver.class,
(instance) ->
(proxy, method, args) -> {
if ("getWrappedDriver".equals(method.getName())) {
if (sample instanceof WrapsDriver || "getWrappedDriver".equals(method.getName())) {
Copy link
Member

@joerg1985 joerg1985 Nov 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why should the method name be ignored for a WrapsDriver instance? WrapsDriver does only has this one method, but this might change over time. Or some generic methods e.g. .hashCode() could be called?

return instance;
}
throw new UnsupportedOperationException(method.getName());
Expand Down
Loading