Skip to content

Commit 310b9e3

Browse files
trasktrask
committed
Test assertion simplification using isIn
1 parent f8e3e32 commit 310b9e3

13 files changed

Lines changed: 32 additions & 142 deletions

File tree

‎instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientTest.java‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -913,19 +913,13 @@ void testTimeoutAndRetryErrorsAreNotCaptured() {
913913
satisfies(
914914
URL_FULL,
915915
val ->
916-
val.satisfiesAnyOf(
917-
v ->
918-
assertThat(v)
919-
.isEqualTo(
920-
"http://somebucket.localhost:"
921-
+ server.httpPort()
922-
+ "/somekey"),
923-
v ->
924-
assertThat(v)
925-
.isEqualTo(
926-
"http://localhost:"
927-
+ server.httpPort()
928-
+ "/somebucket/somekey"))),
916+
val.isIn(
917+
"http://somebucket.localhost:"
918+
+ server.httpPort()
919+
+ "/somekey",
920+
"http://localhost:"
921+
+ server.httpPort()
922+
+ "/somebucket/somekey")),
929923
equalTo(SERVER_PORT, server.httpPort()),
930924
equalTo(HTTP_REQUEST_METHOD, "GET"),
931925
equalTo(RPC_SYSTEM, "aws-api"),

‎instrumentation/cassandra/cassandra-4.4/testing/src/main/java/io/opentelemetry/testing/cassandra/v4_4/AbstractCassandra44Test.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
2828
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
2929
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues.CASSANDRA;
30-
import static org.assertj.core.api.Assertions.assertThat;
3130
import static org.junit.jupiter.api.Named.named;
3231

3332
import com.datastax.oss.driver.api.core.CqlSession;
@@ -65,12 +64,7 @@ void reactiveTest(Parameter parameter) {
6564
.hasKind(SpanKind.CLIENT)
6665
.hasParent(trace.getSpan(0))
6766
.hasAttributesSatisfyingExactly(
68-
satisfies(
69-
NETWORK_TYPE,
70-
val ->
71-
val.satisfiesAnyOf(
72-
v -> assertThat(v).isEqualTo("ipv4"),
73-
v -> assertThat(v).isEqualTo("ipv6"))),
67+
satisfies(NETWORK_TYPE, val -> val.isIn("ipv4", "ipv6")),
7468
equalTo(SERVER_ADDRESS, cassandraHost),
7569
equalTo(SERVER_PORT, cassandraPort),
7670
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),

‎instrumentation/cassandra/cassandra-common-4.0/testing/src/main/java/io/opentelemetry/cassandra/common/v4_0/AbstractCassandraTest.java‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
3030
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
3131
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues.CASSANDRA;
32-
import static org.assertj.core.api.Assertions.assertThat;
3332
import static org.junit.jupiter.api.Named.named;
3433

3534
import com.datastax.oss.driver.api.core.CqlSession;
@@ -129,12 +128,7 @@ void syncTest(Parameter parameter) {
129128
.hasKind(SpanKind.CLIENT)
130129
.hasNoParent()
131130
.hasAttributesSatisfyingExactly(
132-
satisfies(
133-
NETWORK_TYPE,
134-
val ->
135-
val.satisfiesAnyOf(
136-
v -> assertThat(v).isEqualTo("ipv4"),
137-
v -> assertThat(v).isEqualTo("ipv6"))),
131+
satisfies(NETWORK_TYPE, val -> val.isIn("ipv4", "ipv6")),
138132
equalTo(SERVER_ADDRESS, cassandraHost),
139133
equalTo(SERVER_PORT, cassandraPort),
140134
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),
@@ -190,12 +184,7 @@ void asyncTest(Parameter parameter) throws Exception {
190184
.hasKind(SpanKind.CLIENT)
191185
.hasParent(trace.getSpan(0))
192186
.hasAttributesSatisfyingExactly(
193-
satisfies(
194-
NETWORK_TYPE,
195-
val ->
196-
val.satisfiesAnyOf(
197-
v -> assertThat(v).isEqualTo("ipv4"),
198-
v -> assertThat(v).isEqualTo("ipv6"))),
187+
satisfies(NETWORK_TYPE, val -> val.isIn("ipv4", "ipv6")),
199188
equalTo(SERVER_ADDRESS, cassandraHost),
200189
equalTo(SERVER_PORT, cassandraPort),
201190
equalTo(NETWORK_PEER_ADDRESS, cassandraIp),

‎instrumentation/elasticsearch/elasticsearch-transport-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/AbstractElasticsearchTransportClientTest.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,7 @@ ELASTICSEARCH_REQUEST, experimental("ClusterHealthRequest")))),
101101
private List<AttributeAssertion> addNetworkTypeAttribute(AttributeAssertion... assertions) {
102102
List<AttributeAssertion> result = new ArrayList<>(asList(assertions));
103103
if (hasNetworkType()) {
104-
result.add(
105-
satisfies(
106-
NETWORK_TYPE,
107-
k ->
108-
k.satisfiesAnyOf(
109-
val -> assertThat(val).isEqualTo("ipv4"),
110-
val -> assertThat(val).isEqualTo("ipv6"))));
104+
result.add(satisfies(NETWORK_TYPE, val -> val.isIn("ipv4", "ipv6")));
111105
}
112106
return result;
113107
}

‎instrumentation/jsf/jsf-jakarta-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/jakarta/BaseJsfTest.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,7 @@ void testPath(String path, String route) {
119119
equalTo(USER_AGENT_ORIGINAL, TEST_USER_AGENT),
120120
equalTo(HTTP_RESPONSE_STATUS_CODE, 200),
121121
equalTo(HTTP_ROUTE, getContextPath() + "/" + route),
122-
satisfies(
123-
CLIENT_ADDRESS,
124-
val ->
125-
val.satisfiesAnyOf(
126-
v -> assertThat(v).isEqualTo(TEST_CLIENT_IP),
127-
v -> assertThat(v).isNull())))));
122+
satisfies(CLIENT_ADDRESS, val -> val.isIn(TEST_CLIENT_IP, null)))));
128123
}
129124

