Return-Path: X-Original-To: apmail-zest-commits-archive@minotaur.apache.org Delivered-To: apmail-zest-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8D2C417D8B for ; Fri, 17 Apr 2015 16:05:22 +0000 (UTC) Received: (qmail 32163 invoked by uid 500); 17 Apr 2015 16:05:22 -0000 Delivered-To: apmail-zest-commits-archive@zest.apache.org Received: (qmail 32090 invoked by uid 500); 17 Apr 2015 16:05:22 -0000 Mailing-List: contact commits-help@zest.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zest.apache.org Delivered-To: mailing list commits@zest.apache.org Received: (qmail 31686 invoked by uid 99); 17 Apr 2015 16:05:22 -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; Fri, 17 Apr 2015 16:05:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 20FBADFE2C; Fri, 17 Apr 2015 16:05:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: niclas@apache.org To: commits@zest.apache.org Date: Fri, 17 Apr 2015 16:05:43 -0000 Message-Id: <2bbee09b3eb24a1cb6a39c71f69e3fb9@git.apache.org> In-Reply-To: <7ba7b5c06d714c99b0db0e728d48e7c3@git.apache.org> References: <7ba7b5c06d714c99b0db0e728d48e7c3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [23/50] [abbrv] zest-qi4j git commit: REST Library: fixed tests on IBM JDK REST Library: fixed tests on IBM JDK Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/7dc317b3 Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/7dc317b3 Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/7dc317b3 Branch: refs/heads/master Commit: 7dc317b37f7720e0d77500b3db039d678c6eb1b5 Parents: 2d5b02b Author: Paul Merlin Authored: Wed Feb 13 16:58:35 2013 +0100 Committer: Paul Merlin Committed: Wed Feb 13 16:58:35 2013 +0100 ---------------------------------------------------------------------- .../test/java/org/qi4j/library/rest/admin/RestTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/7dc317b3/libraries/rest/src/test/java/org/qi4j/library/rest/admin/RestTest.java ---------------------------------------------------------------------- diff --git a/libraries/rest/src/test/java/org/qi4j/library/rest/admin/RestTest.java b/libraries/rest/src/test/java/org/qi4j/library/rest/admin/RestTest.java index f797490..b85c22c 100644 --- a/libraries/rest/src/test/java/org/qi4j/library/rest/admin/RestTest.java +++ b/libraries/rest/src/test/java/org/qi4j/library/rest/admin/RestTest.java @@ -51,7 +51,6 @@ import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.*; -//@Ignore( "Need to rebuild tests after larger changes to implementation." ) public class RestTest extends AbstractQi4jTest { @@ -119,11 +118,14 @@ public class RestTest public void givenAnIdentityWhenExecutingGetCommandThenExpectTheCorrectRdf() throws Exception { - //Thread.sleep( Long.MAX_VALUE ); RestTester restTester = module.newObject( RestTester.class ); String rdf = restTester.getEntity( "P1" ); - //System.out.println( "#############\n" + rdf.replaceAll( "\n", "\\\\n" ).replaceAll( "\"", "\\\\\"" ) ); - assertEquals( "Incorrect RDF produced", "\n\n\n Joe\n Doe\n P1\n \n\n\n", rdf ); + // System.out.println( rdf.replaceAll( "\n", "\\\\n" ).replaceAll( "\"", "\\\\\"" ) ); + assertThat( "Incorrect RDF produced", rdf, anyOf( + // Sun/Oracle/Open JDK + equalTo( "\n\n\n Joe\n Doe\n P1\n \n\n\n" ), + // IBM JDK + equalTo( "\n\n\n P1\n Doe\n Joe\n \n\n\n" ) ) ); } @Test