Batch convert JUnit assertions to AssertJ across multiple modules

Copilot · trask · Copilot · commit f1b21c631f12 · 2025-08-23T22:45:48.000Z
Co-authored-by: trask &lt;218610+trask@users.noreply.github.com&gt;
diff --git a/gcp-resources/src/test/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProviderTest.java b/gcp-resources/src/test/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProviderTest.java
@@ -52,7 +52,7 @@
 import static io.opentelemetry.semconv.incubating.HostIncubatingAttributes.HOST_NAME;
 import static io.opentelemetry.semconv.incubating.HostIncubatingAttributes.HOST_TYPE;
 import static io.opentelemetry.semconv.incubating.K8sIncubatingAttributes.K8S_CLUSTER_NAME;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.fail;
 import static org.mockito.Mockito.verify;
 
 import com.google.cloud.opentelemetry.detection.DetectedPlatform;
diff --git a/jfr-connection/src/test/java/io/opentelemetry/contrib/jfr/connection/FlightRecorderDiagnosticCommandConnectionTest.java b/jfr-connection/src/test/java/io/opentelemetry/contrib/jfr/connection/FlightRecorderDiagnosticCommandConnectionTest.java
@@ -45,7 +45,8 @@ void assertCommercialFeaturesLockedThrows() throws Exception {
 
   @Test
   void closeRecording() throws Exception {
-    assertThrows(UnsupportedOperationException.class, () -> createconnection().closeRecording(1));
+    assertThatThrownBy(() -> createconnection().closeRecording(1))
+        .isInstanceOf(UnsupportedOperationException.class);
   }
 
   @Test
@@ -73,7 +74,7 @@ void startRecordingParsesIdCorrectly() throws Exception {
     long id =
         connection.startRecording(
             new RecordingOptions.Builder().build(), RecordingConfiguration.PROFILE_CONFIGURATION);
-    assertEquals(id, 99);
+    assertThat(99).isEqualTo(id);
   }
 
   @Test
diff --git a/jfr-connection/src/test/java/io/opentelemetry/contrib/jfr/connection/FlightRecorderDiagnosticCommandConnectionTest.java.bak b/jfr-connection/src/test/java/io/opentelemetry/contrib/jfr/connection/FlightRecorderDiagnosticCommandConnectionTest.java.bak
@@ -0,0 +1,122 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.contrib.jfr.connection;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.lang.management.ManagementFactory;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import org.junit.jupiter.api.Test;
+
+class FlightRecorderDiagnosticCommandConnectionTest {
+
+  @Test
+  void assertCommercialFeaturesUnlocked() throws Exception {
+    MBeanServer mBeanServerConnection = ManagementFactory.getPlatformMBeanServer();
+    ObjectName objectName = new ObjectName("com.sun.management:type=DiagnosticCommand");
+    FlightRecorderDiagnosticCommandConnection.assertCommercialFeaturesUnlocked(
+        mBeanServerConnection, objectName);
+  }
+
+  @Test
+  void assertCommercialFeaturesLockedThrows() throws Exception {
+    assertThrows(
+        JfrConnectionException.class,
+        () -> {
+          ObjectName objectName = mock(ObjectName.class);
+          MBeanServerConnection mBeanServerConnection = mockMbeanServer(objectName, "locked");
+          FlightRecorderDiagnosticCommandConnection.assertCommercialFeaturesUnlocked(
+              mBeanServerConnection, objectName);
+        });
+  }
+
+  @Test
+  void closeRecording() throws Exception {
+    assertThrows(UnsupportedOperationException.class, () -> createconnection().closeRecording(1));
+  }
+
+  @Test
+  void testGetStream() throws Exception {
+    assertThrows(
+        UnsupportedOperationException.class,
+        () -> createconnection().getStream(1L, null, null, 0L));
+  }
+
+  @Test
+  void testCloneRecording() throws Exception {
+    assertThrows(
+        UnsupportedOperationException.class, () -> createconnection().cloneRecording(1, false));
+  }
+
+  @Test
+  void startRecordingParsesIdCorrectly() throws Exception {
+    ObjectName objectName = mock(ObjectName.class);
+    MBeanServerConnection mBeanServerConnection = mockMbeanServer(objectName, "unlocked");
+    when(mBeanServerConnection.invoke(
+            any(ObjectName.class), anyString(), any(Object[].class), any(String[].class)))
+        .thenReturn("Started recording 99. ");
+    FlightRecorderDiagnosticCommandConnection connection =
+        new FlightRecorderDiagnosticCommandConnection(mBeanServerConnection, objectName);
+    long id =
+        connection.startRecording(
+            new RecordingOptions.Builder().build(), RecordingConfiguration.PROFILE_CONFIGURATION);
+    assertEquals(id, 99);
+  }
+
+  @Test
+  void endToEndTest() throws Exception {
+
+    MBeanServerConnection mBeanServer = ManagementFactory.getPlatformMBeanServer();
+    FlightRecorderConnection flightRecorderConnection =
+        FlightRecorderDiagnosticCommandConnection.connect(mBeanServer);
+    RecordingOptions recordingOptions =
+        new RecordingOptions.Builder().disk("true").duration("5s").build();
+    RecordingConfiguration recordingConfiguration = RecordingConfiguration.PROFILE_CONFIGURATION;
+    Path tempFile = Files.createTempFile("recording", ".jfr");
+
+    try (Recording recording =
+        flightRecorderConnection.newRecording(recordingOptions, recordingConfiguration)) {
+
+      recording.start();
+      try {
+        Thread.sleep(1000);
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+      }
+      recording.dump(tempFile.toString());
+      recording.stop();
+    } finally {
+      if (!Files.exists(tempFile)) {
+        fail("Recording file not found");
+      }
+      Files.deleteIfExists(tempFile);
+    }
+  }
+
+  MBeanServerConnection mockMbeanServer(
+      ObjectName objectName, String vmCheckCommercialFeaturesResponse) throws Exception {
+    MBeanServerConnection mBeanServerConnection = mock(MBeanServerConnection.class);
+    when(mBeanServerConnection.invoke(objectName, "vmCheckCommercialFeatures", null, null))
+        .thenReturn(vmCheckCommercialFeaturesResponse);
+    return mBeanServerConnection;
+  }
+
+  private FlightRecorderDiagnosticCommandConnection createconnection() throws Exception {
+    ObjectName objectName = mock(ObjectName.class);
+    MBeanServerConnection mBeanServerConnection = mockMbeanServer(objectName, "locked");
+    return new FlightRecorderDiagnosticCommandConnection(mBeanServerConnection, objectName);
+  }
+}
diff --git a/jfr-connection/src/test/java/io/opentelemetry/contrib/jfr/connection/OpenDataUtilsTest.java b/jfr-connection/src/test/java/io/opentelemetry/contrib/jfr/connection/OpenDataUtilsTest.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.contrib.jfr.connection;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.lang.management.ManagementFactory;
 import java.util.HashMap;
@@ -49,6 +49,6 @@ void makeOpenData() throws Exception {
             mBeanServerConnection.invoke(
                 objectInstance.getObjectName(), "getRecordingSettings", args, argTypes);
 
-    assertEquals(expected, actual);
+    assertThat(actual).isEqualTo(expected);
   }
 }
