This is an automated email from the ASF dual-hosted git repository.
pjfanning pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko.git
The following commit(s) were added to refs/heads/main by this push:
new 4d942a0ca7 use assertInstanceof (#3088)
4d942a0ca7 is described below
commit 4d942a0ca7cd09c32f04a63205f1a786054ecebe
Author: PJ Fanning <[email protected]>
AuthorDate: Fri Jun 19 09:41:14 2026 +0100
use assertInstanceof (#3088)
* use assertInstanceof
* Update LoggingAdapterTest.java
---
.../actor/testkit/typed/javadsl/SyncTestingExampleTest.java | 4 ++--
.../java/org/apache/pekko/dispatch/CompletionStagesTests.java | 4 ++--
.../src/test/java/org/apache/pekko/event/LoggingAdapterTest.java | 4 ++--
.../src/test/java/org/apache/pekko/pattern/PatternsTest.java | 6 +++---
actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala | 4 ++--
.../src/test/java/org/apache/pekko/stream/javadsl/FlowTest.java | 2 +-
.../src/test/java/org/apache/pekko/stream/javadsl/TcpTest.java | 9 +++++----
7 files changed, 17 insertions(+), 16 deletions(-)
diff --git
a/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java
b/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java
index 26a25468ac..a8e6f6c591 100644
---
a/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java
+++
b/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java
@@ -15,7 +15,7 @@ package jdocs.org.apache.pekko.actor.testkit.typed.javadsl;
// #imports
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import com.typesafe.config.Config;
import java.time.Duration;
@@ -324,7 +324,7 @@ public class SyncTestingExampleTest {
assertEquals("No. Who are you?", ((Hello.GotAnAnswer) response1).answer);
// ... as can the message sent on a timeout
- assertTrue(effect.adaptTimeout() instanceof Hello.NoAnswerFrom);
+ assertInstanceOf(Hello.NoAnswerFrom.class, effect.adaptTimeout());
// The response timeout is captured
assertEquals(10L, effect.responseTimeout().toSeconds());
diff --git
a/actor-tests/src/test/java/org/apache/pekko/dispatch/CompletionStagesTests.java
b/actor-tests/src/test/java/org/apache/pekko/dispatch/CompletionStagesTests.java
index acc7a859c6..4d11ced8b4 100644
---
a/actor-tests/src/test/java/org/apache/pekko/dispatch/CompletionStagesTests.java
+++
b/actor-tests/src/test/java/org/apache/pekko/dispatch/CompletionStagesTests.java
@@ -27,8 +27,8 @@ import java.util.*;
import java.util.concurrent.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
public class CompletionStagesTests {
private final Duration timeout = Duration.create(5, TimeUnit.SECONDS);
@@ -101,7 +101,7 @@ public class CompletionStagesTests {
try {
reducedEmpty.toCompletableFuture().get(3, TimeUnit.SECONDS);
} catch (Exception e) {
- assertTrue(e.getCause() instanceof NoSuchElementException);
+ assertInstanceOf(NoSuchElementException.class, e.getCause());
assertEquals("reduce of an empty iterable of CompletionStages",
e.getCause().getMessage());
}
}
diff --git
a/actor-tests/src/test/java/org/apache/pekko/event/LoggingAdapterTest.java
b/actor-tests/src/test/java/org/apache/pekko/event/LoggingAdapterTest.java
index d373659fd3..1db7464c73 100644
--- a/actor-tests/src/test/java/org/apache/pekko/event/LoggingAdapterTest.java
+++ b/actor-tests/src/test/java/org/apache/pekko/event/LoggingAdapterTest.java
@@ -15,9 +15,9 @@ package org.apache.pekko.event;
import static org.apache.pekko.event.Logging.*;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
@@ -165,7 +165,7 @@ public class LoggingAdapterTest {
assertEquals(level, log.level());
assertEquals(mdc, log.getMDC().toString());
if (cause != null) {
- assertTrue(event instanceof LogEventWithCause);
+ assertInstanceOf(LogEventWithCause.class, event);
LogEventWithCause causedEvent = (LogEventWithCause) event;
assertSame(cause, causedEvent.cause());
}
diff --git
a/actor-tests/src/test/java/org/apache/pekko/pattern/PatternsTest.java
b/actor-tests/src/test/java/org/apache/pekko/pattern/PatternsTest.java
index cabf6e94cf..55967db6f1 100644
--- a/actor-tests/src/test/java/org/apache/pekko/pattern/PatternsTest.java
+++ b/actor-tests/src/test/java/org/apache/pekko/pattern/PatternsTest.java
@@ -17,8 +17,8 @@ import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.pekko.pattern.Patterns.ask;
import static org.apache.pekko.pattern.Patterns.pipe;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.time.Duration;
import java.util.Arrays;
@@ -545,7 +545,7 @@ public class PatternsTest {
try {
delayedStage.toCompletableFuture().get(3, SECONDS);
} catch (ExecutionException e) {
- assertTrue(e.getCause() instanceof IllegalStateException);
+ assertInstanceOf(IllegalStateException.class, e.getCause());
assertEquals("Illegal!", e.getCause().getMessage());
}
}
@@ -558,7 +558,7 @@ public class PatternsTest {
try {
delayedStage.toCompletableFuture().get(3, SECONDS);
} catch (ExecutionException e) {
- assertTrue(e.getCause() instanceof TimeoutException);
+ assertInstanceOf(TimeoutException.class, e.getCause());
assertEquals("Timeout of PT0.2S expired", e.getCause().getMessage());
}
}
diff --git a/actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
b/actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
index cdd5831ecc..d89ac697b4 100644
--- a/actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
+++ b/actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
@@ -55,9 +55,9 @@ object JavaPartialFunction {
* {{{
* new JavaPartialFunction<Object, String>() {
* public String apply(Object in, boolean isCheck) {
- * if (in instanceof TheThing) {
+ * if (in instanceof TheThing theThing) {
* if (isCheck) return null; // to spare the expensive or side-effecting
code
- * return doSomethingWithTheThing((TheThing) in);
+ * return doSomethingWithTheThing(theThing);
* } else {
* throw noMatch();
* }
diff --git
a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowTest.java
b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowTest.java
index f305844506..7dd153b278 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/FlowTest.java
@@ -1638,7 +1638,7 @@ public class FlowTest extends StreamTestJupiter {
final Throwable actual =
source.via(flow).runWith(TestSink.create(system),
system).request(1).expectError();
- assertTrue(actual instanceof IndexOutOfBoundsException);
+ assertInstanceOf(IndexOutOfBoundsException.class, actual);
}
@Test
diff --git
a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/TcpTest.java
b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/TcpTest.java
index b0b7d62ce5..417f24c441 100644
--- a/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/TcpTest.java
+++ b/stream-tests/src/test/java/org/apache/pekko/stream/javadsl/TcpTest.java
@@ -147,8 +147,9 @@ public class TcpTest extends StreamTestJupiter {
.toCompletableFuture()
.get(5, TimeUnit.SECONDS),
"CompletableFuture.get() should throw
ExecutionException");
- Assertions.assertTrue(
- executionException.getCause() instanceof
BindFailedException,
+ Assertions.assertInstanceOf(
+ BindFailedException.class,
+ executionException.getCause(),
"The cause of ExecutionException should be instanceof
BindFailedException");
b.unbind();
return null;
@@ -175,9 +176,9 @@ public class TcpTest extends StreamTestJupiter {
.toCompletableFuture()
.get(5, TimeUnit.SECONDS),
"CompletableFuture.get() should throw ExecutionException");
- Assertions.assertEquals(
+ Assertions.assertInstanceOf(
StreamTcpException.class,
- executionException.getCause().getClass(),
+ executionException.getCause(),
"The cause of ExecutionException should be StreamTcpException");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
