Skip to content

Commit 3ea5d64

Browse files
jaydelucajaydeluca
committed
Switch approach to asserting not null
1 parent 5b1ad52 commit 3ea5d64

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

‎instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;
3434
import java.util.ArrayList;
3535
import java.util.List;
36+
import org.assertj.core.api.AbstractAssert;
3637

3738
class AwsSpanAssertions {
3839

@@ -106,12 +107,10 @@ static SpanDataAssert sqs(
106107
attributeAssertions.add(equalTo(MESSAGING_OPERATION, "receive"));
107108
} else if (spanName.endsWith("process")) {
108109
attributeAssertions.add(equalTo(MESSAGING_OPERATION, "process"));
109-
attributeAssertions.add(
110-
satisfies(MESSAGING_MESSAGE_ID, val -> assertThat(val).isNotNull()));
110+
attributeAssertions.add(satisfies(MESSAGING_MESSAGE_ID, AbstractAssert::isNotNull));
111111
} else if (spanName.endsWith("publish")) {
112112
attributeAssertions.add(equalTo(MESSAGING_OPERATION, "publish"));
113-
attributeAssertions.add(
114-
satisfies(MESSAGING_MESSAGE_ID, val -> assertThat(val).isNotNull()));
113+
attributeAssertions.add(satisfies(MESSAGING_MESSAGE_ID, AbstractAssert::isNotNull));
115114
}
116115
}
117116