diff --git a/jfr-connection/src/test/java/io/opentelemetry/contrib/jfr/connection/OpenDataUtilsTest.java.bak b/jfr-connection/src/test/java/io/opentelemetry/contrib/jfr/connection/OpenDataUtilsTest.java.bak
@@ -0,0 +1,54 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.contrib.jfr.connection;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.lang.management.ManagementFactory;
+import java.util.HashMap;
+import java.util.Map;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectInstance;
+import javax.management.ObjectName;
+import javax.management.openmbean.TabularData;
+import org.junit.jupiter.api.Test;
+
+class OpenDataUtilsTest {
+
+  @Test
+  void makeOpenData() throws Exception {
+    Map<String, String> configuration = new HashMap<>();
+    configuration.put("jdk.ObjectAllocationInNewTLAB#enabled", "true");
+    configuration.put("jdk.ObjectAllocationOutsideTLAB#enabled", "true");
+
+    TabularData expected = OpenDataUtils.makeOpenData(configuration);
+
+    MBeanServerConnection mBeanServerConnection = ManagementFactory.getPlatformMBeanServer();
+    ObjectName objectName = new ObjectName("jdk.management.jfr:type=FlightRecorder");
+    ObjectInstance objectInstance = mBeanServerConnection.getObjectInstance(objectName);
+
+    Object[] args = new Object[] {};
+    String[] argTypes = new String[] {};
+    long id =
+        (long)
+            mBeanServerConnection.invoke(
+                objectInstance.getObjectName(), "newRecording", args, argTypes);
+
+    args = new Object[] {id, expected};
+    argTypes = new String[] {long.class.getName(), TabularData.class.getName()};
+    mBeanServerConnection.invoke(
+        objectInstance.getObjectName(), "setRecordingSettings", args, argTypes);
+
+    args = new Object[] {id};
+    argTypes = new String[] {long.class.getName()};
+    Map<?, ?> actual =
+        (Map<?, ?>)
+            mBeanServerConnection.invoke(
+                objectInstance.getObjectName(), "getRecordingSettings", args, argTypes);
+
+    assertEquals(expected, actual);
+  }
+}
diff --git a/kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/KafkaSpanExporterBuilderTest.java b/kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/KafkaSpanExporterBuilderTest.java
@@ -9,8 +9,8 @@
 import static org.apache.kafka.clients.CommonClientConfigs.CLIENT_ID_CONFIG;
 import static org.apache.kafka.clients.producer.ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG;
 import static org.apache.kafka.clients.producer.ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.google.common.collect.ImmutableMap;
 import io.opentelemetry.sdk.trace.data.SpanData;
