Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 546DD9CC9 for ; Tue, 28 Feb 2012 22:24:37 +0000 (UTC) Received: (qmail 71579 invoked by uid 500); 28 Feb 2012 22:24:37 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 71528 invoked by uid 500); 28 Feb 2012 22:24:37 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 71520 invoked by uid 99); 28 Feb 2012 22:24:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Feb 2012 22:24:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Feb 2012 22:24:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8252123889E2; Tue, 28 Feb 2012 22:24:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1294859 - in /cxf/branches/2.5.x-fixes: ./ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java Date: Tue, 28 Feb 2012 22:24:13 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120228222413.8252123889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Tue Feb 28 22:24:13 2012 New Revision: 1294859 URL: http://svn.apache.org/viewvc?rev=1294859&view=rev Log: Merged revisions 1294854 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1294854 | dkulp | 2012-02-28 17:20:03 -0500 (Tue, 28 Feb 2012) | 1 line Use Byte.TYPE instead of byte.class to not confuse various parsers ........ Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java?rev=1294859&r1=1294858&r2=1294859&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java (original) +++ cxf/branches/2.5.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/PrimitiveTextProviderTest.java Tue Feb 28 22:24:13 2012 @@ -39,18 +39,18 @@ public class PrimitiveTextProviderTest e @Test public void testIsWriteable() { MessageBodyWriter p = new PrimitiveTextProvider(); - assertTrue(p.isWriteable(byte.class, null, null, null) + assertTrue(p.isWriteable(Byte.TYPE, null, null, null) && p.isWriteable(Byte.class, null, null, null) - && p.isWriteable(boolean.class, null, null, null) + && p.isWriteable(Boolean.TYPE, null, null, null) && p.isWriteable(Boolean.class, null, null, null)); } @Test public void testIsReadable() { MessageBodyReader p = new PrimitiveTextProvider(); - assertTrue(p.isReadable(byte.class, null, null, null) + assertTrue(p.isReadable(Byte.TYPE, null, null, null) && p.isReadable(Byte.class, null, null, null) - && p.isReadable(boolean.class, null, null, null) + && p.isReadable(Boolean.TYPE, null, null, null) && p.isReadable(Boolean.class, null, null, null)); } @@ -59,7 +59,7 @@ public class PrimitiveTextProviderTest e public void testReadByte() throws Exception { MessageBodyReader p = new PrimitiveTextProvider(); - Byte valueRead = (Byte)p.readFrom(byte.class, + Byte valueRead = (Byte)p.readFrom((Class)Byte.TYPE, null, null, null, @@ -74,7 +74,7 @@ public class PrimitiveTextProviderTest e public void testReadBoolean() throws Exception { MessageBodyReader p = new PrimitiveTextProvider(); - boolean valueRead = (Boolean)p.readFrom(boolean.class, + boolean valueRead = (Boolean)p.readFrom(Boolean.TYPE, null, null, null,