From 2f9d639a9f8cb3e6987c7889f3ca2fbecacbf800 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Wed, 2 Oct 2019 23:33:46 +0000 Subject: [PATCH] Excavator: Upgrades Baseline to the latest version --- build.gradle | 2 +- .../palantir/tritium/metrics/MetricRegistriesTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index dbcd7c21e..e9e1437a5 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' classpath 'com.netflix.nebula:gradle-info-plugin:5.1.1' classpath 'com.netflix.nebula:nebula-publishing-plugin:13.6.1' - classpath 'com.palantir.baseline:gradle-baseline-java:2.16.0' + classpath 'com.palantir.baseline:gradle-baseline-java:2.17.0' classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.12.4' classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2' classpath 'gradle.plugin.org.inferred:gradle-processors:3.1.0' diff --git a/tritium-metrics/src/test/java/com/palantir/tritium/metrics/MetricRegistriesTest.java b/tritium-metrics/src/test/java/com/palantir/tritium/metrics/MetricRegistriesTest.java index 8ec36e368..02aeac8b0 100644 --- a/tritium-metrics/src/test/java/com/palantir/tritium/metrics/MetricRegistriesTest.java +++ b/tritium-metrics/src/test/java/com/palantir/tritium/metrics/MetricRegistriesTest.java @@ -336,22 +336,22 @@ void testInvalidGetOrAdd() { void testRegisterSafeDuplicateIgnored() { Metric mockMetric1 = mock(Counter.class, "metric1"); assertThat(MetricRegistries.registerSafe(metrics, "test", mockMetric1)).isSameAs(mockMetric1); - assertThat(metrics.getMetrics().get("test")).isEqualTo(mockMetric1); + assertThat(metrics.getMetrics()).containsEntry("test", mockMetric1); Metric mockMetric2 = mock(Counter.class, "metric2"); assertThat(MetricRegistries.registerSafe(metrics, "test", mockMetric2)).isSameAs(mockMetric1); - assertThat(metrics.getMetrics().get("test")).isEqualTo(mockMetric1); + assertThat(metrics.getMetrics()).containsEntry("test", mockMetric1); } @Test void testRegisterWithReplacement() { Metric mockMetric1 = mock(Metric.class, "metric1"); assertThat(MetricRegistries.registerWithReplacement(metrics, "test", mockMetric1)).isEqualTo(mockMetric1); - assertThat(metrics.getMetrics().get("test")).isEqualTo(mockMetric1); + assertThat(metrics.getMetrics()).containsEntry("test", mockMetric1); Metric mockMetric2 = mock(Metric.class, "metric2"); assertThat(MetricRegistries.registerWithReplacement(metrics, "test", mockMetric2)).isEqualTo(mockMetric2); - assertThat(metrics.getMetrics().get("test")).isEqualTo(mockMetric2); + assertThat(metrics.getMetrics()).containsEntry("test", mockMetric2); } @Test