@@ -49,7 +49,7 @@ void buildWithSerializersInSetters() {
                     .build())
             .build();
 
-    assertNotNull(actual);
+    assertThat(actual).isNotNull();
     actual.close();
   }
 
@@ -74,7 +74,7 @@ void buildWithSerializersInConfig() {
                     .build())
             .build();
 
-    assertNotNull(actual);
+    assertThat(actual).isNotNull();
     actual.close();
   }
 
diff --git a/kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/SpanDataDeserializerTest.java b/kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/SpanDataDeserializerTest.java
@@ -5,9 +5,9 @@
 
 package io.opentelemetry.contrib.kafka;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
 import io.opentelemetry.proto.resource.v1.Resource;
@@ -38,7 +38,7 @@ void deserialize() {
 
     ExportTraceServiceRequest actual = testSubject.deserialize("test-topic", data);
 
-    assertEquals(request, actual);
+    assertThat(actual).isEqualTo(request);
   }
 
   @Test
diff --git a/kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/SpanDataSerializerTest.java b/kafka-exporter/src/test/java/io/opentelemetry/contrib/kafka/SpanDataSerializerTest.java
@@ -6,8 +6,8 @@
 package io.opentelemetry.contrib.kafka;
 
 import static io.opentelemetry.contrib.kafka.TestUtil.makeBasicSpan;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.common.collect.ImmutableList;
 import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
@@ -28,14 +28,14 @@ void serialize() {
 
     byte[] actual = testSubject.serialize("test-topic", spans);
 
-    assertNotNull(actual);
+    assertThat(actual).isNotNull();
   }
 
   @Test
   void serializeEmptyData() {
     byte[] actual = testSubject.serialize("test-topic", Collections.emptySet());
 
-    assertEquals(0, actual.length);
+    assertThat(actual.length).isEqualTo(0);
   }
 
   @Test
@@ -46,7 +46,7 @@ void convertSpansToRequest() {
 
     ExportTraceServiceRequest actual = testSubject.convertSpansToRequest(spans);
 
-    assertNotNull(actual);
+    assertThat(actual).isNotNull();
     assertEquals("span-1", actual.getResourceSpans(0).getScopeSpans(0).getSpans(0).getName());
     assertEquals("span-2", actual.getResourceSpans(0).getScopeSpans(0).getSpans(1).getName());
   }
