Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 009D9200C53 for ; Tue, 28 Mar 2017 07:33:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F31D3160B99; Tue, 28 Mar 2017 05:33:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4DE3B160B85 for ; Tue, 28 Mar 2017 07:33:20 +0200 (CEST) Received: (qmail 19000 invoked by uid 500); 28 Mar 2017 05:33:19 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 18991 invoked by uid 99); 28 Mar 2017 05:33:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Mar 2017 05:33:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 38226DFE34; Tue, 28 Mar 2017 05:33:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aajisaka@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-14218. Replace assertThat with assertTrue in MetricsAsserts. Date: Tue, 28 Mar 2017 05:33:19 +0000 (UTC) archived-at: Tue, 28 Mar 2017 05:33:21 -0000 Repository: hadoop Updated Branches: refs/heads/trunk 9bae6720c -> 448ec81fd HADOOP-14218. Replace assertThat with assertTrue in MetricsAsserts. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/448ec81f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/448ec81f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/448ec81f Branch: refs/heads/trunk Commit: 448ec81fd7133f413853570f116d5f6e16f68bd9 Parents: 9bae672 Author: Akira Ajisaka Authored: Tue Mar 28 14:32:40 2017 +0900 Committer: Akira Ajisaka Committed: Tue Mar 28 14:32:40 2017 +0900 ---------------------------------------------------------------------- .../test/java/org/apache/hadoop/test/MetricsAsserts.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/448ec81f/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MetricsAsserts.java ---------------------------------------------------------------------- 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 a7bbe84..b2f6054 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); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org