130125
@Test

‎instrumentation/jsf/jsf-javax-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/javax/BaseJsfTest.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,7 @@ void testPath(String path, String route) {
130130
equalTo(USER_AGENT_ORIGINAL, TEST_USER_AGENT),
131131
equalTo(HTTP_RESPONSE_STATUS_CODE, 200),
132132
equalTo(HTTP_ROUTE, getContextPath() + "/" + route),
133-
satisfies(
134-
CLIENT_ADDRESS,
135-
val ->
136-
val.satisfiesAnyOf(
137-
v -> assertThat(v).isEqualTo(TEST_CLIENT_IP),
138-
v -> assertThat(v).isNull())))));
133+
satisfies(CLIENT_ADDRESS, val -> val.isIn(TEST_CLIENT_IP, null)))));
139134
}
140135

141136
@Test

‎instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -139,27 +139,12 @@ void failedRequest() throws Exception {
139139
span.hasName("CONNECT").hasKind(INTERNAL).hasParent(trace.getSpan(0));
140140
span.hasAttributesSatisfyingExactly(
141141
equalTo(NETWORK_TRANSPORT, "tcp"),
142-
satisfies(
143-
NETWORK_TYPE,
144-
k ->
145-
k.satisfiesAnyOf(
146-
v -> assertThat(v).isEqualTo("ipv4"),
147-
v -> assertThat(v).isNull())),
142+
satisfies(NETWORK_TYPE, val -> val.isIn("ipv4", null)),
148143
equalTo(SERVER_ADDRESS, uri.getHost()),
149144
equalTo(SERVER_PORT, uri.getPort()),
150145
equalTo(maybeStablePeerService(), "test-peer-service"),
151-
satisfies(
152-
NETWORK_PEER_PORT,
153-
k ->
154-
k.satisfiesAnyOf(
155-
v -> assertThat(v).isEqualTo(uri.getPort()),
156-
v -> assertThat(v).isNull())),
157-
satisfies(
158-
NETWORK_PEER_ADDRESS,
159-
k ->
160-
k.satisfiesAnyOf(
161-
v -> assertThat(v).isEqualTo("127.0.0.1"),
162-
v -> assertThat(v).isNull())));
146+
satisfies(NETWORK_PEER_PORT, val -> val.isIn(uri.getPort(), null)),
147+
satisfies(NETWORK_PEER_ADDRESS, val -> val.isIn("127.0.0.1", null)));
163148
}));
164149
}
165150

