Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org Received: (qmail 26820 invoked from network); 13 May 2005 05:15:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 13 May 2005 05:15:32 -0000 Received: (qmail 77829 invoked by uid 500); 13 May 2005 05:19:31 -0000 Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org Received: (qmail 77738 invoked by uid 500); 13 May 2005 05:19:30 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 77716 invoked by uid 500); 13 May 2005 05:19:29 -0000 Received: (qmail 77709 invoked by uid 99); 13 May 2005 05:19:29 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 12 May 2005 22:19:29 -0700 Received: (qmail 26522 invoked by uid 65534); 13 May 2005 05:15:06 -0000 Message-ID: <20050513051506.26520.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r169945 - /jakarta/commons/proper/resources/trunk/src/test/org/apache/commons/resources/MessagesTestCase.java Date: Fri, 13 May 2005 05:15:06 -0000 To: commons-cvs@jakarta.apache.org From: jmitchell@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jmitchell Date: Thu May 12 22:15:05 2005 New Revision: 169945 URL: http://svn.apache.org/viewcvs?rev=3D169945&view=3Drev Log: adding new tests, and reports for jcoverage, with any luck I'll have Common= s Resources at 100% test coverage by the end of next month Modified: jakarta/commons/proper/resources/trunk/src/test/org/apache/commons/reso= urces/MessagesTestCase.java Modified: jakarta/commons/proper/resources/trunk/src/test/org/apache/common= s/resources/MessagesTestCase.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/resources/trunk/s= rc/test/org/apache/commons/resources/MessagesTestCase.java?rev=3D169945&r1= =3D169944&r2=3D169945&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- jakarta/commons/proper/resources/trunk/src/test/org/apache/commons/reso= urces/MessagesTestCase.java (original) +++ jakarta/commons/proper/resources/trunk/src/test/org/apache/commons/reso= urces/MessagesTestCase.java Thu May 12 22:15:05 2005 @@ -23,6 +23,8 @@ =20 package org.apache.commons.resources; =20 +import java.util.Locale; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -117,6 +119,69 @@ =20 message =3D local.getMessage("local.missing"); assertEquals("Correct missing message", "???local.missing???", message); + =09 + + Messages messages2 =3D new MyMessages(null); + Messages messages3 =3D messages2.getMessages(null); + assertNull("Invalid Messages", messages3); + + } +=09 + + + /** + * Test the ability to retrieve messages with replacements. + */ + public void testMessage() { + String message =3D null; + + message =3D messages.getMessage("test.missing"); + assertEquals("Correct missing message", "???test.missing???", message); + =09 + message =3D messages.getMessage(Locale.ENGLISH, "test.message"); + assertEquals( + "Correct individual message", + "[Base] REPLACE {0} WITH {1}", + message); + + message =3D + messages.getMessage("test.message", new String[] { "abc", "def" }); + =09 + assertEquals( + "Correct replaced message", + "[Base] REPLACE abc WITH def", + message); + + message =3D + messages.getMessage(Locale.ENGLISH, "test.message", new String[] { "abc= ", "def" }); + =09 + assertEquals( + "Correct replaced message", + "[Base] REPLACE abc WITH def", + message); + + message =3D + messages.getMessage(Locale.ENGLISH, "test.message.single", "abc"); + =09 + assertEquals( + "Correct replaced message", + "[Base] REPLACE abc", + message); + =09 + message =3D + messages.getMessage("test.message.single", "abc"); + =09 + assertEquals( + "Correct replaced message", + "[Base] REPLACE abc", + message); + =09 + Resources resources2 =3D=20 + factory.getResources(NAME + "-does-not-exist",=20 + CONFIG + "-does-not-exist"); + resources2.setReturnNull(false); + Messages messages2 =3D new Messages(resources2); + message =3D messages2.getMessage("test.message"); } =20 =20 @@ -142,6 +207,8 @@ =20 message =3D messages.getMessage("test.missing"); assertEquals("Correct missing message", "???test.missing???", message); + =09 + =09 } =20 =20 @@ -156,4 +223,33 @@ } =20 =20 + class MyMessages extends Messages{ + + public MyMessages(Resources resources) { + super(resources); + MyMessages.factory =3D new ResourcesFactory(){ + public Resources getResources(String name) + throws ResourcesException{ + throw new ResourcesException("Bad Implementation"); + } + + public boolean isReturnNull() { + return false; + } + + public void setReturnNull(boolean returnNull) {} + + public Resources getResources(String name, String config) throws Resour= cesException { + // TODO Auto-generated method stub + return null; + } + + public void release() throws ResourcesException { + // TODO Auto-generated method stub + =09 + } + }; + } + =09 + } } --------------------------------------------------------------------- To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org