recycle assertions when we can

Author: SylvainJuge

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/MetricAssertions.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.contrib.jmxscraper.target_systems;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static io.opentelemetry.contrib.jmxscraper.assertions.Assertions.assertThat;
 
 import io.opentelemetry.proto.common.v1.KeyValue;
 import io.opentelemetry.proto.metrics.v1.Metric;
@@ -24,11 +24,11 @@ private MetricAssertions() {}
 
   static void assertGauge(Metric metric, String name, String description, String unit) {
     assertThat(metric.getName()).isEqualTo(name);
-    assertThat(metric.getDescription()).isEqualTo(description);
-    assertThat(metric.getUnit()).isEqualTo(unit);
-    assertThat(metric.hasGauge()).isTrue();
-    assertThat(metric.getGauge().getDataPointsList())
-        .satisfiesExactly(point -> assertThat(point.getAttributesList()).isEmpty());
+    assertThat(metric)
+        .hasDescription(description)
+        .hasUnit(unit)
+        .isGauge()
+        .hasDataPointsWithoutAttributes();
   }
 
   static void assertSum(Metric metric, String name, String description, String unit) {
@@ -38,12 +38,13 @@ static void assertSum(Metric metric, String name, String description, String uni
   static void assertSum(
       Metric metric, String name, String description, String unit, boolean isMonotonic) {
     assertThat(metric.getName()).isEqualTo(name);
-    assertThat(metric.getDescription()).isEqualTo(description);
-    assertThat(metric.getUnit()).isEqualTo(unit);
     assertThat(metric.hasSum()).isTrue();
-    assertThat(metric.getSum().getDataPointsList())
-        .satisfiesExactly(point -> assertThat(point.getAttributesList()).isEmpty());
     assertThat(metric.getSum().getIsMonotonic()).isEqualTo(isMonotonic);
+
+    assertThat(metric)
+        .hasDescription(description)
+        .hasUnit(unit)
+        .hasDataPointsWithoutAttributes();
   }
 
   @SafeVarargs
@@ -65,9 +66,11 @@ static void assertSumWithAttributes(
       String unit,
       boolean isMonotonic,
       Consumer<MapAssert<String, String>>... attributeGroupAssertions) {
+
     assertThat(metric.getName()).isEqualTo(name);
     assertThat(metric.getDescription()).isEqualTo(description);
     assertThat(metric.getUnit()).isEqualTo(unit);
+
     assertThat(metric.hasSum()).describedAs("sum expected").isTrue();
     assertThat(metric.getSum().getIsMonotonic()).isEqualTo(isMonotonic);
     assertAttributedPoints(metric.getSum().getDataPointsList(), attributeGroupAssertions);
@@ -81,9 +84,12 @@ static void assertSumWithAttributesMultiplePoints(
       String unit,
       boolean isMonotonic,
       Consumer<MapAssert<String, String>>... attributeGroupAssertions) {
+
     assertThat(metric.getName()).isEqualTo(name);
-    assertThat(metric.getDescription()).isEqualTo(description);
-    assertThat(metric.getUnit()).isEqualTo(unit);
+    assertThat(metric)
+        .hasDescription(description)
+        .hasUnit(unit);
+
     assertThat(metric.hasSum()).isTrue();
     assertThat(metric.getSum().getIsMonotonic()).isEqualTo(isMonotonic);
     assertAttributedMultiplePoints(metric.getSum().getDataPointsList(), attributeGroupAssertions);
@@ -97,9 +103,12 @@ static void assertGaugeWithAttributes(
       String unit,
       Consumer<MapAssert<String, String>>... attributeGroupAssertions) {
     assertThat(metric.getName()).isEqualTo(name);
-    assertThat(metric.getDescription()).isEqualTo(description);
-    assertThat(metric.getUnit()).isEqualTo(unit);
-    assertThat(metric.hasGauge()).isTrue();
+
+    assertThat(metric)
+        .hasDescription(description)
+        .hasUnit(unit)
+        .isGauge();
+
     assertAttributedPoints(metric.getGauge().getDataPointsList(), attributeGroupAssertions);
   }