‎instrumentation/netty/netty-4.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/Netty41ClientSslTest.java‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
1717
import static java.util.Collections.singletonList;
1818
import static java.util.concurrent.TimeUnit.SECONDS;
19-
import static org.assertj.core.api.Assertions.assertThat;
2019
import static org.assertj.core.api.Assertions.catchThrowable;
2120

2221
import io.netty.bootstrap.Bootstrap;
@@ -168,18 +167,8 @@ void testFailSslHandshake() throws Exception {
168167
.hasAttributesSatisfyingExactly(
169168
equalTo(NETWORK_TRANSPORT, "tcp"),
170169
equalTo(NETWORK_TYPE, "ipv4"),
171-
satisfies(
172-
SERVER_ADDRESS,
173-
v ->
174-
v.satisfiesAnyOf(
175-
k -> assertThat(k).isNull(),
176-
k -> assertThat(k).isEqualTo(uri.getHost()))),
177-
satisfies(
178-
SERVER_PORT,
179-
v ->
180-
v.satisfiesAnyOf(
181-
k -> assertThat(k).isNull(),
182-
k -> assertThat(k).isEqualTo(uri.getPort()))),
170+
satisfies(SERVER_ADDRESS, val -> val.isIn(null, uri.getHost())),
171+
satisfies(SERVER_PORT, val -> val.isIn(null, uri.getPort())),
183172
equalTo(NETWORK_PEER_PORT, uri.getPort()),
184173
equalTo(NETWORK_PEER_ADDRESS, "127.0.0.1"))));
185174
}

‎instrumentation/netty/netty-4.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/Netty41ConnectionSpanTest.java‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -181,26 +181,11 @@ void testFailingRequest() throws Exception {
181181
.hasException(finalThrownException)
182182
.hasAttributesSatisfyingExactly(
183183
equalTo(NETWORK_TRANSPORT, "tcp"),
184-
satisfies(
185-
NETWORK_TYPE,
186-
k ->
187-
k.satisfiesAnyOf(
188-
v -> assertThat(v).isEqualTo("ipv4"),
189-
v -> assertThat(v).isNull())),
184+
satisfies(NETWORK_TYPE, val -> val.isIn("ipv4", null)),
190185
equalTo(SERVER_ADDRESS, uri.getHost()),
191186
equalTo(SERVER_PORT, uri.getPort()),
192-
satisfies(
193-
NETWORK_PEER_PORT,
194-
k ->
195-
k.satisfiesAnyOf(
196-
v -> assertThat(v).isEqualTo(uri.getPort()),
197-
v -> assertThat(v).isNull())),
198-
satisfies(
199-
NETWORK_PEER_ADDRESS,
200-
k ->
201-
k.satisfiesAnyOf(
202-
v -> assertThat(v).isEqualTo("127.0.0.1"),
203-
v -> assertThat(v).isNull())),
187+
satisfies(NETWORK_PEER_PORT, val -> val.isIn(uri.getPort(), null)),
188+
satisfies(NETWORK_PEER_ADDRESS, val -> val.isIn("127.0.0.1", null)),
204189
equalTo(maybeStablePeerService(), "test-peer-service"))));
205190
}
206191
}

‎instrumentation/openai/openai-java-1.1/testing/src/main/java/io/opentelemetry/instrumentation/openai/v1_1/AbstractEmbeddingsTest.java‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,7 @@ void basic() {
101101
// the user.
102102
satisfies(
103103
GEN_AI_REQUEST_ENCODING_FORMATS,
104-
val ->
105-
val.satisfiesAnyOf(
106-
v -> assertThat(v).isNull(),
107-
v ->
108-
assertThat(v)
109-
.isEqualTo(singletonList("base64"))))))));
104+
val -> val.isIn(null, singletonList("base64")))))));
110105

111106
getTesting()
112107
.waitAndAssertMetrics(
@@ -250,12 +245,7 @@ void connectionError() {
250245
// the user.
251246
satisfies(
252247
GEN_AI_REQUEST_ENCODING_FORMATS,
253-
val ->
254-
val.satisfiesAnyOf(
255-
v -> assertThat(v).isNull(),
256-
v ->
257-
assertThat(v)
258-
.isEqualTo(singletonList("base64"))))))));
248+
val -> val.isIn(null, singletonList("base64")))))));
259249

260250
getTesting()
261251
.waitAndAssertMetrics(

0 commit comments

Comments
 (0)