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 68CE7200D1D for ; Sat, 14 Oct 2017 19:06:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 674161609D5; Sat, 14 Oct 2017 17:06:25 +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 84DEF1609CD for ; Sat, 14 Oct 2017 19:06:24 +0200 (CEST) Received: (qmail 68770 invoked by uid 500); 14 Oct 2017 17:06:23 -0000 Mailing-List: contact dev-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Commons Developers List" Delivered-To: mailing list dev@commons.apache.org Received: (qmail 68759 invoked by uid 99); 14 Oct 2017 17:06:23 -0000 Received: from mail-relay.apache.org (HELO mail-relay.apache.org) (140.211.11.15) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Oct 2017 17:06:23 +0000 Received: from mail-qt0-f179.google.com (mail-qt0-f179.google.com [209.85.216.179]) by mail-relay.apache.org (ASF Mail Server at mail-relay.apache.org) with ESMTPSA id 21E1D1A0185 for ; Sat, 14 Oct 2017 17:06:23 +0000 (UTC) Received: by mail-qt0-f179.google.com with SMTP id 1so24815031qtn.3 for ; Sat, 14 Oct 2017 10:06:23 -0700 (PDT) X-Gm-Message-State: AMCzsaWrWw3lT7I9jPCvFpcMUQmq9mwRPWIFrBWCkiBfvVt9lwXRRDbP Jnu09Tc0UQe+ng3sLiENCDuvk+4AyuyFneICu7Y= X-Google-Smtp-Source: AOwi7QDL4X5BTtYYl23EZipkrWJaMyc+qqAYrugsmPXmnWL9VZtr+oGYqW7Oc5FK2+f0/vpKjfbM255OF1otZ8uJxAw= X-Received: by 10.200.48.54 with SMTP id f51mr7400285qte.39.1508000782426; Sat, 14 Oct 2017 10:06:22 -0700 (PDT) MIME-Version: 1.0 References: <6647cf46d15c4047ab8a35bccb874822@git.apache.org> In-Reply-To: From: Benedikt Ritter Date: Sat, 14 Oct 2017 17:06:12 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: commons-collections git commit: MapUtilsTest: fix order of expected and actual parameter in assertions (closes #32) To: Commons Developers List Content-Type: multipart/alternative; boundary="001a11402cf2f52660055b84ca1c" archived-at: Sat, 14 Oct 2017 17:06:25 -0000 --001a11402cf2f52660055b84ca1c Content-Type: text/plain; charset="UTF-8" About time we migrate to AssertJ. :-) Gary Gregory schrieb am Sa. 14. Okt. 2017 um 18:55: > Thank you for doing that! That was driving me nuts! > > Gary > > On Oct 14, 2017 10:53, wrote: > > > Repository: commons-collections > > Updated Branches: > > refs/heads/master 641aa1c66 -> b9522976f > > > > > > MapUtilsTest: fix order of expected and actual parameter in assertions > > (closes #32) > > > > > > Project: http://git-wip-us.apache.org/repos/asf/commons-collections/repo > > Commit: http://git-wip-us.apache.org/repos/asf/commons-collections/ > > commit/b9522976 > > Tree: http://git-wip-us.apache.org/repos/asf/commons-collections/ > > tree/b9522976 > > Diff: http://git-wip-us.apache.org/repos/asf/commons-collections/ > > diff/b9522976 > > > > Branch: refs/heads/master > > Commit: b9522976f462687b0693b7229ba5c7faee0cb74b > > Parents: 641aa1c > > Author: Kavuri, Vamsi > > Authored: Sat Oct 14 12:30:35 2017 -0400 > > Committer: pascalschumacher > > Committed: Sat Oct 14 18:52:04 2017 +0200 > > > > ---------------------------------------------------------------------- > > .../commons/collections4/MapUtilsTest.java | 110 > +++++++++---------- > > 1 file changed, 55 insertions(+), 55 deletions(-) > > ---------------------------------------------------------------------- > > > > > > http://git-wip-us.apache.org/repos/asf/commons-collections/ > > blob/b9522976/src/test/java/org/apache/commons/ > > collections4/MapUtilsTest.java > > ---------------------------------------------------------------------- > > diff --git > a/src/test/java/org/apache/commons/collections4/MapUtilsTest.java > > b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java > > index fc3e3d6..21f20c4 100644 > > --- a/src/test/java/org/apache/commons/collections4/MapUtilsTest.java > > +++ b/src/test/java/org/apache/commons/collections4/MapUtilsTest.java > > @@ -950,12 +950,12 @@ public class MapUtilsTest extends > > AbstractAvailableLocalesTest { > > final Map in = new HashMap<>(); > > in.put("key", 2.0); > > > > - assertEquals(MapUtils.getDoubleValue(in,"key", 0.0), 2.0, 0); > > - assertEquals(MapUtils.getDoubleValue(in,"key"), 2.0, 0); > > - assertEquals(MapUtils.getDoubleValue(in,"noKey", 1.0), 1.0, 0); > > - assertEquals(MapUtils.getDoubleValue(in,"noKey"), 0, 0); > > - assertEquals(MapUtils.getDouble(in,"key", 0.0), 2.0, 0); > > - assertEquals(MapUtils.getDouble(in,"noKey", 1.0), 1.0, 0); > > + assertEquals(2.0, MapUtils.getDoubleValue(in,"key", 0.0), 0); > > + assertEquals(2.0, MapUtils.getDoubleValue(in,"key"), 0); > > + assertEquals(1.0, MapUtils.getDoubleValue(in,"noKey", 1.0), 0); > > + assertEquals(0, MapUtils.getDoubleValue(in,"noKey"), 0); > > + assertEquals(2.0, MapUtils.getDouble(in,"key", 0.0), 0); > > + assertEquals(1.0, MapUtils.getDouble(in,"noKey", 1.0), 0); > > > > > > final Map inStr = new HashMap<>(); > > @@ -970,12 +970,12 @@ public class MapUtilsTest extends > > AbstractAvailableLocalesTest { > > final Map in = new HashMap<>(); > > in.put("key", 2.0f); > > > > - assertEquals(MapUtils.getFloatValue(in,"key", 0.0f), 2.0, 0); > > - assertEquals(MapUtils.getFloatValue(in,"key"), 2.0, 0); > > - assertEquals(MapUtils.getFloatValue(in,"noKey", 1.0f), 1.0, 0); > > - assertEquals(MapUtils.getFloatValue(in,"noKey"), 0, 0); > > - assertEquals(MapUtils.getFloat(in,"key", 0.0f), 2.0, 0); > > - assertEquals(MapUtils.getFloat(in,"noKey", 1.0f), 1.0, 0); > > + assertEquals(2.0, MapUtils.getFloatValue(in,"key", 0.0f), 0); > > + assertEquals(2.0, MapUtils.getFloatValue(in,"key"), 0); > > + assertEquals(1.0, MapUtils.getFloatValue(in,"noKey", 1.0f), 0); > > + assertEquals(0, MapUtils.getFloatValue(in,"noKey"), 0); > > + assertEquals(2.0, MapUtils.getFloat(in,"key", 0.0f), 0); > > + assertEquals(1.0, MapUtils.getFloat(in,"noKey", 1.0f), 0); > > > > final Map inStr = new HashMap<>(); > > char decimalSeparator = getDecimalSeparator(); > > @@ -989,12 +989,12 @@ public class MapUtilsTest extends > > AbstractAvailableLocalesTest { > > final Map in = new HashMap<>(); > > in.put("key", 2L); > > > > - assertEquals(MapUtils.getLongValue(in,"key", 0L), 2.0, 0); > > - assertEquals(MapUtils.getLongValue(in,"key"), 2.0, 0); > > - assertEquals(MapUtils.getLongValue(in,"noKey", 1L), 1, 0); > > - assertEquals(MapUtils.getLongValue(in,"noKey"), 0, 0); > > - assertEquals(MapUtils.getLong(in,"key", 0L), 2.0, 0); > > - assertEquals(MapUtils.getLong(in,"noKey", 1L), 1, 0); > > + assertEquals(2.0, MapUtils.getLongValue(in,"key", 0L), 0); > > + assertEquals(2.0, MapUtils.getLongValue(in,"key"), 0); > > + assertEquals(1, MapUtils.getLongValue(in,"noKey", 1L), 0); > > + assertEquals(0, MapUtils.getLongValue(in,"noKey"), 0); > > + assertEquals(2.0, MapUtils.getLong(in,"key", 0L), 0); > > + assertEquals(1, MapUtils.getLong(in,"noKey", 1L), 0); > > > > final Map inStr = new HashMap<>(); > > inStr.put("str1", "2"); > > @@ -1009,12 +1009,12 @@ public class MapUtilsTest extends > > AbstractAvailableLocalesTest { > > final Map in = new HashMap<>(); > > in.put("key", 2); > > > > - assertEquals(MapUtils.getIntValue(in,"key", 0), 2, 0); > > - assertEquals(MapUtils.getIntValue(in,"key"), 2, 0); > > - assertEquals(MapUtils.getIntValue(in,"noKey", 0), 0, 0); > > - assertEquals(MapUtils.getIntValue(in,"noKey"), 0, 0); > > - assertEquals(MapUtils.getInteger(in,"key", 0), 2, 0); > > - assertEquals(MapUtils.getInteger(in,"noKey", 0), 0, 0); > > + assertEquals(2, MapUtils.getIntValue(in,"key", 0), 0); > > + assertEquals(2, MapUtils.getIntValue(in,"key"), 0); > > + assertEquals(0, MapUtils.getIntValue(in,"noKey", 0), 0); > > + assertEquals(0, MapUtils.getIntValue(in,"noKey"), 0); > > + assertEquals(2, MapUtils.getInteger(in,"key", 0), 0); > > + assertEquals(0, MapUtils.getInteger(in,"noKey", 0), 0); > > > > final Map inStr = new HashMap<>(); > > inStr.put("str1", "2"); > > @@ -1028,12 +1028,12 @@ public class MapUtilsTest extends > > AbstractAvailableLocalesTest { > > final short val = 10; > > in.put("key", val); > > > > - assertEquals(MapUtils.getShortValue(in,"key", val), val, 0); > > - assertEquals(MapUtils.getShortValue(in,"key"), val, 0); > > - assertEquals(MapUtils.getShortValue(in,"noKey", val), val, 0); > > - assertEquals(MapUtils.getShortValue(in,"noKey"), 0, 0); > > - assertEquals(MapUtils.getShort(in,"key", val), val, 0); > > - assertEquals(MapUtils.getShort(in,"noKey", val), val, 0); > > + assertEquals(val, MapUtils.getShortValue(in,"key", val), 0); > > + assertEquals(val, MapUtils.getShortValue(in,"key"), 0); > > + assertEquals(val, MapUtils.getShortValue(in,"noKey", val), 0); > > + assertEquals(0, MapUtils.getShortValue(in,"noKey"), 0); > > + assertEquals(val, MapUtils.getShort(in,"key", val), 0); > > + assertEquals(val,MapUtils.getShort(in,"noKey", val), 0); > > > > final Map inStr = new HashMap<>(); > > inStr.put("str1", "10"); > > @@ -1047,12 +1047,12 @@ public class MapUtilsTest extends > > AbstractAvailableLocalesTest { > > final byte val = 100; > > in.put("key", val); > > > > - assertEquals(MapUtils.getByteValue(in,"key", val), val, 0); > > - assertEquals(MapUtils.getByteValue(in,"key"), val, 0); > > - assertEquals(MapUtils.getByteValue(in,"noKey", val), val, 0); > > - assertEquals(MapUtils.getByteValue(in,"noKey"), 0, 0); > > - assertEquals(MapUtils.getByte(in,"key", val), val, 0); > > - assertEquals(MapUtils.getByte(in,"noKey", val), val, 0); > > + assertEquals(val, MapUtils.getByteValue(in,"key", val), 0); > > + assertEquals(val, MapUtils.getByteValue(in,"key"), 0); > > + assertEquals(val, MapUtils.getByteValue(in,"noKey", val), 0); > > + assertEquals(0, MapUtils.getByteValue(in,"noKey"), 0); > > + assertEquals(val, MapUtils.getByte(in,"key", val), 0); > > + assertEquals(val, MapUtils.getByte(in,"noKey", val), 0); > > > > > > final Map inStr = new HashMap<>(); > > @@ -1067,8 +1067,8 @@ public class MapUtilsTest extends > > AbstractAvailableLocalesTest { > > final Number val = 1000; > > in.put("key", val); > > > > - assertEquals(MapUtils.getNumber(in,"key", val).intValue(), > > val.intValue(), 0); > > - assertEquals(MapUtils.getNumber(in,"noKey", val).intValue(), > > val.intValue(), 0); > > + assertEquals(val.intValue(), MapUtils.getNumber(in,"key", > > val).intValue(), 0); > > + assertEquals(val.intValue(), MapUtils.getNumber(in,"noKey", > > val).intValue(), 0); > > > > } > > > > @@ -1077,11 +1077,11 @@ public class MapUtilsTest extends > > AbstractAvailableLocalesTest { > > final Map in = new HashMap<>(); > > in.put("key", "str"); > > > > - assertEquals(MapUtils.getString(in,"key", "defualt"), "str"); > > - assertEquals(MapUtils.getString(in,"key"), "str"); > > - assertEquals(MapUtils.getString(null,"key"), null); > > - assertEquals(MapUtils.getString(in,"noKey", "default"), > > "default"); > > - assertEquals(MapUtils.getString(null,"noKey", "default"), > > "default"); > > + assertEquals("str", MapUtils.getString(in,"key", "defualt")); > > + assertEquals("str", MapUtils.getString(in,"key")); > > + assertEquals(null, MapUtils.getString(null,"key")); > > + assertEquals("default", MapUtils.getString(in,"noKey", > > "default")); > > + assertEquals("default", MapUtils.getString(null,"noKey", > > "default")); > > > > } > > > > @@ -1090,11 +1090,11 @@ public class MapUtilsTest extends > > AbstractAvailableLocalesTest { > > final Map in = new HashMap<>(); > > in.put("key", "str"); > > > > - assertEquals(MapUtils.getObject(in,"key", "defualt"), "str"); > > - assertEquals(MapUtils.getObject(in,"key"), "str"); > > - assertEquals(MapUtils.getObject(null,"key"), null); > > - assertEquals(MapUtils.getObject(in,"noKey", "default"), > > "default"); > > - assertEquals(MapUtils.getObject(null,"noKey", "default"), > > "default"); > > + assertEquals("str", MapUtils.getObject(in,"key", "defualt")); > > + assertEquals("str", MapUtils.getObject(in,"key")); > > + assertEquals(null, MapUtils.getObject(null,"key")); > > + assertEquals("default", MapUtils.getObject(in,"noKey", > > "default")); > > + assertEquals("default", MapUtils.getObject(null,"noKey", > > "default")); > > > > } > > > > @@ -1109,7 +1109,7 @@ public class MapUtilsTest extends > > AbstractAvailableLocalesTest { > > assertTrue(!MapUtils.getBooleanValue(in,"noKey")); > > assertTrue(MapUtils.getBoolean(in,"key", true)); > > assertTrue(MapUtils.getBoolean(in,"noKey", true)); > > - assertEquals(MapUtils.getBoolean(null,"noKey"),null); > > + assertEquals(null, MapUtils.getBoolean(null,"noKey")); > > > > > > > > @@ -1130,10 +1130,10 @@ public class MapUtilsTest extends > > AbstractAvailableLocalesTest { > > in.put("key1", valMap); > > final Map outValue = MapUtils.getMap(in,"key1", null); > > > > - assertEquals( outValue.get("key1"), "value1"); > > - assertEquals( outValue.get("key2"), null); > > - assertEquals( MapUtils.getMap(in,"key2", null), null); > > - assertEquals( MapUtils.getMap(null,"key2", null), null); > > + assertEquals("value1", outValue.get("key1")); > > + assertEquals(null, outValue.get("key2")); > > + assertEquals(null, MapUtils.getMap(in,"key2", null)); > > + assertEquals(null, MapUtils.getMap(null,"key2", null)); > > } > > > > @Test > > @@ -1143,8 +1143,8 @@ public class MapUtilsTest extends > > AbstractAvailableLocalesTest { > > > > MapUtils.safeAddToMap(inMap,"key1", "value1"); > > MapUtils.safeAddToMap(inMap,"key2", null); > > - assertEquals( inMap.get("key1"), "value1"); > > - assertEquals( inMap.get("key2"), ""); > > + assertEquals("value1", inMap.get("key1")); > > + assertEquals("", inMap.get("key2")); > > } > > > > @Test > > > > > --001a11402cf2f52660055b84ca1c--