From 67ef04f7ee7348738bff6ec0926f889c7ed80880 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Fri, 5 Feb 2021 20:47:03 +0100 Subject: [PATCH] [java] Switching assertion in test for consistency with its name. --- .../selenium/firefox/FirefoxOptionsTest.java | 47 +++++++++---------- .../firefox/GeckoDriverServiceTest.java | 15 +++--- 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/java/client/test/org/openqa/selenium/firefox/FirefoxOptionsTest.java b/java/client/test/org/openqa/selenium/firefox/FirefoxOptionsTest.java index 957b0ed43d94c..60ab1d722ec2f 100644 --- a/java/client/test/org/openqa/selenium/firefox/FirefoxOptionsTest.java +++ b/java/client/test/org/openqa/selenium/firefox/FirefoxOptionsTest.java @@ -17,30 +17,7 @@ package org.openqa.selenium.firefox; -import static java.nio.file.StandardOpenOption.DELETE_ON_CLOSE; -import static java.util.Collections.emptyMap; -import static java.util.Collections.singleton; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.assertj.core.api.Assertions.assertThatNoException; -import static org.assertj.core.api.Assumptions.assumeThat; -import static org.assertj.core.api.InstanceOfAssertFactories.LIST; -import static org.assertj.core.api.InstanceOfAssertFactories.MAP; -import static org.openqa.selenium.PageLoadStrategy.EAGER; -import static org.openqa.selenium.firefox.FirefoxDriver.Capability.BINARY; -import static org.openqa.selenium.firefox.FirefoxDriver.Capability.MARIONETTE; -import static org.openqa.selenium.firefox.FirefoxDriver.SystemProperty.BROWSER_BINARY; -import static org.openqa.selenium.firefox.FirefoxDriver.SystemProperty.BROWSER_PROFILE; -import static org.openqa.selenium.firefox.FirefoxDriver.SystemProperty.DRIVER_USE_MARIONETTE; -import static org.openqa.selenium.firefox.FirefoxDriverLogLevel.DEBUG; -import static org.openqa.selenium.firefox.FirefoxDriverLogLevel.ERROR; -import static org.openqa.selenium.firefox.FirefoxDriverLogLevel.WARN; -import static org.openqa.selenium.firefox.FirefoxOptions.FIREFOX_OPTIONS; -import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS; -import static org.openqa.selenium.remote.CapabilityType.PAGE_LOAD_STRATEGY; - import com.google.common.collect.ImmutableMap; - import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -65,6 +42,28 @@ import java.util.List; import java.util.Map; +import static java.nio.file.StandardOpenOption.DELETE_ON_CLOSE; +import static java.util.Collections.emptyMap; +import static java.util.Collections.singleton; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatNoException; +import static org.assertj.core.api.Assumptions.assumeThat; +import static org.assertj.core.api.InstanceOfAssertFactories.LIST; +import static org.assertj.core.api.InstanceOfAssertFactories.MAP; +import static org.openqa.selenium.PageLoadStrategy.EAGER; +import static org.openqa.selenium.firefox.FirefoxDriver.Capability.BINARY; +import static org.openqa.selenium.firefox.FirefoxDriver.Capability.MARIONETTE; +import static org.openqa.selenium.firefox.FirefoxDriver.SystemProperty.BROWSER_BINARY; +import static org.openqa.selenium.firefox.FirefoxDriver.SystemProperty.BROWSER_PROFILE; +import static org.openqa.selenium.firefox.FirefoxDriver.SystemProperty.DRIVER_USE_MARIONETTE; +import static org.openqa.selenium.firefox.FirefoxDriverLogLevel.DEBUG; +import static org.openqa.selenium.firefox.FirefoxDriverLogLevel.ERROR; +import static org.openqa.selenium.firefox.FirefoxDriverLogLevel.WARN; +import static org.openqa.selenium.firefox.FirefoxOptions.FIREFOX_OPTIONS; +import static org.openqa.selenium.remote.CapabilityType.ACCEPT_INSECURE_CERTS; +import static org.openqa.selenium.remote.CapabilityType.PAGE_LOAD_STRATEGY; + @Category(UnitTests.class) public class FirefoxOptionsTest { @@ -219,7 +218,7 @@ public void settingMarionetteToFalseAsASystemPropertyDoesNotPrecedence() { property.set("false"); FirefoxOptions options = new FirefoxOptions().merge(caps); - assertThat(options.isLegacy()).isFalse(); + assertThat(options.isLegacy()).isTrue(); } finally { property.reset(); } diff --git a/java/client/test/org/openqa/selenium/firefox/GeckoDriverServiceTest.java b/java/client/test/org/openqa/selenium/firefox/GeckoDriverServiceTest.java index f6313bdb3eeab..1ab09ecc234c6 100644 --- a/java/client/test/org/openqa/selenium/firefox/GeckoDriverServiceTest.java +++ b/java/client/test/org/openqa/selenium/firefox/GeckoDriverServiceTest.java @@ -17,21 +17,20 @@ package org.openqa.selenium.firefox; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; - import org.junit.Test; import org.junit.experimental.categories.Category; -import org.openqa.selenium.firefox.GeckoDriverService; import org.openqa.selenium.testing.UnitTests; import java.io.File; import java.time.Duration; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + @Category(UnitTests.class) public class GeckoDriverServiceTest {