Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 36478 invoked from network); 10 Oct 2008 02:13:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Oct 2008 02:13:57 -0000 Received: (qmail 80769 invoked by uid 500); 10 Oct 2008 02:13:56 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 80748 invoked by uid 500); 10 Oct 2008 02:13:56 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 80736 invoked by uid 99); 10 Oct 2008 02:13:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Oct 2008 19:13:56 -0700 X-ASF-Spam-Status: No, hits=-1999.9 required=10.0 tests=ALL_TRUSTED,DNS_FROM_SECURITYSAGE 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; Fri, 10 Oct 2008 02:13:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3DC3223888D5; Thu, 9 Oct 2008 19:13:06 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r703314 - /harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/util/UtilTest.java Date: Fri, 10 Oct 2008 02:13:06 -0000 To: commits@harmony.apache.org From: ndbeyer@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081010021306.3DC3223888D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ndbeyer Date: Thu Oct 9 19:13:05 2008 New Revision: 703314 URL: http://svn.apache.org/viewvc?rev=703314&view=rev Log: test the Util class in archive module, instead of the one in luni module Modified: harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/util/UtilTest.java Modified: harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/util/UtilTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/util/UtilTest.java?rev=703314&r1=703313&r2=703314&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/util/UtilTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/util/UtilTest.java Thu Oct 9 19:13:05 2008 @@ -20,10 +20,32 @@ import junit.framework.TestCase; public class UtilTest extends TestCase { - String s1 = "abcdefghijklmnopqrstuvwxyz"; //$NON-NLS-1$ - String s2 = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; //$NON-NLS-1$ + private static final String ASCII_ALPHABET_LC = "abcdefghijklmnopqrstuvwxyz"; + private static final String ASCII_ALPHABET_UC = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + private static final byte[] ASCII_ALPHABET_LC_BYTES; + private static final byte[] ASCII_ALPHABET_UC_BYTES; + + static { + ASCII_ALPHABET_LC_BYTES = new byte[ASCII_ALPHABET_LC.length()]; + for (int i = 0; i < ASCII_ALPHABET_LC_BYTES.length; i++) { + final char c = ASCII_ALPHABET_LC.charAt(i); + final byte b = (byte) c; + assert ((char) b) == c; + ASCII_ALPHABET_LC_BYTES[i] = b; + } + + ASCII_ALPHABET_UC_BYTES = new byte[ASCII_ALPHABET_UC.length()]; + for (int i = 0; i < ASCII_ALPHABET_UC_BYTES.length; i++) { + final char c = ASCII_ALPHABET_UC.charAt(i); + final byte b = (byte) c; + assert ((char) b) == c; + ASCII_ALPHABET_UC_BYTES[i] = b; + } + } public void testASCIIIgnoreCaseRegionMatches() { + final String s1 = ASCII_ALPHABET_LC; + final String s2 = ASCII_ALPHABET_UC; for (int i = 0; i < s1.length(); i++) { assertTrue(Util.ASCIIIgnoreCaseRegionMatches(s1, i, s2, i, s1 .length() @@ -31,44 +53,68 @@ } } + private void assertEqualsBytes(byte[] expected, byte[] actual) { + assertEquals(expected.length, actual.length); + for (int i = 0; i < expected.length; i++) { + assertEquals(expected[i], actual[i]); + } + } + public void testToASCIILowerCase() { - assertEquals( - "abcdefghijklmnopqrstuvwxyz", org.apache.harmony.luni.util.Util //$NON-NLS-1$ - .toASCIILowerCase("ABCDEFGHIJKLMNOPQRSTUVWXYZ")); //$NON-NLS-1$ - - for (int i = 0; i < 255; i++) { - if (i >= 'a' && i <= 'z') { - continue; - } - if (i >= 'A' && i <= 'Z') { - continue; - } - String cString = "" + (char) i; //$NON-NLS-1$ - assertEquals(cString, org.apache.harmony.luni.util.Util - .toASCIILowerCase(cString)); + assertEqualsBytes(ASCII_ALPHABET_LC_BYTES, Util + .toASCIILowerCase(ASCII_ALPHABET_UC_BYTES)); + assertEqualsBytes(ASCII_ALPHABET_LC_BYTES, Util + .toASCIILowerCase(ASCII_ALPHABET_LC_BYTES)); + } + + public void testToASCIIUpperCaseByte() { + for (int i = 0; i < ASCII_ALPHABET_LC_BYTES.length; i++) { + assertEquals(ASCII_ALPHABET_UC_BYTES[i], Util + .toASCIIUpperCase(ASCII_ALPHABET_LC_BYTES[i])); + } + for (int i = 0; i < ASCII_ALPHABET_UC_BYTES.length; i++) { + assertEquals(ASCII_ALPHABET_UC_BYTES[i], Util + .toASCIIUpperCase(ASCII_ALPHABET_UC_BYTES[i])); + } + } + + public void testToASCIILowerCaseChar() { + for (int i = 0; i < ASCII_ALPHABET_UC.length(); i++) { + assertEquals(ASCII_ALPHABET_LC.charAt(i), Util + .toASCIILowerCase(ASCII_ALPHABET_UC.charAt(i))); + } + for (int i = 0; i < ASCII_ALPHABET_LC.length(); i++) { + assertEquals(ASCII_ALPHABET_LC.charAt(i), Util + .toASCIILowerCase(ASCII_ALPHABET_LC.charAt(i))); } } - public void testToASCIIUpperCase() { - assertEquals( - "ABCDEFGHIJKLMNOPQRSTUVWXYZ", org.apache.harmony.luni.util.Util //$NON-NLS-1$ - .toASCIIUpperCase("abcdefghijklmnopqrstuvwxyz")); //$NON-NLS-1$ - - for (int i = 0; i < 255; i++) { - if (i >= 'a' && i <= 'z') { - continue; - } - if (i >= 'A' && i <= 'Z') { - continue; - } - String cString = "" + (char) i; //$NON-NLS-1$ - assertEquals(cString, org.apache.harmony.luni.util.Util - .toASCIIUpperCase(cString)); + public void testToASCIIUpperCaseChar() { + for (int i = 0; i < ASCII_ALPHABET_LC.length(); i++) { + assertEquals(ASCII_ALPHABET_UC.charAt(i), Util + .toASCIIUpperCase(ASCII_ALPHABET_LC.charAt(i))); + } + for (int i = 0; i < ASCII_ALPHABET_UC.length(); i++) { + assertEquals(ASCII_ALPHABET_UC.charAt(i), Util + .toASCIIUpperCase(ASCII_ALPHABET_UC.charAt(i))); } } - public void testEqualsIgnoreCase() { + public void testEqualsIgnoreCaseStringString() { + final String s1 = ASCII_ALPHABET_LC; + final String s2 = ASCII_ALPHABET_UC; + assertTrue(Util.equalsIgnoreCase(s1, s1)); assertTrue(Util.equalsIgnoreCase(s1, s2)); + assertTrue(Util.equalsIgnoreCase(s2, s2)); + } + + public void testEqualsIgnoreCaseByteArrayByteArray() { + assertTrue(Util.equalsIgnoreCase(ASCII_ALPHABET_LC_BYTES, + ASCII_ALPHABET_LC_BYTES)); + assertTrue(Util.equalsIgnoreCase(ASCII_ALPHABET_LC_BYTES, + ASCII_ALPHABET_UC_BYTES)); + assertTrue(Util.equalsIgnoreCase(ASCII_ALPHABET_UC_BYTES, + ASCII_ALPHABET_UC_BYTES)); } }