Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 77658 invoked from network); 25 Oct 2009 11:09:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 25 Oct 2009 11:09:20 -0000 Received: (qmail 77635 invoked by uid 500); 25 Oct 2009 11:09:20 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 77543 invoked by uid 500); 25 Oct 2009 11:09:19 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 77534 invoked by uid 99); 25 Oct 2009 11:09:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 25 Oct 2009 11:09:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sun, 25 Oct 2009 11:09:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 28778238898D; Sun, 25 Oct 2009 11:08:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r829537 - in /commons/proper/lang/trunk/src/test/org/apache/commons/lang/text: StrLookupTest.java StrSubstitutorTest.java StrTokenizerTest.java Date: Sun, 25 Oct 2009 11:08:56 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091025110856.28778238898D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Sun Oct 25 11:08:55 2009 New Revision: 829537 URL: http://svn.apache.org/viewvc?rev=829537&view=rev Log: Fix some raw types Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/StrLookupTest.java commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/StrSubstitutorTest.java commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/StrTokenizerTest.java Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/StrLookupTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/StrLookupTest.java?rev=829537&r1=829536&r2=829537&view=diff ============================================================================== --- commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/StrLookupTest.java (original) +++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/StrLookupTest.java Sun Oct 25 11:08:55 2009 @@ -82,7 +82,7 @@ } public void testMapLookup() { - Map map = new HashMap(); + Map map = new HashMap(); map.put("key", "value"); map.put("number", new Integer(2)); assertEquals("value", StrLookup.mapLookup(map).lookup("key")); @@ -93,7 +93,7 @@ } public void testMapLookup_nullMap() { - Map map = null; + Map map = null; assertEquals(null, StrLookup.mapLookup(map).lookup(null)); assertEquals(null, StrLookup.mapLookup(map).lookup("")); assertEquals(null, StrLookup.mapLookup(map).lookup("any")); Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/StrSubstitutorTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/StrSubstitutorTest.java?rev=829537&r1=829536&r2=829537&view=diff ============================================================================== --- commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/StrSubstitutorTest.java (original) +++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/StrSubstitutorTest.java Sun Oct 25 11:08:55 2009 @@ -35,7 +35,7 @@ */ public class StrSubstitutorTest extends TestCase { - private Map values; + private Map values; /** * Main method. @@ -60,7 +60,7 @@ @Override protected void setUp() throws Exception { super.setUp(); - values = new HashMap(); + values = new HashMap(); values.put("animal", "quick brown fox"); values.put("target", "lazy dog"); } @@ -228,7 +228,7 @@ * The cycle should be detected and cause an exception to be thrown. */ public void testCyclicReplacement() { - Map map = new HashMap(); + Map map = new HashMap(); map.put("animal", "${critter}"); map.put("target", "${pet}"); map.put("pet", "${petCharacteristic} dog"); @@ -283,7 +283,7 @@ */ public void testResolveVariable() { final StrBuilder builder = new StrBuilder("Hi ${name}!"); - Map map = new HashMap(); + Map map = new HashMap(); map.put("name", "commons"); StrSubstitutor sub = new StrSubstitutor(map) { @Override @@ -312,7 +312,7 @@ * Tests constructor. */ public void testConstructorMapPrefixSuffix() { - Map map = new HashMap(); + Map map = new HashMap(); map.put("name", "commons"); StrSubstitutor sub = new StrSubstitutor(map, "<", ">"); assertEquals("Hi < commons", sub.replace("Hi $< ")); @@ -322,7 +322,7 @@ * Tests constructor. */ public void testConstructorMapFull() { - Map map = new HashMap(); + Map map = new HashMap(); map.put("name", "commons"); StrSubstitutor sub = new StrSubstitutor(map, "<", ">", '!'); assertEquals("Hi < commons", sub.replace("Hi !< ")); @@ -406,7 +406,7 @@ * Tests static. */ public void testStaticReplace() { - Map map = new HashMap(); + Map map = new HashMap(); map.put("name", "commons"); assertEquals("Hi commons!", StrSubstitutor.replace("Hi ${name}!", map)); } @@ -415,7 +415,7 @@ * Tests static. */ public void testStaticReplacePrefixSuffix() { - Map map = new HashMap(); + Map map = new HashMap(); map.put("name", "commons"); assertEquals("Hi commons!", StrSubstitutor.replace("Hi !", map, "<", ">")); } @@ -468,7 +468,7 @@ } // replace using object - MutableObject obj = new MutableObject(replaceTemplate); // toString returns template + MutableObject obj = new MutableObject(replaceTemplate); // toString returns template assertEquals(expectedResult, sub.replace(obj)); // replace in StringBuffer Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/StrTokenizerTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/StrTokenizerTest.java?rev=829537&r1=829536&r2=829537&view=diff ============================================================================== --- commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/StrTokenizerTest.java (original) +++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/StrTokenizerTest.java Sun Oct 25 11:08:55 2009 @@ -491,7 +491,7 @@ String input = "a b c"; StrTokenizer tok = new StrTokenizer(input); String[] array = tok.getTokenArray(); - List list = tok.getTokenList(); + List list = tok.getTokenList(); assertEquals(Arrays.asList(array), list); assertEquals(3, list.size()); @@ -813,7 +813,7 @@ public void testTokenizeSubclassInputChange() { StrTokenizer tkn = new StrTokenizer("a b c d e") { @Override - protected List tokenize(char[] chars, int offset, int count) { + protected List tokenize(char[] chars, int offset, int count) { return super.tokenize("w x y z".toCharArray(), 2, 5); } }; @@ -825,8 +825,8 @@ public void testTokenizeSubclassOutputChange() { StrTokenizer tkn = new StrTokenizer("a b c") { @Override - protected List tokenize(char[] chars, int offset, int count) { - List list = super.tokenize(chars, offset, count); + protected List tokenize(char[] chars, int offset, int count) { + List list = super.tokenize(chars, offset, count); Collections.reverse(list); return list; }