Junit cleanup (#1119)

* exclude hamcrest Signed-off-by: Gregor Zeitlinger <[email protected]> * simplify assertj Signed-off-by: Gregor Zeitlinger <[email protected]> * simplify assertj Signed-off-by: Gregor Zeitlinger <[email protected]> --------- Signed-off-by: Gregor Zeitlinger <[email protected]>
prometheus · Oct 7, 2024 · b6e5865 · b6e5865
1 parent 2c3e258
commit b6e5865
Show file tree

Hide file tree

Showing 23 changed files with 122 additions and 143 deletions.
diff --git a/integration-tests/it-common/pom.xml b/integration-tests/it-common/pom.xml
@@ -24,14 +24,6 @@
         </license>
     </licenses>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
     <build>
         <testResources>
             <testResource>

diff --git a/integration-tests/it-exporter/it-exporter-test/pom.xml b/integration-tests/it-exporter/it-exporter-test/pom.xml
@@ -42,11 +42,6 @@
             <artifactId>prometheus-metrics-exposition-formats</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>

diff --git a/integration-tests/it-pushgateway/pom.xml b/integration-tests/it-pushgateway/pom.xml
@@ -47,11 +47,7 @@
             <artifactId>prometheus-metrics-exporter-pushgateway</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-            <scope>test</scope>
-        </dependency>
+
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>it-common</artifactId>

diff --git a/...ests/it-pushgateway/src/test/java/io/prometheus/metrics/it/pushgateway/PushGatewayIT.java b/...ests/it-pushgateway/src/test/java/io/prometheus/metrics/it/pushgateway/PushGatewayIT.java
@@ -2,7 +2,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.assertj.core.data.Offset.offset;
 
 import com.jayway.jsonpath.Criteria;
 import com.jayway.jsonpath.Filter;
@@ -180,13 +179,13 @@ public void testProtobuf() throws IOException, InterruptedException {
 
   private void assertMetrics() throws IOException, InterruptedException {
     double value = getValue("my_batch_job_duration_seconds", "job", "pushgateway-test-app");
-    assertThat(value).isCloseTo(0.5, offset(0.0));
+    assertThat(value).isEqualTo(0.5);
     value = getValue("file_sizes_bytes_bucket", "job", "pushgateway-test-app", "le", "512");
-    assertThat(value).isCloseTo(0.0, offset(0.0));
+    assertThat(value).isEqualTo(0.0);
     value = getValue("file_sizes_bytes_bucket", "job", "pushgateway-test-app", "le", "1024");
-    assertThat(value).isCloseTo(2.0, offset(0.0));
+    assertThat(value).isEqualTo(2.0);
     value = getValue("file_sizes_bytes_bucket", "job", "pushgateway-test-app", "le", "+Inf");
-    assertThat(value).isCloseTo(3.0, offset(0.0));
+    assertThat(value).isEqualTo(3.0);
   }
 
   private double getValue(String name, String... labels) throws IOException, InterruptedException {
@@ -204,7 +203,7 @@ private double getValue(String name, String... labels) throws IOException, Inter
 
   private void assertNativeHistogram() throws IOException, InterruptedException {
     double count = getNativeHistogramCount("file_sizes_bytes", "pushgateway-test-app");
-    assertThat(count).isCloseTo(3, offset(0.0));
+    assertThat(count).isEqualTo(3);
   }
 
   private double getNativeHistogramCount(String name, String job)

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -49,14 +50,18 @@
             </plugin>
         </plugins>
     </build>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>testcontainers</artifactId>
-                <version>1.19.8</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>1.20.2</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java
@@ -1152,7 +1152,7 @@ private void assertExemplar(Histogram histogram, double value, String... labels)
     assertThat(exemplar)
         .as("No exemplar found in bucket [" + lowerBound + ", " + upperBound + "]")
         .isNotNull();
-    assertThat(exemplar.getValue()).isCloseTo(value, offset(0.0));
+    assertThat(exemplar.getValue()).isEqualTo(value);
     assertThat(exemplar.getLabels().size())
         .as("" + exemplar.getLabels())
         .isEqualTo(labels.length / 2);
@@ -1354,7 +1354,7 @@ public void testNoLabelsDefaultZeroValue() {
     Histogram noLabels = Histogram.builder().name("test").build();
     assertThat(getBucket(noLabels, 0.005).getCount()).isZero();
     assertThat(getData(noLabels).getCount()).isZero();
-    assertThat(getData(noLabels).getSum()).isCloseTo(0.0, offset(0.0));
+    assertThat(getData(noLabels).getSum()).isEqualTo(0.0);
   }
 
   private ClassicHistogramBucket getBucket(Histogram histogram, double le, String... labels) {

diff --git a/...eus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/StatefulMetricTest.java b/...eus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/StatefulMetricTest.java
@@ -1,7 +1,6 @@
 package io.prometheus.metrics.core.metrics;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.data.Offset.offset;
 
 import java.lang.reflect.Field;
 import java.util.Map;
@@ -55,17 +54,17 @@ public void testClearNoLabels() {
     Counter counter = Counter.builder().name("test").build();
     counter.inc();
     assertThat(counter.collect().getDataPoints()).hasSize(1);
-    assertThat(counter.collect().getDataPoints().get(0).getValue()).isCloseTo(1.0, offset(0.0));
+    assertThat(counter.collect().getDataPoints().get(0).getValue()).isEqualTo(1.0);
 
     counter.clear();
     // No labels is always present, but as no value has been observed after clear() the value should
     // be 0.0
     assertThat(counter.collect().getDataPoints()).hasSize(1);
-    assertThat(counter.collect().getDataPoints().get(0).getValue()).isCloseTo(0.0, offset(0.0));
+    assertThat(counter.collect().getDataPoints().get(0).getValue()).isEqualTo(0.0);
 
     // Making inc() works correctly after clear()
     counter.inc();
     assertThat(counter.collect().getDataPoints()).hasSize(1);
-    assertThat(counter.collect().getDataPoints().get(0).getValue()).isCloseTo(1.0, offset(0.0));
+    assertThat(counter.collect().getDataPoints().get(0).getValue()).isEqualTo(1.0);
   }
 }
diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/SummaryTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/SummaryTest.java
@@ -123,14 +123,12 @@ public void testMaxAge() throws InterruptedException {
             .help("help")
             .register(registry);
     summary.observe(8.0);
-    assertThat(getQuantile(summary, 0.99, Labels.EMPTY))
-        .isCloseTo(8.0, offset(0.0)); // From bucket 1.
+    assertThat(getQuantile(summary, 0.99, Labels.EMPTY)).isEqualTo(8.0); // From bucket 1.
     Thread.sleep(600);
-    assertThat(getQuantile(summary, 0.99, Labels.EMPTY))
-        .isCloseTo(8.0, offset(0.0)); // From bucket 2.
+    assertThat(getQuantile(summary, 0.99, Labels.EMPTY)).isEqualTo(8.0); // From bucket 2.
     Thread.sleep(600);
     assertThat(getQuantile(summary, 0.99, Labels.EMPTY))
-        .isCloseTo(Double.NaN, offset(0.0)); // Bucket 1 again, now it is empty.
+        .isEqualTo(Double.NaN); // Bucket 1 again, now it is empty.
   }
 
   @Test

diff --git a/prometheus-metrics-exporter-opentelemetry/pom.xml b/prometheus-metrics-exporter-opentelemetry/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -56,6 +57,12 @@
             <artifactId>wiremock</artifactId>
             <version>3.5.4</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.awaitility</groupId>
@@ -88,37 +95,37 @@
             </resource>
         </resources>
         <plugins>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <version>3.6.0</version>
-            <executions>
-                <execution>
-                    <id>copy</id>
-                    <phase>package</phase>
-                    <goals>
-                        <goal>copy</goal>
-                    </goals>
-                </execution>
-            </executions>
-            <configuration>
-                <artifactItems>
-                    <artifactItem>
-                        <groupId>io.opentelemetry</groupId>
-                        <artifactId>opentelemetry-api</artifactId>
-                        <version>${otel.version}</version>
-                        <outputDirectory>${project.basedir}/src/main/resources/lib/</outputDirectory>
-                    </artifactItem>
-                    <artifactItem>
-                        <groupId>io.opentelemetry</groupId>
-                        <artifactId>opentelemetry-context</artifactId>
-                        <version>${otel.version}</version>
-                        <outputDirectory>${project.basedir}/src/main/resources/lib/</outputDirectory>
-                    </artifactItem>
-                </artifactItems>
-                <!-- other configurations here -->
-            </configuration>
-        </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <artifactItems>
+                        <artifactItem>
+                            <groupId>io.opentelemetry</groupId>
+                            <artifactId>opentelemetry-api</artifactId>
+                            <version>${otel.version}</version>
+                            <outputDirectory>${project.basedir}/src/main/resources/lib/</outputDirectory>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>io.opentelemetry</groupId>
+                            <artifactId>opentelemetry-context</artifactId>
+                            <version>${otel.version}</version>
+                            <outputDirectory>${project.basedir}/src/main/resources/lib/</outputDirectory>
+                        </artifactItem>
+                    </artifactItems>
+                    <!-- other configurations here -->
+                </configuration>
+            </plugin>
             <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/...c/test/java/io/prometheus/metrics/instrumentation/caffeine/CacheMetricsCollectorTest.java b/...c/test/java/io/prometheus/metrics/instrumentation/caffeine/CacheMetricsCollectorTest.java
@@ -1,7 +1,6 @@
 package io.prometheus.metrics.instrumentation.caffeine;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.data.Offset.offset;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -120,7 +119,7 @@ private void assertCounterMetric(
     final CounterSnapshot.CounterDataPointSnapshot dataPointSnapshot =
         (CounterSnapshot.CounterDataPointSnapshot) getDataPointSnapshot(registry, name, cacheName);
 
-    assertThat(dataPointSnapshot.getValue()).isCloseTo(value, offset(0.0));
+    assertThat(dataPointSnapshot.getValue()).isEqualTo(value);
   }
 
   private DataPointSnapshot getDataPointSnapshot(

diff --git a/...rc/test/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExportsTest.java b/...rc/test/java/io/prometheus/metrics/instrumentation/dropwizard5/DropwizardExportsTest.java
@@ -182,17 +182,17 @@ public void testHistogram() {
     assertThat(dataPoint.hasSum()).isFalse();
     Quantiles quantiles = dataPoint.getQuantiles();
     assertThat(quantiles.size()).isEqualTo(6);
-    assertThat(quantiles.get(0).getQuantile()).isCloseTo(0.5, offset(0.0));
+    assertThat(quantiles.get(0).getQuantile()).isEqualTo(0.5);
     assertThat(quantiles.get(0).getValue()).isCloseTo(49.0, offset(1.0));
-    assertThat(quantiles.get(1).getQuantile()).isCloseTo(0.75, offset(0.0));
+    assertThat(quantiles.get(1).getQuantile()).isEqualTo(0.75);
     assertThat(quantiles.get(1).getValue()).isCloseTo(74.0, offset(1.0));
-    assertThat(quantiles.get(2).getQuantile()).isCloseTo(0.95, offset(0.0));
+    assertThat(quantiles.get(2).getQuantile()).isEqualTo(0.95);
     assertThat(quantiles.get(2).getValue()).isCloseTo(94.0, offset(1.0));
-    assertThat(quantiles.get(3).getQuantile()).isCloseTo(0.98, offset(0.0));
+    assertThat(quantiles.get(3).getQuantile()).isEqualTo(0.98);
     assertThat(quantiles.get(3).getValue()).isCloseTo(97.0, offset(1.0));
-    assertThat(quantiles.get(4).getQuantile()).isCloseTo(0.99, offset(0.0));
+    assertThat(quantiles.get(4).getQuantile()).isEqualTo(0.99);
     assertThat(quantiles.get(4).getValue()).isCloseTo(98.0, offset(1.0));
-    assertThat(quantiles.get(5).getQuantile()).isCloseTo(0.999, offset(0.0));
+    assertThat(quantiles.get(5).getQuantile()).isEqualTo(0.999);
     assertThat(quantiles.get(5).getValue()).isCloseTo(99.0, offset(1.0));
   }
 

diff --git a/.../src/test/java/io/prometheus/metrics/instrumentation/guava/CacheMetricsCollectorTest.java b/.../src/test/java/io/prometheus/metrics/instrumentation/guava/CacheMetricsCollectorTest.java
@@ -1,7 +1,6 @@
 package io.prometheus.metrics.instrumentation.guava;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.data.Offset.offset;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -116,7 +115,7 @@ private void assertCounterMetric(
     final CounterSnapshot.CounterDataPointSnapshot dataPointSnapshot =
         (CounterSnapshot.CounterDataPointSnapshot) getDataPointSnapshot(registry, name, cacheName);
 
-    assertThat(dataPointSnapshot.getValue()).isCloseTo(value, offset(0.0));
+    assertThat(dataPointSnapshot.getValue()).isEqualTo(value);
   }
 
   private DataPointSnapshot getDataPointSnapshot(

diff --git a/...st/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryPoolAllocationMetricsTest.java b/...st/java/io/prometheus/metrics/instrumentation/jvm/JvmMemoryPoolAllocationMetricsTest.java
@@ -2,7 +2,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.assertj.core.data.Offset.offset;
 
 import io.prometheus.metrics.core.metrics.Counter;
 import io.prometheus.metrics.instrumentation.jvm.JvmMemoryPoolAllocationMetrics.AllocationCountingNotificationListener;
@@ -23,31 +22,31 @@ public void testListenerLogic() {
 
     // Increase by 123
     listener.handleMemoryPool("TestPool", 0, 123);
-    assertThat(getCountByPool("test", "TestPool", registry.scrape())).isCloseTo(123, offset(0.0));
+    assertThat(getCountByPool("test", "TestPool", registry.scrape())).isEqualTo(123);
 
     // No increase
     listener.handleMemoryPool("TestPool", 123, 123);
-    assertThat(getCountByPool("test", "TestPool", registry.scrape())).isCloseTo(123, offset(0.0));
+    assertThat(getCountByPool("test", "TestPool", registry.scrape())).isEqualTo(123);
 
     // No increase, then decrease to 0
     listener.handleMemoryPool("TestPool", 123, 0);
-    assertThat(getCountByPool("test", "TestPool", registry.scrape())).isCloseTo(123, offset(0.0));
+    assertThat(getCountByPool("test", "TestPool", registry.scrape())).isEqualTo(123);
 
     // No increase, then increase by 7
     listener.handleMemoryPool("TestPool", 0, 7);
-    assertThat(getCountByPool("test", "TestPool", registry.scrape())).isCloseTo(130, offset(0.0));
+    assertThat(getCountByPool("test", "TestPool", registry.scrape())).isEqualTo(130);
 
     // Increase by 10, then decrease to 10
     listener.handleMemoryPool("TestPool", 17, 10);
-    assertThat(getCountByPool("test", "TestPool", registry.scrape())).isCloseTo(140, offset(0.0));
+    assertThat(getCountByPool("test", "TestPool", registry.scrape())).isEqualTo(140);
 
     // Increase by 7, then increase by 3
     listener.handleMemoryPool("TestPool", 17, 20);
-    assertThat(getCountByPool("test", "TestPool", registry.scrape())).isCloseTo(150, offset(0.0));
+    assertThat(getCountByPool("test", "TestPool", registry.scrape())).isEqualTo(150);
 
     // Decrease to 17, then increase by 3
     listener.handleMemoryPool("TestPool", 17, 20);
-    assertThat(getCountByPool("test", "TestPool", registry.scrape())).isCloseTo(153, offset(0.0));
+    assertThat(getCountByPool("test", "TestPool", registry.scrape())).isEqualTo(153);
   }
 
   private double getCountByPool(String metricName, String poolName, MetricSnapshots snapshots) {

diff --git a/...on-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmThreadsMetricsTest.java b/...on-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmThreadsMetricsTest.java
@@ -2,7 +2,6 @@
 
 import static io.prometheus.metrics.instrumentation.jvm.TestUtil.convertToOpenMetricsFormat;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.data.Offset.offset;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -135,7 +134,7 @@ public void testInvalidThreadIds() {
 
       assertThat(actual).hasSameSizeAs(expected);
       for (String threadState : expected.keySet()) {
-        assertThat(actual.get(threadState)).isCloseTo(expected.get(threadState), offset(0.0));
+        assertThat(actual.get(threadState)).isEqualTo(expected.get(threadState));
       }
     } finally {
       for (int i = 0; i < numberOfInvalidThreadIds; i++) {