Skip to content

Commit

Permalink
Minor cleanups for FirefoxDriver.java (#2129)
Browse files Browse the repository at this point in the history
Minor cleanups for FirefoxDriver.java.

- Do not use System.out in production code.
- Omit null check of marionette as it is redundant with the instanceof check.
  • Loading branch information
joshbruning authored and jleyba committed May 20, 2016
1 parent 119021b commit 874dfa8
Showing 1 changed file with 1 addition and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,11 @@ public FirefoxDriver(FirefoxProfile profile) {
public FirefoxDriver(Capabilities desiredCapabilities) {
this(getBinary(desiredCapabilities), extractProfile(desiredCapabilities, null),
desiredCapabilities);
System.out.println("FirefoxDriver " + desiredCapabilities);
}

public FirefoxDriver(Capabilities desiredCapabilities, Capabilities requiredCapabilities) {
this(getBinary(desiredCapabilities), extractProfile(desiredCapabilities, requiredCapabilities),
desiredCapabilities, requiredCapabilities);
System.out.println("FirefoxDriver " + desiredCapabilities + " " + requiredCapabilities);
}

private static FirefoxProfile extractProfile(Capabilities desiredCapabilities,
Expand Down Expand Up @@ -228,7 +226,7 @@ private static final CommandExecutor createCommandExecutor(Capabilities desiredC
FirefoxBinary binary,
FirefoxProfile profile) {
Object marionette = desiredCapabilities.getCapability(MARIONETTE);
if (marionette != null && marionette instanceof Boolean && !(Boolean) marionette) {
if (marionette instanceof Boolean && !(Boolean) marionette) {
return new LazyCommandExecutor(binary, profile);
} else {
GeckoDriverService.Builder builder = new GeckoDriverService.Builder();
Expand Down

0 comments on commit 874dfa8

Please sign in to comment.