Skip to content
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

[java] Merge android specific parameters in chrome options #14217

Merged
merged 7 commits into from
Jul 12, 2024
Merged

[java] Merge android specific parameters in chrome options #14217

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
31fe6a3
added androidOptions in merge method
iampopovich Jul 1, 2024
4b61350
applied suggestions
iampopovich Jul 1, 2024
8ae61f3
applying format.sh
iampopovich Jul 1, 2024
025a40c
Merge branch 'trunk' into fix-14133-merge-capabilities
diemol Jul 1, 2024
9f9e464
import assertEquals
iampopovich Jul 1, 2024
d569f80
Merge branch 'trunk' into fix-14133-merge-capabilities
diemol Jul 12, 2024
1c26267
fix for importi Optional
iampopovich Jul 12, 2024
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
9 changes: 6 additions & 3 deletions java/src/org/openqa/selenium/chromium/ChromiumOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,10 +320,13 @@ protected void mergeInPlace(Capabilities capabilities) {
}
addExtensions(options.extensionFiles);
addEncodedExtensions(options.extensions);
if (options.binary != null) {
setBinary(options.binary);
}

Optional.ofNullable(options.binary).ifPresent(this::setBinary);

options.experimentalOptions.forEach(this::setExperimentalOption);

Optional.ofNullable(options.androidOptions)
.ifPresent(opts -> opts.forEach(this::setAndroidCapability));
}
}

Expand Down
15 changes: 15 additions & 0 deletions java/test/org/openqa/selenium/chrome/ChromeOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import static org.assertj.core.api.InstanceOfAssertFactories.LIST;
import static org.assertj.core.api.InstanceOfAssertFactories.MAP;
import static org.assertj.core.api.InstanceOfAssertFactories.STRING;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openqa.selenium.chromium.ChromiumDriverLogLevel.OFF;
import static org.openqa.selenium.chromium.ChromiumDriverLogLevel.SEVERE;
import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
Expand Down Expand Up @@ -382,4 +383,18 @@ void shouldBeAbleToSetAnAndroidOption() {
.extractingByKey("androidActivity")
.isEqualTo("com.cheese.nom");
}

@Test
void shouldBeAbleToMergeAnAndroidOption() {
var original = new ChromeOptions();
original.setAndroidActivity("co_activity");
original.setAndroidPackage("co_package");
original.setExperimentalOption("experimental", "co_experimental");
original.addArguments("--co_argument");

var caps = new MutableCapabilities();
var merged = original.merge(caps);

assertEquals(original.asMap(), merged.asMap());
}
}
Loading