Skip to content

Commit 075f535

Browse files
Copilottrask
andcommitted
Apply spotless formatting and fix expected/actual order in assertions
Co-authored-by: trask <[email protected]>
1 parent f1b21c6 commit 075f535

File tree

10 files changed

+16
-33
lines changed

10 files changed

+16
-33
lines changed

jfr-connection/src/test/java/io/opentelemetry/contrib/jfr/connection/FlightRecorderDiagnosticCommandConnectionTest.java

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ void assertCommercialFeaturesUnlocked() throws Exception {
3333

3434
@Test
3535
void assertCommercialFeaturesLockedThrows() throws Exception {
36-
assertThrows(
37-
JfrConnectionException.class,
38-
() -> {
39-
ObjectName objectName = mock(ObjectName.class);
40-
MBeanServerConnection mBeanServerConnection = mockMbeanServer(objectName, "locked");
41-
FlightRecorderDiagnosticCommandConnection.assertCommercialFeaturesUnlocked(
42-
mBeanServerConnection, objectName);
43-
});
36+
assertThatThrownBy(
37+
() -> {
38+
ObjectName objectName = mock(ObjectName.class);
39+
MBeanServerConnection mBeanServerConnection = mockMbeanServer(objectName, "locked");
40+
FlightRecorderDiagnosticCommandConnection.assertCommercialFeaturesUnlocked(
41+
mBeanServerConnection, objectName);
42+
})
43+
.isInstanceOf(JfrConnectionException.class);
4444
}
4545

4646
@Test
@@ -51,15 +51,14 @@ void closeRecording() throws Exception {
5151

5252
@Test
5353
void testGetStream() throws Exception {
54-
assertThrows(
55-
UnsupportedOperationException.class,
56-
() -> createconnection().getStream(1L, null, null, 0L));
54+
assertThatThrownBy(() -> createconnection().getStream(1L, null, null, 0L))
55+
.isInstanceOf(UnsupportedOperationException.class);
5756
}
5857

5958
@Test
6059
void testCloneRecording() throws Exception {
61-
assertThrows(
62-
UnsupportedOperationException.class, () -> createconnection().cloneRecording(1, false));
60+
assertThatThrownBy(() -> createconnection().cloneRecording(1, false))
61+
.isInstanceOf(UnsupportedOperationException.class);
6362
}
6463

6564
@Test
@@ -74,7 +73,7 @@ void startRecordingParsesIdCorrectly() throws Exception {
7473
long id =
7574
connection.startRecording(
7675
new RecordingOptions.Builder().build(), RecordingConfiguration.PROFILE_CONFIGURATION);
77-
assertThat(99).isEqualTo(id);
76+
assertThat(id).isEqualTo(99);
7877
}
7978

8079
@Test

jfr-connection/src/test/java/io/opentelemetry/contrib/jfr/connection/RecordingOptionsTest.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ private static Stream<Arguments> testGetMaxAgeNegative() {
9191
@ParameterizedTest
9292
@MethodSource
9393
void testGetMaxAgeNegative(String badValue) {
94-
assertThatThrownBy(
95-
() -> new RecordingOptions.Builder().maxAge(badValue).build())
94+
assertThatThrownBy(() -> new RecordingOptions.Builder().maxAge(badValue).build())
9695
.isInstanceOf(IllegalArgumentException.class);
9796
}
9897

@@ -135,8 +134,7 @@ private static Stream<Arguments> testGetMaxSizeNegative() {
135134
@ParameterizedTest
136135
@MethodSource
137136
void testGetMaxSizeNegative(String badValue) {
138-
assertThatThrownBy(
139-
() -> new RecordingOptions.Builder().maxSize(badValue).build())
137+
assertThatThrownBy(() -> new RecordingOptions.Builder().maxSize(badValue).build())
140138
.isInstanceOf(IllegalArgumentException.class);
141139
}
142140

@@ -254,8 +252,7 @@ private static Stream<Arguments> testGetDurationNegative() {
254252
@ParameterizedTest
255253
@MethodSource
256254
void testGetDurationNegative(String badValue) {
257-
assertThatThrownBy(
258-
() -> new RecordingOptions.Builder().duration(badValue).build())
255+
assertThatThrownBy(() -> new RecordingOptions.Builder().duration(badValue).build())
259256
.isInstanceOf(IllegalArgumentException.class);
260257
}
261258

kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/KafkaSpanExporterBuilderTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import static org.apache.kafka.clients.producer.ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG;
1111
import static org.apache.kafka.clients.producer.ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG;
1212
import static org.assertj.core.api.Assertions.assertThat;
13-
import static org.assertj.core.api.Assertions.assertThatThrownBy;
1413

1514
import com.google.common.collect.ImmutableMap;
1615
import io.opentelemetry.sdk.trace.data.SpanData;

kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/SpanDataDeserializerTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
package io.opentelemetry.contrib.kafka;
77

8-
import static org.assertj.core.api.Assertions.assertThat;
9-
import static org.assertj.core.api.Assertions.assertThat;
108
import static org.assertj.core.api.Assertions.assertThat;
119

1210
import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;

kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/SpanDataSerializerTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import static io.opentelemetry.contrib.kafka.TestUtil.makeBasicSpan;
99
import static org.assertj.core.api.Assertions.assertThat;
10-
import static org.assertj.core.api.Assertions.assertThat;
1110

1211
import com.google.common.collect.ImmutableList;
1312
import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;

processors/src/test/java/io/opentelemetry/contrib/filter/FilteringLogRecordProcessorTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
package io.opentelemetry.contrib.filter;
77

8-
import static org.assertj.core.api.Assertions.assertThat;
9-
108
import io.opentelemetry.api.logs.Logger;
119
import io.opentelemetry.api.trace.Span;
1210
import io.opentelemetry.api.trace.SpanContext;

processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableLogRecordExporterTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
package io.opentelemetry.contrib.interceptor;
77

8-
import static org.assertj.core.api.Assertions.assertThat;
9-
108
import io.opentelemetry.api.common.AttributeKey;
119
import io.opentelemetry.api.common.Attributes;
1210
import io.opentelemetry.api.common.AttributesBuilder;

processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableMetricExporterTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package io.opentelemetry.contrib.interceptor;
77

8-
import static org.assertj.core.api.Assertions.assertThat;
98
import static org.assertj.core.api.Assertions.assertThat;
109

1110
import io.opentelemetry.api.metrics.Meter;

processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableSpanExporterTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
package io.opentelemetry.contrib.interceptor;
77

8-
import static org.assertj.core.api.Assertions.assertThat;
9-
108
import io.opentelemetry.api.common.AttributeKey;
119
import io.opentelemetry.api.common.Attributes;
1210
import io.opentelemetry.api.common.AttributesBuilder;

resource-providers/src/test/java/io/opentelemetry/contrib/resourceproviders/JettyServiceNameDetectorTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
package io.opentelemetry.contrib.resourceproviders;
77

88
import static io.opentelemetry.contrib.resourceproviders.JettyAppServer.parseJettyBase;
9-
import static org.assertj.core.api.Assertions.assertThat;
10-
import static org.assertj.core.api.Assertions.assertThat;
119

1210
import java.io.IOException;
1311
import java.nio.file.Files;

0 commit comments

Comments
 (0)