@@ -55,7 +55,7 @@ void convertSpansToRequest() {
   void convertSpansToRequestForEmptySpans() {
     ExportTraceServiceRequest actual = testSubject.convertSpansToRequest(Collections.emptySet());
 
-    assertNotNull(actual);
-    assertEquals(ExportTraceServiceRequest.getDefaultInstance(), actual);
+    assertThat(actual).isNotNull();
+    assertThat(actual).isEqualTo(ExportTraceServiceRequest.getDefaultInstance());
   }
 }
diff --git a/processors/src/test/java/io/opentelemetry/contrib/filter/FilteringLogRecordProcessorTest.java b/processors/src/test/java/io/opentelemetry/contrib/filter/FilteringLogRecordProcessorTest.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.contrib.filter;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.logs.Logger;
 import io.opentelemetry.api.trace.Span;
diff --git a/processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableLogRecordExporterTest.java b/processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableLogRecordExporterTest.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.contrib.interceptor;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
diff --git a/processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableMetricExporterTest.java b/processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableMetricExporterTest.java
@@ -6,7 +6,7 @@
 package io.opentelemetry.contrib.interceptor;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.metrics.Meter;
 import io.opentelemetry.contrib.interceptor.common.ComposableInterceptor;
@@ -55,8 +55,8 @@ void verifyMetricModification() {
     meterProvider.forceFlush();
 
     List<MetricData> finishedMetricItems = memoryMetricExporter.getFinishedMetricItems();
-    assertEquals(1, finishedMetricItems.size());
-    assertEquals("ModifiedName", finishedMetricItems.get(0).getName());
+    assertThat(finishedMetricItems.size()).isEqualTo(1);
+    assertThat(finishedMetricItems.get(0).getName()).isEqualTo("ModifiedName");
   }
 
   @Test
@@ -75,7 +75,7 @@ void verifyMetricFiltering() {
     meterProvider.forceFlush();
 
     List<MetricData> finishedMetricItems = memoryMetricExporter.getFinishedMetricItems();
-    assertEquals(2, finishedMetricItems.size());
+    assertThat(finishedMetricItems.size()).isEqualTo(2);
     List<String> names = new ArrayList<>();
     for (MetricData item : finishedMetricItems) {
       names.add(item.getName());
diff --git a/processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableSpanExporterTest.java b/processors/src/test/java/io/opentelemetry/contrib/interceptor/InterceptableSpanExporterTest.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.contrib.interceptor;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
diff --git a/resource-providers/src/test/java/io/opentelemetry/contrib/resourceproviders/JettyServiceNameDetectorTest.java b/resource-providers/src/test/java/io/opentelemetry/contrib/resourceproviders/JettyServiceNameDetectorTest.java
@@ -6,8 +6,8 @@
 package io.opentelemetry.contrib.resourceproviders;
 
 import static io.opentelemetry.contrib.resourceproviders.JettyAppServer.parseJettyBase;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.IOException;
 import java.nio.file.Files;

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`package io.opentelemetry.contrib.jfr.connection;`
`7`	`7`
`8`		`-import static org.junit.jupiter.api.Assertions.assertEquals;`
	`8`	`+import static org.assertj.core.api.Assertions.assertThat;`
`9`	`9`
`10`	`10`	`import java.lang.management.ManagementFactory;`
`11`	`11`	`import java.util.HashMap;`
`@@ -49,6 +49,6 @@ void makeOpenData() throws Exception {`
`49`	`49`	`mBeanServerConnection.invoke(`
`50`	`50`	`objectInstance.getObjectName(), "getRecordingSettings", args, argTypes);`
`51`	`51`
`52`		`- assertEquals(expected, actual);`
	`52`	`+ assertThat(actual).isEqualTo(expected);`
`53`	`53`	`}`
`54`	`54`	`}`