jlengrand/error-prone-support
1
0
Fork 0
mirror of https://github.com/jlengrand/error-prone-support.git synced 2026-03-10 08:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync Dropwizard Metrics integration test (#1482)

Browse Source
This commit is contained in:
Stephan Schroevers
2024-12-29 20:30:59 +01:00
committed by GitHub
parent 6cfa9a0dfe
commit 9bd8095e0b
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
integration-tests/metrics-expected-changes.patch
View File

@@ -3028,17 +3028,16 @@
SharedMetricRegistries.getDefault(); SharedMetricRegistries.getDefault();
}); });
- assertTrue(exception.getMessage().contains("Default registry name has not been set.")); - assertTrue(exception.getMessage().contains("Default registry name has not been set."));
+ assertThat(exception.getMessage().contains("Default registry name has not been set.")).isTrue(); + assertThat(exception.getMessage()).contains("Default registry name has not been set.");
} }
@Test @Test
@@ -81,7 +80,8 @@ class SharedMetricRegistriesTest { @@ -81,7 +80,7 @@ class SharedMetricRegistriesTest {
SharedMetricRegistries.setDefault("foobah"); SharedMetricRegistries.setDefault("foobah");
SharedMetricRegistries.setDefault("borg"); SharedMetricRegistries.setDefault("borg");
}); });
- assertTrue(exception.getMessage().contains("Default metric registry name is already set.")); - assertTrue(exception.getMessage().contains("Default metric registry name is already set."));
+ assertThat(exception.getMessage().contains("Default metric registry name is already set.")) + assertThat(exception.getMessage()).contains("Default metric registry name is already set.");
+ .isTrue();
} }
@Test @Test
@@ -4943,27 +4942,25 @@
SharedHealthCheckRegistries.getDefault(); SharedHealthCheckRegistries.getDefault();
}); });
- assertTrue(exception.getMessage().contains("Default registry name has not been set.")); - assertTrue(exception.getMessage().contains("Default registry name has not been set."));
+ assertThat(exception.getMessage().contains("Default registry name has not been set.")).isTrue(); + assertThat(exception.getMessage()).contains("Default registry name has not been set.");
} }
@Test @Test
@@ -85,7 +84,8 @@ class SharedHealthCheckRegistriesTest { @@ -85,7 +84,7 @@ class SharedHealthCheckRegistriesTest {
SharedHealthCheckRegistries.setDefault("default"); SharedHealthCheckRegistries.setDefault("default");
SharedHealthCheckRegistries.setDefault("default"); SharedHealthCheckRegistries.setDefault("default");
}); });
- assertTrue(exception.getMessage().contains("Default health check registry is already set.")); - assertTrue(exception.getMessage().contains("Default health check registry is already set."));
+ assertThat(exception.getMessage().contains("Default health check registry is already set.")) + assertThat(exception.getMessage()).contains("Default health check registry is already set.");
+ .isTrue();
} }
@Test @Test
@@ -97,6 +97,7 @@ class SharedHealthCheckRegistriesTest { @@ -97,6 +96,6 @@ class SharedHealthCheckRegistriesTest {
SharedHealthCheckRegistries.setDefault("default", new HealthCheckRegistry()); SharedHealthCheckRegistries.setDefault("default", new HealthCheckRegistry());
SharedHealthCheckRegistries.setDefault("default", new HealthCheckRegistry()); SharedHealthCheckRegistries.setDefault("default", new HealthCheckRegistry());
}); });
- assertTrue(exception.getMessage().contains("Default health check registry is already set.")); - assertTrue(exception.getMessage().contains("Default health check registry is already set."));
+ assertThat(exception.getMessage().contains("Default health check registry is already set.")) + assertThat(exception.getMessage()).contains("Default health check registry is already set.");
+ .isTrue();
} }
} }
--- a/metrics-healthchecks/src/test/java/io/dropwizard/metrics5/health/jvm/ThreadDeadlockHealthCheckTest.java --- a/metrics-healthchecks/src/test/java/io/dropwizard/metrics5/health/jvm/ThreadDeadlockHealthCheckTest.java
@@ -5137,7 +5134,7 @@
- Mockito.verify(registry, Mockito.atLeast(1)).registerGauge(argumentCaptor.capture(), any()); - Mockito.verify(registry, Mockito.atLeast(1)).registerGauge(argumentCaptor.capture(), any());
- assertTrue(argumentCaptor.getValue().getKey().contains("some-other-name")); - assertTrue(argumentCaptor.getValue().getKey().contains("some-other-name"));
+ verify(registry, atLeast(1)).registerGauge(argumentCaptor.capture(), any()); + verify(registry, atLeast(1)).registerGauge(argumentCaptor.capture(), any());
+ assertThat(argumentCaptor.getValue().getKey().contains("some-other-name")).isTrue(); + assertThat(argumentCaptor.getValue().getKey()).contains("some-other-name");
} }
} }
--- a/metrics-httpclient/src/test/java/io/dropwizard/metrics5/httpclient/InstrumentedHttpClientsTest.java --- a/metrics-httpclient/src/test/java/io/dropwizard/metrics5/httpclient/InstrumentedHttpClientsTest.java
@@ -5215,7 +5212,7 @@
- Mockito.verify(registry, Mockito.atLeast(1)).registerGauge(argumentCaptor.capture(), any()); - Mockito.verify(registry, Mockito.atLeast(1)).registerGauge(argumentCaptor.capture(), any());
- assertTrue(argumentCaptor.getValue().getKey().contains("some-other-name")); - assertTrue(argumentCaptor.getValue().getKey().contains("some-other-name"));
+ verify(registry, atLeast(1)).registerGauge(argumentCaptor.capture(), any()); + verify(registry, atLeast(1)).registerGauge(argumentCaptor.capture(), any());
+ assertThat(argumentCaptor.getValue().getKey().contains("some-other-name")).isTrue(); + assertThat(argumentCaptor.getValue().getKey()).contains("some-other-name");
} }
} }
--- a/metrics-httpclient5/src/test/java/io/dropwizard/metrics5/httpclient5/InstrumentedHttpAsyncClientsTest.java --- a/metrics-httpclient5/src/test/java/io/dropwizard/metrics5/httpclient5/InstrumentedHttpAsyncClientsTest.java
@@ -5305,7 +5302,7 @@
- Mockito.verify(registry, Mockito.atLeast(1)).registerGauge(argumentCaptor.capture(), any()); - Mockito.verify(registry, Mockito.atLeast(1)).registerGauge(argumentCaptor.capture(), any());
- assertTrue(argumentCaptor.getValue().getKey().contains("some-other-name")); - assertTrue(argumentCaptor.getValue().getKey().contains("some-other-name"));
+ verify(registry, atLeast(1)).registerGauge(argumentCaptor.capture(), any()); + verify(registry, atLeast(1)).registerGauge(argumentCaptor.capture(), any());
+ assertThat(argumentCaptor.getValue().getKey().contains("some-other-name")).isTrue(); + assertThat(argumentCaptor.getValue().getKey()).contains("some-other-name");
} }
} }
--- a/metrics-httpclient5/src/test/java/io/dropwizard/metrics5/httpclient5/InstrumentedHttpClientsTest.java --- a/metrics-httpclient5/src/test/java/io/dropwizard/metrics5/httpclient5/InstrumentedHttpClientsTest.java