‎instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import java.util.function.Consumer;
4747
import java.util.stream.Collectors;
4848
import java.util.stream.IntStream;
49+
import org.assertj.core.api.AbstractAssert;
4950
import org.junit.jupiter.api.AfterEach;
5051
import org.junit.jupiter.api.Test;
5152
import org.junitpioneer.jupiter.cartesian.CartesianTest;
@@ -246,7 +247,7 @@ public void onCompleted() {
246247
equalTo(SERVER_PORT, server.getPort()),
247248
equalTo(NETWORK_TYPE, "ipv4"),
248249
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
249-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
250+
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
250251
.satisfies(
251252
spanData ->
252253
assertThat(spanData.getEvents())

‎instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcTest.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
import java.util.concurrent.atomic.AtomicBoolean;
7171
import java.util.concurrent.atomic.AtomicReference;
7272
import java.util.stream.Stream;
73+
import org.assertj.core.api.AbstractAssert;
7374
import org.junit.jupiter.api.AfterEach;
7475
import org.junit.jupiter.api.Test;
7576
import org.junit.jupiter.api.TestInstance;
@@ -175,7 +176,7 @@ public void sayHello(
175176
equalTo(SERVER_PORT, server.getPort()),
176177
equalTo(NETWORK_TYPE, "ipv4"),
177178
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
178-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
179+
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
179180
.hasEventsSatisfyingExactly(
180181
event ->
181182
event
@@ -328,7 +329,7 @@ public void sayHello(
328329
equalTo(SERVER_PORT, server.getPort()),
329330
equalTo(NETWORK_TYPE, "ipv4"),
330331
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
331-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
332+
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
332333
.hasEventsSatisfyingExactly(
333334
event ->
334335
event
@@ -493,7 +494,7 @@ public void onCompleted() {
493494
equalTo(SERVER_PORT, server.getPort()),
494495
equalTo(NETWORK_TYPE, "ipv4"),
495496
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
496-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
497+
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
497498
.hasEventsSatisfyingExactly(
498499
event ->
499500
event
@@ -626,7 +627,7 @@ public void sayHello(
626627
equalTo(SERVER_PORT, server.getPort()),
627628
equalTo(NETWORK_TYPE, "ipv4"),
628629
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
629-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
630+
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
630631
.hasEventsSatisfying(
631632
events -> {
632633
assertThat(events).isNotEmpty();
@@ -765,7 +766,7 @@ public void sayHello(
765766
equalTo(SERVER_PORT, server.getPort()),
766767
equalTo(NETWORK_TYPE, "ipv4"),
767768
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
768-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
769+
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
769770
.hasEventsSatisfying(
770771
events -> {
771772
assertThat(events).hasSize(2);
@@ -1002,7 +1003,7 @@ public void onCompleted() {
10021003
equalTo(SERVER_PORT, server.getPort()),
10031004
equalTo(NETWORK_TYPE, "ipv4"),
10041005
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
1005-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
1006+
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
10061007
.hasEventsSatisfyingExactly(
10071008
event ->
10081009
event
@@ -1120,7 +1121,7 @@ public void onCompleted() {
11201121
equalTo(SERVER_PORT, server.getPort()),
11211122
equalTo(NETWORK_TYPE, "ipv4"),
11221123
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
1123-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
1124+
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
11241125
.hasEventsSatisfyingExactly(
11251126
event ->
11261127
event
@@ -1235,7 +1236,7 @@ public void onCompleted() {
12351236
equalTo(SERVER_PORT, server.getPort()),
12361237
equalTo(NETWORK_TYPE, "ipv4"),
12371238
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
1238-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
1239+
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
12391240
.hasEventsSatisfyingExactly(
12401241
event ->
12411242
event
@@ -1336,7 +1337,7 @@ public void sayHello(
13361337
equalTo(SERVER_PORT, server.getPort()),
13371338
equalTo(NETWORK_TYPE, "ipv4"),
13381339
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"),
1339-
satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()))
1340+
satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull))
13401341
.hasEventsSatisfyingExactly(
13411342
event ->
13421343
event
@@ -1595,7 +1596,7 @@ static List<AttributeAssertion> addExtraClientAttributes(AttributeAssertion... a
15951596
if (Boolean.getBoolean("testLatestDeps")) {
15961597
result.add(equalTo(NETWORK_TYPE, "ipv4"));
15971598
result.add(equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"));
1598-
result.add(satisfies(NETWORK_PEER_PORT, val -> assertThat(val).isNotNull()));
1599+
result.add(satisfies(NETWORK_PEER_PORT, AbstractAssert::isNotNull));
15991600
}
16001601
return result;
16011602
}

‎instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/boot/SpringBootBasedTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE;
1313
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
1414
import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
15-
import static org.assertj.core.api.Assertions.assertThat;
1615

1716
import io.opentelemetry.api.trace.SpanKind;
1817
import io.opentelemetry.instrumentation.spring.webmvc.boot.AbstractSpringBootBasedTest;
@@ -25,6 +24,7 @@
2524
import io.opentelemetry.sdk.trace.data.SpanData;
2625
import io.opentelemetry.sdk.trace.data.StatusData;
2726
import java.util.Map;
27+
import org.assertj.core.api.AbstractAssert;
2828
import org.junit.jupiter.api.extension.RegisterExtension;
2929
import org.springframework.boot.SpringApplication;
3030
import org.springframework.context.ConfigurableApplicationContext;
@@ -86,7 +86,7 @@ protected SpanDataAssert assertHandlerSpan(
8686
equalTo(
8787
EXCEPTION_TYPE,
8888
"org.springframework.web.servlet.resource.NoResourceFoundException"),
89-
satisfies(EXCEPTION_MESSAGE, val -> assertThat(val).isNotNull()),
89+
satisfies(EXCEPTION_MESSAGE, AbstractAssert::isNotNull),
9090
satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));
9191
return span;
9292
} else {

‎instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/v6_0/filter/ServletFilterTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import io.opentelemetry.sdk.trace.data.SpanData;
2525
import io.opentelemetry.sdk.trace.data.StatusData;
2626
import java.util.Map;
27+
import org.assertj.core.api.AbstractAssert;
2728
import org.junit.jupiter.api.extension.RegisterExtension;
2829
import org.springframework.boot.SpringApplication;
2930
import org.springframework.context.ConfigurableApplicationContext;
@@ -70,7 +71,7 @@ protected SpanDataAssert assertHandlerSpan(
7071
equalTo(
7172
EXCEPTION_TYPE,
7273
"org.springframework.web.servlet.resource.NoResourceFoundException"),
73-
satisfies(EXCEPTION_MESSAGE, val -> assertThat(val).isNotNull()),
74+
satisfies(EXCEPTION_MESSAGE, AbstractAssert::isNotNull),
7475
satisfies(EXCEPTION_STACKTRACE, val -> val.isInstanceOf(String.class))));
7576
return span;
7677
} else {

0 commit comments

Comments
 (0)