Skip to content

Commit a855017

Browse files
committed
use the right AssertJ class Assertions instead of AssertionsForClassTypes
1. `Assertions.assertThat` is the standard, primary entry point for AssertJ assertions. It works for all types and automatically picks specialized assertion classes when available. 2. `AssertionsForClassTypes.assertThat` is a legacy / niche entry point intended for cases where type inference conflicts with AssertJ’s overloaded `assertThat` methods.
1 parent c7f70e7 commit a855017

28 files changed

+58
-52
lines changed

.idea/codeStyles/Project.xml

Lines changed: 10 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

java/test/org/openqa/selenium/WebNetworkTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
package org.openqa.selenium;
1919

20+
import static org.assertj.core.api.Assertions.assertThat;
2021
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
2122
import static org.assertj.core.api.Assertions.assertThatThrownBy;
22-
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
2323
import static org.openqa.selenium.remote.http.Contents.utf8String;
2424

2525
import java.net.URI;

java/test/org/openqa/selenium/WebScriptExecuteTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.openqa.selenium;
1919

20-
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
20+
import static org.assertj.core.api.Assertions.assertThat;
2121

2222
import java.math.BigInteger;
2323
import java.time.Instant;

java/test/org/openqa/selenium/WebScriptTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
package org.openqa.selenium;
1919

2020
import static java.util.concurrent.TimeUnit.SECONDS;
21-
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
22-
import static org.assertj.core.api.AssertionsForClassTypes.fail;
21+
import static org.assertj.core.api.Assertions.assertThat;
22+
import static org.assertj.core.api.Assertions.fail;
2323
import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOf;
2424

2525
import java.time.Duration;

java/test/org/openqa/selenium/bidi/BiDiSessionCleanUpTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package org.openqa.selenium.bidi;
1919

20-
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
21-
import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
20+
import static org.assertj.core.api.Assertions.assertThat;
21+
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
2222

2323
import org.junit.jupiter.api.Test;
2424
import org.openqa.selenium.WebDriverException;

java/test/org/openqa/selenium/bidi/BiDiSessionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.openqa.selenium.bidi;
1919

20-
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
20+
import static org.assertj.core.api.Assertions.assertThat;
2121

2222
import org.junit.jupiter.api.Test;
2323
import org.openqa.selenium.testing.JupiterTestBase;

java/test/org/openqa/selenium/bidi/BiDiTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package org.openqa.selenium.bidi;
1919

20-
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
20+
import static org.assertj.core.api.Assertions.assertThat;
2121
import static org.openqa.selenium.testing.drivers.Browser.EDGE;
2222

2323
import java.util.concurrent.CompletableFuture;

java/test/org/openqa/selenium/bidi/browsingcontext/BrowsingContextInspectorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package org.openqa.selenium.bidi.browsingcontext;
1919

20-
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
21-
import static org.openqa.selenium.testing.drivers.Browser.*;
20+
import static org.assertj.core.api.Assertions.assertThat;
21+
import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
2222

2323
import java.util.List;
2424
import java.util.Optional;

java/test/org/openqa/selenium/bidi/browsingcontext/LocateNodesTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
// under the License.
1717
package org.openqa.selenium.bidi.browsingcontext;
1818

19-
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
20-
import static org.openqa.selenium.testing.drivers.Browser.*;
19+
import static org.assertj.core.api.Assertions.assertThat;
20+
import static org.openqa.selenium.testing.drivers.Browser.FIREFOX;
2121

2222
import java.util.ArrayList;
2323
import java.util.List;

0 commit comments

Comments
 (0)