Skip to content

Commit 67ef04f

Browse files
committed
[java] Switching assertion in test for consistency with its name.
1 parent d7253f3 commit 67ef04f

File tree

2 files changed

+30
-32
lines changed

2 files changed

+30
-32
lines changed

java/client/test/org/openqa/selenium/firefox/FirefoxOptionsTest.java

+23-24
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,7 @@
1717

1818
package org.openqa.selenium.firefox;
1919

20-
import static java.nio.file.StandardOpenOption.DELETE_ON_CLOSE;
21-
import static java.util.Collections.emptyMap;
22-
import static java.util.Collections.singleton;
23-
import static org.assertj.core.api.Assertions.assertThat;
24-
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
25-
import static org.assertj.core.api.Assertions.assertThatNoException;
26-
import static org.assertj.core.api.Assumptions.assumeThat;
27-
import static org.assertj.core.api.InstanceOfAssertFactories.LIST;
28-
import static org.assertj.core.api.InstanceOfAssertFactories.MAP;
29-
import static org.openqa.selenium.PageLoadStrategy.EAGER;
30-
import static org.openqa.selenium.firefox.FirefoxDriver.Capability.BINARY;
31-
import static org.openqa.selenium.firefox.FirefoxDriver.Capability.MARIONETTE;
32-
import static org.openqa.selenium.firefox.FirefoxDriver.SystemProperty.BROWSER_BINARY;
33-
import static org.openqa.selenium.firefox.FirefoxDriver.SystemProperty.BROWSER_PROFILE;
34-
import static org.openqa.selenium.firefox.FirefoxDriver.SystemProperty.DRIVER_USE_MARIONETTE;
35-
import static org.openqa.selenium.firefox.FirefoxDriverLogLevel.DEBUG;
36-
import static org.openqa.selenium.firefox.FirefoxDriverLogLevel.ERROR;
37-
import static org.openqa.selenium.firefox.FirefoxDriverLogLevel.WARN;
38-
import static org.openqa.selenium.firefox.FirefoxOptions.FIREFOX_OPTIONS;
39-
import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
40-
import static org.openqa.selenium.remote.CapabilityType.PAGE_LOAD_STRATEGY;
41-
4220
import com.google.common.collect.ImmutableMap;
43-
4421
import org.assertj.core.api.InstanceOfAssertFactories;
4522
import org.junit.Test;
4623
import org.junit.experimental.categories.Category;
@@ -65,6 +42,28 @@
6542
import java.util.List;
6643
import java.util.Map;
6744

45+
import static java.nio.file.StandardOpenOption.DELETE_ON_CLOSE;
46+
import static java.util.Collections.emptyMap;
47+
import static java.util.Collections.singleton;
48+
import static org.assertj.core.api.Assertions.assertThat;
49+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
50+
import static org.assertj.core.api.Assertions.assertThatNoException;
51+
import static org.assertj.core.api.Assumptions.assumeThat;
52+
import static org.assertj.core.api.InstanceOfAssertFactories.LIST;
53+
import static org.assertj.core.api.InstanceOfAssertFactories.MAP;
54+
import static org.openqa.selenium.PageLoadStrategy.EAGER;
55+
import static org.openqa.selenium.firefox.FirefoxDriver.Capability.BINARY;
56+
import static org.openqa.selenium.firefox.FirefoxDriver.Capability.MARIONETTE;
57+
import static org.openqa.selenium.firefox.FirefoxDriver.SystemProperty.BROWSER_BINARY;
58+
import static org.openqa.selenium.firefox.FirefoxDriver.SystemProperty.BROWSER_PROFILE;
59+
import static org.openqa.selenium.firefox.FirefoxDriver.SystemProperty.DRIVER_USE_MARIONETTE;
60+
import static org.openqa.selenium.firefox.FirefoxDriverLogLevel.DEBUG;
61+
import static org.openqa.selenium.firefox.FirefoxDriverLogLevel.ERROR;
62+
import static org.openqa.selenium.firefox.FirefoxDriverLogLevel.WARN;
63+
import static org.openqa.selenium.firefox.FirefoxOptions.FIREFOX_OPTIONS;
64+
import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS;
65+
import static org.openqa.selenium.remote.CapabilityType.PAGE_LOAD_STRATEGY;
66+
6867
@Category(UnitTests.class)
6968
public class FirefoxOptionsTest {
7069

@@ -219,7 +218,7 @@ public void settingMarionetteToFalseAsASystemPropertyDoesNotPrecedence() {
219218

220219
property.set("false");
221220
FirefoxOptions options = new FirefoxOptions().merge(caps);
222-
assertThat(options.isLegacy()).isFalse();
221+
assertThat(options.isLegacy()).isTrue();
223222
} finally {
224223
property.reset();
225224
}

java/client/test/org/openqa/selenium/firefox/GeckoDriverServiceTest.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,20 @@
1717

1818
package org.openqa.selenium.firefox;
1919

20-
import static org.mockito.ArgumentMatchers.any;
21-
import static org.mockito.ArgumentMatchers.anyInt;
22-
import static org.mockito.ArgumentMatchers.eq;
23-
import static org.mockito.Mockito.doReturn;
24-
import static org.mockito.Mockito.spy;
25-
import static org.mockito.Mockito.verify;
26-
2720
import org.junit.Test;
2821
import org.junit.experimental.categories.Category;
29-
import org.openqa.selenium.firefox.GeckoDriverService;
3022
import org.openqa.selenium.testing.UnitTests;
3123

3224
import java.io.File;
3325
import java.time.Duration;
3426

27+
import static org.mockito.ArgumentMatchers.any;
28+
import static org.mockito.ArgumentMatchers.anyInt;
29+
import static org.mockito.ArgumentMatchers.eq;
30+
import static org.mockito.Mockito.doReturn;
31+
import static org.mockito.Mockito.spy;
32+
import static org.mockito.Mockito.verify;
33+
3534
@Category(UnitTests.class)
3635
public class GeckoDriverServiceTest {
3736

0 commit comments

Comments
 (0)