23
23
import static org .junit .Assert .assertThat ;
24
24
import static org .junit .Assert .assertTrue ;
25
25
import static org .mockito .ArgumentMatchers .anyDouble ;
26
- import static org .mockito .ArgumentMatchers .anyListOf ;
26
+ import static org .mockito .ArgumentMatchers .anyList ;
27
27
import static org .mockito .ArgumentMatchers .anyString ;
28
28
import static org .mockito .ArgumentMatchers .eq ;
29
29
@@ -119,7 +119,7 @@ public String getValue() {
119
119
120
120
metricRegistry .register ("invalid_gauge" , invalidGauge );
121
121
assertEquals (null , registry .getSampleValue ("invalid_gauge" ));
122
- Mockito .verifyZeroInteractions (sampleBuilder );
122
+ Mockito .verifyNoInteractions (sampleBuilder );
123
123
}
124
124
125
125
@ Test
@@ -132,7 +132,7 @@ public String getValue() {
132
132
};
133
133
metricRegistry .register ("invalid_gauge" , invalidGauge );
134
134
assertEquals (null , registry .getSampleValue ("invalid_gauge" ));
135
- Mockito .verifyZeroInteractions (sampleBuilder );
135
+ Mockito .verifyNoInteractions (sampleBuilder );
136
136
}
137
137
138
138
void assertRegistryContainsMetrics (String ... metrics ) {
@@ -190,19 +190,19 @@ public void testTimer() throws IOException, InterruptedException {
190
190
191
191
@ Test
192
192
public void testThatMetricHelpUsesOriginalDropwizardName () {
193
- Mockito .when (sampleBuilder .createSample (eq ("my.application.namedTimer1" ), anyString (), anyListOf ( String . class ), anyListOf ( String . class ), anyDouble ()))
193
+ Mockito .when (sampleBuilder .createSample (eq ("my.application.namedTimer1" ), anyString (), anyList ( ), anyList ( ), anyDouble ()))
194
194
.thenReturn (new Collector .MetricFamilySamples .Sample ("my_application_namedTimer1" , Collections .<String >emptyList (), Collections .<String >emptyList (), 1234 ));
195
195
196
- Mockito .when (sampleBuilder .createSample (eq ("my.application.namedCounter1" ), anyString (), anyListOf ( String . class ), anyListOf ( String . class ), anyDouble ()))
196
+ Mockito .when (sampleBuilder .createSample (eq ("my.application.namedCounter1" ), anyString (), anyList ( ), anyList ( ), anyDouble ()))
197
197
.thenReturn (new Collector .MetricFamilySamples .Sample ("my_application_namedCounter1" , Collections .<String >emptyList (), Collections .<String >emptyList (), 1234 ));
198
198
199
- Mockito .when (sampleBuilder .createSample (eq ("my.application.namedMeter1" ), anyString (), anyListOf ( String . class ), anyListOf ( String . class ), anyDouble ()))
199
+ Mockito .when (sampleBuilder .createSample (eq ("my.application.namedMeter1" ), anyString (), anyList ( ), anyList ( ), anyDouble ()))
200
200
.thenReturn (new Collector .MetricFamilySamples .Sample ("my_application_namedMeter1_total" , Collections .<String >emptyList (), Collections .<String >emptyList (), 1234 ));
201
201
202
- Mockito .when (sampleBuilder .createSample (eq ("my.application.namedHistogram1" ), anyString (), anyListOf ( String . class ), anyListOf ( String . class ), anyDouble ()))
202
+ Mockito .when (sampleBuilder .createSample (eq ("my.application.namedHistogram1" ), anyString (), anyList ( ), anyList ( ), anyDouble ()))
203
203
.thenReturn (new Collector .MetricFamilySamples .Sample ("my_application_namedHistogram1" , Collections .<String >emptyList (), Collections .<String >emptyList (), 1234 ));
204
204
205
- Mockito .when (sampleBuilder .createSample (eq ("my.application.namedGauge1" ), anyString (), anyListOf ( String . class ), anyListOf ( String . class ), anyDouble ()))
205
+ Mockito .when (sampleBuilder .createSample (eq ("my.application.namedGauge1" ), anyString (), anyList ( ), anyList ( ), anyDouble ()))
206
206
.thenReturn (new Collector .MetricFamilySamples .Sample ("my_application_namedGauge1" , Collections .<String >emptyList (), Collections .<String >emptyList (), 1234 ));
207
207
208
208
metricRegistry .timer ("my.application.namedTimer1" );
@@ -248,43 +248,43 @@ public void testThatMetricHelpUsesOriginalDropwizardName() {
248
248
@ Test
249
249
public void testThatMetricsMappedToSameNameAreGroupedInSameFamily () {
250
250
final Collector .MetricFamilySamples .Sample namedTimerSample1 = new Collector .MetricFamilySamples .Sample ("my_application_namedTimer" , Collections .<String >emptyList (), Collections .<String >emptyList (), 1234 );
251
- Mockito .when (sampleBuilder .createSample (eq ("my.application.namedTimer1" ), anyString (), anyListOf ( String . class ), anyListOf ( String . class ), anyDouble ()))
251
+ Mockito .when (sampleBuilder .createSample (eq ("my.application.namedTimer1" ), anyString (), anyList ( ), anyList ( ), anyDouble ()))
252
252
.thenReturn (namedTimerSample1 );
253
253
254
254
final Collector .MetricFamilySamples .Sample namedTimerSample2 = new Collector .MetricFamilySamples .Sample ("my_application_namedTimer" , Collections .<String >emptyList (), Collections .<String >emptyList (), 1235 );
255
- Mockito .when (sampleBuilder .createSample (eq ("my.application.namedTimer2" ), anyString (), anyListOf ( String . class ), anyListOf ( String . class ), anyDouble ()))
255
+ Mockito .when (sampleBuilder .createSample (eq ("my.application.namedTimer2" ), anyString (), anyList ( ), anyList ( ), anyDouble ()))
256
256
.thenReturn (namedTimerSample2 );
257
257
258
258
final Collector .MetricFamilySamples .Sample namedCounter1 = new Collector .MetricFamilySamples .Sample ("my_application_namedCounter" , Collections .<String >emptyList (), Collections .<String >emptyList (), 1234 );
259
- Mockito .when (sampleBuilder .createSample (eq ("my.application.namedCounter1" ), anyString (), anyListOf ( String . class ), anyListOf ( String . class ), anyDouble ()))
259
+ Mockito .when (sampleBuilder .createSample (eq ("my.application.namedCounter1" ), anyString (), anyList ( ), anyList ( ), anyDouble ()))
260
260
.thenReturn (namedCounter1 );
261
261
262
262
final Collector .MetricFamilySamples .Sample namedCounter2 = new Collector .MetricFamilySamples .Sample ("my_application_namedCounter" , Collections .<String >emptyList (), Collections .<String >emptyList (), 1235 );
263
- Mockito .when (sampleBuilder .createSample (eq ("my.application.namedCounter2" ), anyString (), anyListOf ( String . class ), anyListOf ( String . class ), anyDouble ()))
263
+ Mockito .when (sampleBuilder .createSample (eq ("my.application.namedCounter2" ), anyString (), anyList ( ), anyList ( ), anyDouble ()))
264
264
.thenReturn (namedCounter2 );
265
265
266
266
final Collector .MetricFamilySamples .Sample namedMeter1 = new Collector .MetricFamilySamples .Sample ("my_application_namedMeter_total" , Collections .<String >emptyList (), Collections .<String >emptyList (), 1234 );
267
- Mockito .when (sampleBuilder .createSample (eq ("my.application.namedMeter1" ), anyString (), anyListOf ( String . class ), anyListOf ( String . class ), anyDouble ()))
267
+ Mockito .when (sampleBuilder .createSample (eq ("my.application.namedMeter1" ), anyString (), anyList ( ), anyList ( ), anyDouble ()))
268
268
.thenReturn (namedMeter1 );
269
269
270
270
final Collector .MetricFamilySamples .Sample namedMeter2 = new Collector .MetricFamilySamples .Sample ("my_application_namedMeter_total" , Collections .<String >emptyList (), Collections .<String >emptyList (), 1235 );
271
- Mockito .when (sampleBuilder .createSample (eq ("my.application.namedMeter2" ), anyString (), anyListOf ( String . class ), anyListOf ( String . class ), anyDouble ()))
271
+ Mockito .when (sampleBuilder .createSample (eq ("my.application.namedMeter2" ), anyString (), anyList ( ), anyList ( ), anyDouble ()))
272
272
.thenReturn (namedMeter2 );
273
273
274
274
final Collector .MetricFamilySamples .Sample namedHistogram1 = new Collector .MetricFamilySamples .Sample ("my_application_namedHistogram" , Collections .<String >emptyList (), Collections .<String >emptyList (), 1234 );
275
- Mockito .when (sampleBuilder .createSample (eq ("my.application.namedHistogram1" ), anyString (), anyListOf ( String . class ), anyListOf ( String . class ), anyDouble ()))
275
+ Mockito .when (sampleBuilder .createSample (eq ("my.application.namedHistogram1" ), anyString (), anyList ( ), anyList ( ), anyDouble ()))
276
276
.thenReturn (namedHistogram1 );
277
277
278
278
final Collector .MetricFamilySamples .Sample namedHistogram2 = new Collector .MetricFamilySamples .Sample ("my_application_namedHistogram" , Collections .<String >emptyList (), Collections .<String >emptyList (), 1235 );
279
- Mockito .when (sampleBuilder .createSample (eq ("my.application.namedHistogram2" ), anyString (), anyListOf ( String . class ), anyListOf ( String . class ), anyDouble ()))
279
+ Mockito .when (sampleBuilder .createSample (eq ("my.application.namedHistogram2" ), anyString (), anyList ( ), anyList ( ), anyDouble ()))
280
280
.thenReturn (namedHistogram2 );
281
281
282
282
final Collector .MetricFamilySamples .Sample namedGauge1 = new Collector .MetricFamilySamples .Sample ("my_application_namedGauge" , Collections .<String >emptyList (), Collections .<String >emptyList (), 1234 );
283
- Mockito .when (sampleBuilder .createSample (eq ("my.application.namedGauge1" ), anyString (), anyListOf ( String . class ), anyListOf ( String . class ), anyDouble ()))
283
+ Mockito .when (sampleBuilder .createSample (eq ("my.application.namedGauge1" ), anyString (), anyList ( ), anyList ( ), anyDouble ()))
284
284
.thenReturn (namedGauge1 );
285
285
286
286
final Collector .MetricFamilySamples .Sample namedGauge2 = new Collector .MetricFamilySamples .Sample ("my_application_namedGauge" , Collections .<String >emptyList (), Collections .<String >emptyList (), 1235 );
287
- Mockito .when (sampleBuilder .createSample (eq ("my.application.namedGauge2" ), anyString (), anyListOf ( String . class ), anyListOf ( String . class ), anyDouble ()))
287
+ Mockito .when (sampleBuilder .createSample (eq ("my.application.namedGauge2" ), anyString (), anyList ( ), anyList ( ), anyDouble ()))
288
288
.thenReturn (namedGauge2 );
289
289
290
290
metricRegistry .timer ("my.application.namedTimer1" );
0 commit comments