Skip to content

Commit ae3ebd1

Browse files
authored
Simplify test cleanup loops (open-telemetry#17146)
1 parent 4413231 commit ae3ebd1

3 files changed

Lines changed: 12 additions & 9 deletions

File tree

instrumentation/couchbase/couchbase-common/testing/src/main/java/io/opentelemetry/instrumentation/couchbase/springdata/AbstractCouchbaseSpringTemplateTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DbSystemNameIncubatingValues.COUCHBASE;
1919
import static java.util.Collections.singletonList;
2020
import static org.assertj.core.api.Assertions.assertThat;
21-
import static org.junit.jupiter.api.Assertions.assertAll;
2221
import static org.junit.jupiter.api.Named.named;
2322

2423
import com.couchbase.client.java.Bucket;
@@ -84,8 +83,10 @@ void setUpTemplates() {
8483
}
8584

8685
@AfterAll
87-
void cleanUp() {
88-
assertAll(cleanup.stream().map(closeable -> closeable::close));
86+
void cleanUp() throws Exception {
87+
for (AutoCloseable closeable : cleanup) {
88+
closeable.close();
89+
}
8990
}
9091

9192
private static Stream<Arguments> templates() {

instrumentation/oshi/library/src/test/java/io/opentelemetry/instrumentation/oshi/ProcessMetricsTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package io.opentelemetry.instrumentation.oshi;
77

88
import static org.assertj.core.api.Assertions.assertThat;
9-
import static org.junit.jupiter.api.Assertions.assertAll;
109

1110
import io.opentelemetry.api.GlobalOpenTelemetry;
1211
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
@@ -30,8 +29,10 @@ static void setUp() {
3029
}
3130

3231
@AfterAll
33-
static void tearDown() {
34-
assertAll(observables.stream().map(observable -> observable::close));
32+
static void tearDown() throws Exception {
33+
for (AutoCloseable observable : observables) {
34+
observable.close();
35+
}
3536
}
3637

3738
@Override

instrumentation/oshi/library/src/test/java/io/opentelemetry/instrumentation/oshi/SystemMetricsTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package io.opentelemetry.instrumentation.oshi;
77

88
import static org.assertj.core.api.Assertions.assertThat;
9-
import static org.junit.jupiter.api.Assertions.assertAll;
109

1110
import io.opentelemetry.api.GlobalOpenTelemetry;
1211
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
@@ -30,8 +29,10 @@ static void setUp() {
3029
}
3130

3231
@AfterAll
33-
static void tearDown() {
34-
assertAll(observables.stream().map(observable -> observable::close));
32+
static void tearDown() throws Exception {
33+
for (AutoCloseable observable : observables) {
34+
observable.close();
35+
}
3536
}
3637

3738
@Override

0 commit comments

Comments
 (0)