From 448ec81fd7133f413853570f116d5f6e16f68bd9 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Tue, 28 Mar 2017 14:32:40 +0900 Subject: [PATCH] HADOOP-14218. Replace assertThat with assertTrue in MetricsAsserts. --- .../test/java/org/apache/hadoop/test/MetricsAsserts.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java index a7bbe841366..b2f6054fe85 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java @@ -27,7 +27,6 @@ import static org.mockito.AdditionalMatchers.geq; import static org.mockito.Mockito.*; import org.mockito.stubbing.Answer; -import org.mockito.internal.matchers.GreaterThan; import org.mockito.invocation.InvocationOnMock; import org.mockito.ArgumentCaptor; @@ -329,8 +328,8 @@ public class MetricsAsserts { */ public static void assertCounterGt(String name, long greater, MetricsRecordBuilder rb) { - Assert.assertThat("Bad value for metric " + name, getLongCounter(name, rb), - new GreaterThan(greater)); + Assert.assertTrue("Bad value for metric " + name, + getLongCounter(name, rb) > greater); } /** @@ -352,8 +351,8 @@ public class MetricsAsserts { */ public static void assertGaugeGt(String name, double greater, MetricsRecordBuilder rb) { - Assert.assertThat("Bad value for metric " + name, getDoubleGauge(name, rb), - new GreaterThan(greater)); + Assert.assertTrue("Bad value for metric " + name, + getDoubleGauge(name, rb) > greater); } /**