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 D1913200CF1 for ; Mon, 28 Aug 2017 12:47:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CFD9B164424; Mon, 28 Aug 2017 10:47:04 +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 24696164425 for ; Mon, 28 Aug 2017 12:47:03 +0200 (CEST) Received: (qmail 79764 invoked by uid 500); 28 Aug 2017 10:47:03 -0000 Mailing-List: contact commits-help@groovy.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@groovy.apache.org Delivered-To: mailing list commits@groovy.apache.org Received: (qmail 79754 invoked by uid 99); 28 Aug 2017 10:47:03 -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; Mon, 28 Aug 2017 10:47:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 28B1AF32DC; Mon, 28 Aug 2017 10:47:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulk@apache.org To: commits@groovy.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: groovy git commit: GROOVY-7569: Use verbose formatting for PowerAsserts (closes #374) Date: Mon, 28 Aug 2017 10:47:03 +0000 (UTC) archived-at: Mon, 28 Aug 2017 10:47:05 -0000 Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X 6543c626f -> 8551ab4c8 GROOVY-7569: Use verbose formatting for PowerAsserts (closes #374) Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/8551ab4c Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/8551ab4c Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/8551ab4c Branch: refs/heads/GROOVY_2_6_X Commit: 8551ab4c8c30551b990190c2a437c51c3a81999e Parents: 6543c62 Author: Thibault Kruse Authored: Fri Jul 29 08:22:39 2016 +0200 Committer: paulk Committed: Mon Aug 28 20:46:10 2017 +1000 ---------------------------------------------------------------------- .../groovy/runtime/powerassert/AssertionRenderer.java | 3 ++- .../runtime/powerassert/AssertionRenderingTest.groovy | 8 ++++---- .../groovy/runtime/powerassert/ValueRenderingTest.groovy | 11 ++++------- 3 files changed, 10 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/8551ab4c/src/main/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java ---------------------------------------------------------------------- diff --git a/src/main/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java b/src/main/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java index 8fa14cc..7a37e08 100644 --- a/src/main/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java +++ b/src/main/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java @@ -21,6 +21,7 @@ package org.codehaus.groovy.runtime.powerassert; import java.util.*; import org.codehaus.groovy.runtime.DefaultGroovyMethods; +import org.codehaus.groovy.runtime.InvokerHelper; /** * Creates a string representation of an assertion and its recorded values. @@ -151,7 +152,7 @@ public final class AssertionRenderer { String toString; try { - toString = DefaultGroovyMethods.toString(value); + toString = InvokerHelper.format(value, true, -1, false); } catch (Exception e) { return String.format("%s (toString() threw %s)", javaLangObjectToString(value), e.getClass().getName()); http://git-wip-us.apache.org/repos/asf/groovy/blob/8551ab4c/src/test/org/codehaus/groovy/runtime/powerassert/AssertionRenderingTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/runtime/powerassert/AssertionRenderingTest.groovy b/src/test/org/codehaus/groovy/runtime/powerassert/AssertionRenderingTest.groovy index b812605..3e7e0e6 100644 --- a/src/test/org/codehaus/groovy/runtime/powerassert/AssertionRenderingTest.groovy +++ b/src/test/org/codehaus/groovy/runtime/powerassert/AssertionRenderingTest.groovy @@ -88,7 +88,7 @@ assert a.get(b) == null isRendered """ assert [1]."\$x"(0) == null | | | - 1 get false + 1 'get' false """, { def x = "get" assert [1]."$x"(0) == null @@ -378,7 +378,7 @@ assert holder.@x assert a.&"\$b" == null | | | [] | false - get + 'get' """, { def a = [] def b = "get" @@ -469,7 +469,7 @@ assert [1, *a] == null isRendered """ assert one(*:m) | | - 0 [a:1, b:2] + 0 ['a':1, 'b':2] """, { def m = [a:1, b:2] assert one(*:m) @@ -479,7 +479,7 @@ assert one(*:m) assert [a:1, *:m] == null | | | false - [b:2, c:3] + ['b':2, 'c':3] """, { def m = [b:2, c:3] assert [a:1, *:m] == null http://git-wip-us.apache.org/repos/asf/groovy/blob/8551ab4c/src/test/org/codehaus/groovy/runtime/powerassert/ValueRenderingTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/runtime/powerassert/ValueRenderingTest.groovy b/src/test/org/codehaus/groovy/runtime/powerassert/ValueRenderingTest.groovy index 4ac582b..d44958b 100644 --- a/src/test/org/codehaus/groovy/runtime/powerassert/ValueRenderingTest.groovy +++ b/src/test/org/codehaus/groovy/runtime/powerassert/ValueRenderingTest.groovy @@ -54,7 +54,7 @@ assert x == null assert x == null | | | false - foo + 'foo' """, { def x = "foo" assert x == null @@ -65,10 +65,7 @@ assert x == null isRendered """ assert null == x | | - | one - | two - | three - | four + | 'one\\ntwo\\rthree\\r\\nfour' false """, { def x = "one\ntwo\rthree\r\nfour" @@ -93,7 +90,7 @@ assert x == null assert x == null | | | false - [one, two] + ['one', 'two'] """, { def x = ["one", "two"] as String[] assert x == null @@ -107,7 +104,7 @@ assert x == null assert x == null | | | false - "" + '' ''', { assert x == null }