You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ra...@apache.org on 2008/12/24 04:57:07 UTC
svn commit: r729212 -
/commons/proper/digester/trunk/src/test/org/apache/commons/digester/
Author: rahul
Date: Tue Dec 23 19:57:06 2008
New Revision: 729212
URL: http://svn.apache.org/viewvc?rev=729212&view=rev
Log:
Address various compiler warnings and use JDK 1.5 features in tests (org.apache.commons.digester test package).
Modified:
commons/proper/digester/trunk/src/test/org/apache/commons/digester/BeanPropertySetterRuleTestCase.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/Box.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/CallMethodRuleTestCase.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/DigesterTestCase.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/EBRTestCase.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/Employee.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/LocationTrackerTestCase.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/NamespaceSnapshotTestCase.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/NamespacedBox.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/NodeCreateRuleTestCase.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/ObjectParamRuleTestCase.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/RegexRulesTestCase.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/RuleTestCase.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/RulesBaseTestCase.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/TestFactoryCreate.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/TestRule.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/WDRulesWrapperTestCase.java
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/BeanPropertySetterRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/BeanPropertySetterRuleTestCase.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/BeanPropertySetterRuleTestCase.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/BeanPropertySetterRuleTestCase.java Tue Dec 23 19:57:06 2008
@@ -121,7 +121,7 @@
*/
public void testDigesterRuleCallOrder() throws SAXException, IOException {
- List callOrder = new ArrayList();
+ List<Rule> callOrder = new ArrayList<Rule>();
// use the standard rules
digester.setRules(new RulesBase());
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/Box.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/Box.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/Box.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/Box.java Tue Dec 23 19:57:06 2008
@@ -17,9 +17,8 @@
package org.apache.commons.digester;
-import java.util.List;
import java.util.LinkedList;
-import java.util.Iterator;
+import java.util.List;
/**
* Simple class for use in unit tests. A box has an ID, and can have
@@ -28,7 +27,7 @@
public class Box {
private String id;
- private List children = new LinkedList();
+ private List<Box> children = new LinkedList<Box>();
public Box() {}
@@ -44,7 +43,7 @@
this.children.add(child);
}
- public List getChildren() {
+ public List<Box> getChildren() {
return children;
}
@@ -56,8 +55,7 @@
buf.append(" nchildren=");
buf.append(children.size());
- for(Iterator i = children.iterator(); i.hasNext(); ) {
- Box child = (Box) i.next();
+ for(Box child : children) {
buf.append(" ");
buf.append(child.toString());
}
@@ -72,8 +70,7 @@
public String getIds() {
StringBuffer buf = new StringBuffer();
buf.append(this.id);
- for(Iterator i = children.iterator(); i.hasNext(); ) {
- Box child = (Box) i.next();
+ for(Box child : children) {
buf.append(" ");
buf.append(child.getIds());
}
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/CallMethodRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/CallMethodRuleTestCase.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/CallMethodRuleTestCase.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/CallMethodRuleTestCase.java Tue Dec 23 19:57:06 2008
@@ -25,7 +25,7 @@
import java.io.StringReader;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Map;
+import java.util.Set;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -244,14 +244,14 @@
digester.addSetProperties("map/value");
digester.addCallParam("map/value", 1, true);
- Map map = (Map) digester.parse(new StringReader(xml.toString()));
+ HashMap<AlphaBean, BetaBean> map = (HashMap<AlphaBean, BetaBean>) digester.parse(new StringReader(xml.toString()));
assertNotNull(map);
assertEquals(1, map.size());
assertEquals("The key",
- ((AlphaBean)map.keySet().iterator().next()).getName());
+ map.keySet().iterator().next().getName());
assertEquals("The value",
- ((BetaBean)map.values().iterator().next()).getName());
+ map.values().iterator().next().getName());
}
@@ -344,38 +344,38 @@
digester.addObjectCreate("root/bean", PrimitiveBean.class);
digester.addSetNext("root/bean", "add");
- Class [] params = { Boolean.TYPE };
+ Class<?> [] params = { Boolean.TYPE };
digester.addCallMethod("root/bean", "setBoolean", 1, params);
digester.addCallParam("root/bean", 0, "good");
digester.addObjectCreate("root/beanie", PrimitiveBean.class);
digester.addSetNext("root/beanie", "add");
- Class [] beanieParams = { String.class, Boolean.TYPE };
+ Class<?> [] beanieParams = { String.class, Boolean.TYPE };
digester.addCallMethod("root/beanie", "testSetBoolean", 2, beanieParams);
digester.addCallParam("root/beanie", 0, "bad");
digester.addCallParam("root/beanie", 1, "good");
- ArrayList list = new ArrayList();
+ ArrayList<PrimitiveBean> list = new ArrayList<PrimitiveBean>();
digester.push(list);
digester.parse(reader);
assertEquals("Wrong number of beans in list", 6, list.size());
- PrimitiveBean bean = (PrimitiveBean) list.get(0);
+ PrimitiveBean bean = list.get(0);
assertTrue("Bean 0 property not called", bean.getSetBooleanCalled());
assertEquals("Bean 0 property incorrect", true, bean.getBoolean());
- bean = (PrimitiveBean) list.get(1);
+ bean = list.get(1);
assertTrue("Bean 1 property not called", bean.getSetBooleanCalled());
assertEquals("Bean 1 property incorrect", false, bean.getBoolean());
- bean = (PrimitiveBean) list.get(2);
+ bean = list.get(2);
// no attibute, no call is what's expected
assertTrue("Bean 2 property called", !bean.getSetBooleanCalled());
- bean = (PrimitiveBean) list.get(3);
+ bean = list.get(3);
assertTrue("Bean 3 property not called", bean.getSetBooleanCalled());
assertEquals("Bean 3 property incorrect", true, bean.getBoolean());
- bean = (PrimitiveBean) list.get(4);
+ bean = list.get(4);
assertTrue("Bean 4 property not called", bean.getSetBooleanCalled());
assertEquals("Bean 4 property incorrect", false, bean.getBoolean());
- bean = (PrimitiveBean) list.get(5);
+ bean = list.get(5);
assertTrue("Bean 5 property not called", bean.getSetBooleanCalled());
assertEquals("Bean 5 property incorrect", false, bean.getBoolean());
}
@@ -387,7 +387,7 @@
Digester digester = new Digester();
- Class [] params = { String.class };
+ Class<?> [] params = { String.class };
digester.addObjectCreate("root/one", NamedBean.class);
digester.addSetNext("root/one", "add");
@@ -411,7 +411,7 @@
digester.addObjectCreate("root/five", NamedBean.class);
digester.addSetNext("root/five", "add");
- Class [] newParams = { String.class, String.class };
+ Class<?> [] newParams = { String.class, String.class };
digester.addCallMethod("root/five", "test", 2, newParams);
digester.addCallParam("root/five", 0, 10);
digester.addCallParam("root/five", 1, 3);
@@ -422,20 +422,20 @@
digester.push("It's fleece was white as snow.");
digester.push("Mary had a little lamb,");
- ArrayList list = new ArrayList();
+ ArrayList<NamedBean> list = new ArrayList<NamedBean>();
digester.push(list);
digester.parse(reader);
assertEquals("Wrong number of beans in list", 5, list.size());
- NamedBean bean = (NamedBean) list.get(0);
+ NamedBean bean = list.get(0);
assertEquals("Parameter not set from stack (1)", "Mary had a little lamb,", bean.getName());
- bean = (NamedBean) list.get(1);
+ bean = list.get(1);
assertEquals("Parameter not set from stack (2)", "It's fleece was white as snow.", bean.getName());
- bean = (NamedBean) list.get(2);
+ bean = list.get(2);
assertEquals("Parameter not set from stack (3)", "And everywhere that Mary went,", bean.getName());
- bean = (NamedBean) list.get(3);
+ bean = list.get(3);
assertEquals("Parameter not set from stack (4)", "That lamb was sure to go.", bean.getName());
- bean = (NamedBean) list.get(4);
+ bean = list.get(4);
assertEquals("Out of stack not set to null", null , bean.getName());
}
@@ -461,20 +461,20 @@
digester.addCallMethod( "root/param", "setCool", 1, new Class[] {boolean.class } );
digester.addCallParam( "root/param", 0, "coolness" );
- ArrayList list = new ArrayList();
+ ArrayList<ParamBean> list = new ArrayList<ParamBean>();
digester.push(list);
digester.parse(reader);
assertEquals("Wrong number of objects created", 3, list.size());
- ParamBean bean = (ParamBean) list.get(0);
+ ParamBean bean = list.get(0);
assertEquals("Coolness wrong (1)", true, bean.isCool());
assertEquals("This wrong (1)", "int", bean.getThis());
assertEquals("That wrong (1)", "25", bean.getThat());
- bean = (ParamBean) list.get(1);
+ bean = list.get(1);
assertEquals("Coolness wrong (2)", false, bean.isCool());
assertEquals("This wrong (2)", "long", bean.getThis());
assertEquals("That wrong (2)", "50", bean.getThat());
- bean = (ParamBean) list.get(2);
+ bean = list.get(2);
assertEquals("Coolness wrong (3)", false, bean.isCool());
assertEquals("This wrong (3)", "float", bean.getThis());
assertEquals("That wrong (3)", "90", bean.getThat());
@@ -516,20 +516,20 @@
digester.addCallMethod( "root/spam/spam/spam/spam", "setName", 1 );
digester.addCallParam( "root/spam/spam/spam/spam", 0);
- ArrayList list = new ArrayList();
+ ArrayList<NamedBean> list = new ArrayList<NamedBean>();
digester.push(list);
digester.parse(reader);
- NamedBean bean = (NamedBean) list.get(0);
+ NamedBean bean = list.get(0);
assertEquals("Wrong name (1)", "Simple", bean.getName());
// these are added in deepest first order by the addRootRule
- bean = (NamedBean) list.get(4);
+ bean = list.get(4);
assertEquals("Wrong name (2)", "Complex", bean.getName());
- bean = (NamedBean) list.get(3);
+ bean = list.get(3);
assertEquals("Wrong name (3)", "Deep", bean.getName());
- bean = (NamedBean) list.get(2);
+ bean = list.get(2);
assertEquals("Wrong name (4)", "Deeper", bean.getName());
- bean = (NamedBean) list.get(1);
+ bean = list.get(1);
assertEquals("Wrong name (5)", "Deepest", bean.getName());
}
@@ -563,7 +563,7 @@
digester.addCallParam( "root/param", 0, "class" );
digester.addCallParam( "root/param", 1, "coolness" );
- ArrayList list = new ArrayList();
+ ArrayList<ParamBean> list = new ArrayList<ParamBean>();
digester.push(list);
digester.parse(reader);
@@ -636,10 +636,10 @@
digester.addCallParam("employee/address/type", 0);
digester.addCallParam("employee/address", 1, 0);
- HashMap map = (HashMap) digester.parse(getInputStream("Test5.xml"));
+ HashMap<String, Address> map = (HashMap<String, Address>) digester.parse(getInputStream("Test5.xml"));
assertNotNull(map);
- java.util.Set keys = map.keySet();
+ Set<String> keys = map.keySet();
assertEquals(2, keys.size());
Address home = (Address) map.get("home");
assertNotNull(home);
@@ -665,10 +665,10 @@
digester.addCallParam("employee/address/type", 0);
digester.addCallParam("employee/address", 1, 0);
- HashMap map = (HashMap) digester.parse(getInputStream("Test5.xml"));
+ HashMap<String, Address> map = (HashMap<String, Address>) digester.parse(getInputStream("Test5.xml"));
assertNotNull(map);
- java.util.Set keys = map.keySet();
+ Set<String> keys = map.keySet();
assertEquals(2, keys.size());
Address home = (Address) map.get("home");
assertNotNull(home);
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/DigesterTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/DigesterTestCase.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/DigesterTestCase.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/DigesterTestCase.java Tue Dec 23 19:57:06 2008
@@ -27,7 +27,6 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.EmptyStackException;
-import java.util.Iterator;
import java.util.Map;
import junit.framework.Test;
@@ -238,7 +237,7 @@
*/
public void testRegistrations() {
- Map map = digester.getRegistrations();
+ Map<String, URL> map = digester.getRegistrations();
assertEquals("Initially zero registrations", 0, map.size());
int n = 0;
for (int i = 0; i < registrations.length; i += 2) {
@@ -254,9 +253,7 @@
int count[] = new int[n];
for (int i = 0; i < n; i++)
count[i] = 0;
- Iterator keys = map.keySet().iterator();
- while (keys.hasNext()) {
- String key = (String) keys.next();
+ for (String key : map.keySet()) {
for (int i = 0; i < n; i++) {
if (key.equals(registrations[i * 2])) {
count[i]++;
@@ -573,7 +570,7 @@
/** Utility class for method testStackAction */
private static class TrackingStackAction implements StackAction {
- public ArrayList events = new ArrayList();
+ public ArrayList<String> events = new ArrayList<String>();
public Object onPush(Digester d, String stackName, Object o) {
String msg = "push:" + stackName + ":" + o.toString();
events.add(msg);
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/EBRTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/EBRTestCase.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/EBRTestCase.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/EBRTestCase.java Tue Dec 23 19:57:06 2008
@@ -97,8 +97,8 @@
digester.addRule("*/beta/gamma/?", new TestRule("wild_parent"));
- List list = null;
- Iterator it = null;
+ List<Rule> list = null;
+ Iterator<Rule> it = null;
// this should match just the exact since this has presidence
list = digester.getRules().match(null, "alpha/beta/gamma/delta");
@@ -171,8 +171,8 @@
digester.addRule("!*/epsilon/beta/gamma/?", new TestRule("universal_wildhead_child"));
- List list = null;
- Iterator it = null;
+ List<Rule> list = null;
+ Iterator<Rule> it = null;
// test universal wild head
list = digester.getRules().match(null, "alpha/beta/gamma");
@@ -250,8 +250,8 @@
digester.addRule("*/beta/gamma/?", new TestRule("wild_parent"));
- List list = null;
- Iterator it = null;
+ List<Rule> list = null;
+ Iterator<Rule> it = null;
// The universal wild will always match whatever else does
list = digester.getRules().match(null, "alpha/beta/gamma/delta");
@@ -311,7 +311,7 @@
digester.addRule("*/a", new TestRule("a_tail"));
- List list = null;
+ List<Rule> list = null;
list = digester.getRules().match(null, "a");
@@ -350,8 +350,7 @@
digester.addRule("a/b/c", new TestRule("a-b-c"));
digester.addRule("a/b/?", new TestRule("a-b-child"));
- List
- list = digester.getRules().match(null, "a/b/c");
+ List<Rule> list = digester.getRules().match(null, "a/b/c");
assertEquals("Simple ancester matches (1)", 2, list.size());
assertEquals("Univeral ancester mismatch (1)", "uni-a-b-star" , ((TestRule) list.get(0)).getIdentifier());
@@ -408,7 +407,7 @@
digester.addRule("a/b/c/d/*", new TestRule("a-b-c-d-star"));
- List list = digester.getRules().match(null, "a/b/c/d/e");
+ List<Rule> list = digester.getRules().match(null, "a/b/c/d/e");
assertEquals("Long match (1)", 1, list.size());
assertEquals("Match missed (1)", "a-b-c-d-star" , ((TestRule) list.get(0)).getIdentifier());
@@ -430,7 +429,7 @@
digester.addRule("!instructors/*", new TestRule("instructors"));
digester.addRule("!instructor/*", new TestRule("instructor"));
- List list = digester.getRules().match(null, "instructors");
+ List<Rule> list = digester.getRules().match(null, "instructors");
assertEquals("Only expect to match instructors", 1, list.size());
assertEquals("Instructors expected", "instructors" , ((TestRule) list.get(0)).getIdentifier());
@@ -441,7 +440,7 @@
digester.addRule("!instructors/*", new TestRule("instructors"));
- List list = digester.getRules().match(null, "/tosh/instructors/fiddlesticks");
+ List<Rule> list = digester.getRules().match(null, "/tosh/instructors/fiddlesticks");
assertEquals("No matches expected", 0, list.size());
}
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/Employee.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/Employee.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/Employee.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/Employee.java Tue Dec 23 19:57:06 2008
@@ -20,7 +20,6 @@
import java.util.ArrayList;
-import java.util.Iterator;
/**
@@ -39,18 +38,16 @@
setLastName(lastName);
}
- private ArrayList addresses = new ArrayList();
+ private ArrayList<Address> addresses = new ArrayList<Address>();
public void addAddress(Address address) {
addresses.add(address);
}
public Address getAddress(String type) {
- Iterator elements = addresses.iterator();
- while (elements.hasNext()) {
- Address element = (Address) elements.next();
- if (type.equals(element.getType()))
- return (element);
+ for (Address address : addresses) {
+ if (type.equals(address.getType()))
+ return (address);
}
return (null);
}
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/LocationTrackerTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/LocationTrackerTestCase.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/LocationTrackerTestCase.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/LocationTrackerTestCase.java Tue Dec 23 19:57:06 2008
@@ -38,7 +38,7 @@
public class LocationTrackerTestCase extends TestCase {
private static class LocationTracker implements StackAction {
- public Map locations = new HashMap();
+ public Map<Object, String> locations = new HashMap<Object, String>();
public Object onPush(Digester d, String stackName, Object o) {
if (stackName == null) {
@@ -82,11 +82,11 @@
Object result = digester.parse(new StringReader(TEST_XML));
assertNotNull(result);
Box root = (Box) result;
- List children = root.getChildren();
+ List<Box> children = root.getChildren();
assertEquals(3, children.size());
- Box box1 = (Box) children.get(0);
- Box box2 = (Box) children.get(1);
- Box box3 = (Box) children.get(2);
+ Box box1 = children.get(0);
+ Box box2 = children.get(1);
+ Box box3 = children.get(2);
assertEquals("line=2", locnTracker.locations.get(root));
assertEquals("line=3", locnTracker.locations.get(box1));
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/NamespaceSnapshotTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/NamespaceSnapshotTestCase.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/NamespaceSnapshotTestCase.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/NamespaceSnapshotTestCase.java Tue Dec 23 19:57:06 2008
@@ -46,7 +46,7 @@
public final void begin(final String namespace, final String name,
final Attributes attributes) {
Digester d = getDigester();
- Map namespaces = d.getCurrentNamespaces();
+ Map<String, String> namespaces = d.getCurrentNamespaces();
((NamespacedBox) d.peek()).setNamespaces(namespaces);
}
}
@@ -70,13 +70,13 @@
assertNotNull(result);
NamespacedBox root = (NamespacedBox) result;
- Map nsmap = root.getNamespaces();
+ Map<String, String> nsmap = root.getNamespaces();
assertEquals(3, nsmap.size());
assertEquals("", nsmap.get(""));
assertEquals("http://commons.apache.org/digester/Foo", nsmap.get("foo"));
assertEquals("http://commons.apache.org/digester/Bar", nsmap.get("bar"));
- List children = root.getChildren();
+ List<Box> children = root.getChildren();
assertEquals(3, children.size());
NamespacedBox child1 = (NamespacedBox) children.get(0);
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/NamespacedBox.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/NamespacedBox.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/NamespacedBox.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/NamespacedBox.java Tue Dec 23 19:57:06 2008
@@ -28,17 +28,17 @@
*/
public class NamespacedBox extends Box {
- private Map namespaces;
+ private Map<String, String> namespaces;
public NamespacedBox() {
super();
}
- public Map getNamespaces() {
+ public Map<String, String> getNamespaces() {
return namespaces;
}
- public void setNamespaces(Map namespaces) {
+ public void setNamespaces(Map<String, String> namespaces) {
this.namespaces = namespaces;
}
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/NodeCreateRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/NodeCreateRuleTestCase.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/NodeCreateRuleTestCase.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/NodeCreateRuleTestCase.java Tue Dec 23 19:57:06 2008
@@ -289,7 +289,7 @@
assertNotNull(result);
assertTrue(result instanceof List);
- List list = (List)result;
+ List<?> list = (List<?>)result;
assertEquals(2, list.size());
assertTrue(list.get(0) instanceof DocumentFragment);
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/ObjectParamRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/ObjectParamRuleTestCase.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/ObjectParamRuleTestCase.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/ObjectParamRuleTestCase.java Tue Dec 23 19:57:06 2008
@@ -141,7 +141,7 @@
digester.addRule("arraylist/E", opr);
//Parse it and obtain the ArrayList
- ArrayList al = (ArrayList)digester.parse(new StringReader(sb.toString()));
+ ArrayList<?> al = (ArrayList<?>)digester.parse(new StringReader(sb.toString()));
assertNotNull(al);
assertEquals(al.size(), 4);
assertTrue(al.contains(new Integer(-9)));
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/RegexRulesTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/RegexRulesTestCase.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/RegexRulesTestCase.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/RegexRulesTestCase.java Tue Dec 23 19:57:06 2008
@@ -52,7 +52,7 @@
// now test a few patterns
// check that all are return in the order which they were added
- List matches = rules.match("", "x/g/e");
+ List<Rule> matches = rules.match("", "x/g/e");
assertEquals("Wrong number of rules returned (1)", 3, matches.size());
assertEquals("Rule Out Of Order (1)", "alpha", ((TestRule) matches.get(0)).getIdentifier());
assertEquals("Rule Out Of Order (2)", "beta", ((TestRule) matches.get(1)).getIdentifier());
@@ -81,7 +81,7 @@
// now test a few patterns
// check that all are return in the order which they were added
- List matches = rules.match("", "/b/c");
+ List<Rule> matches = rules.match("", "/b/c");
assertEquals("Wrong number of rules returned (1)", 0, matches.size());
matches = rules.match("", "/b/c/f");
@@ -104,7 +104,7 @@
// now test a few patterns
// check that all are return in the order which they were added
- List matches = rules.match("", "/match");
+ List<Rule> matches = rules.match("", "/match");
assertEquals("Wrong number of rules returned (1)", 1, matches.size());
assertEquals("Wrong Rule (1)", "beta", ((TestRule) matches.get(0)).getIdentifier());
@@ -127,7 +127,7 @@
rules.add("/gamma", new TestRule("gamma"));
// check that rules returns all rules in the order which they were added
- List matches = rules.rules();
+ List<Rule> matches = rules.rules();
assertEquals("Wrong number of rules returned (1)", 3, matches.size());
assertEquals("Rule Out Of Order (1)", "alpha", ((TestRule) matches.get(0)).getIdentifier());
assertEquals("Rule Out Of Order (2)", "beta", ((TestRule) matches.get(1)).getIdentifier());
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/RuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/RuleTestCase.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/RuleTestCase.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/RuleTestCase.java Tue Dec 23 19:57:06 2008
@@ -486,8 +486,8 @@
digester.addSetNext("!*/b/?", "setChild");
digester.addSetNext("!*/a/?", "setChild");
digester.addSetNext("!root/?", "add");
- ArrayList root =
- (ArrayList) digester.parse(getInputStream("Test4.xml"));
+ ArrayList<?> root =
+ (ArrayList<?>) digester.parse(getInputStream("Test4.xml"));
assertEquals("Wrong array size", 2, root.size());
AlphaBean one = (AlphaBean) root.get(0);
@@ -520,8 +520,8 @@
digester.addSetTop("!*/a/?", "setParent");
digester.addSetRoot("!*/a", "add");
digester.addSetRoot("!*/b", "add");
- ArrayList root =
- (ArrayList) digester.parse(getInputStream("Test4.xml"));
+ ArrayList<?> root =
+ (ArrayList<?>) digester.parse(getInputStream("Test4.xml"));
assertEquals("Wrong array size", 5, root.size());
@@ -580,8 +580,8 @@
digester.addSetProperties("toplevel/four", "alt-city", "city");
- ArrayList root =
- (ArrayList) digester.parse(getInputStream("Test7.xml"));
+ ArrayList<?> root =
+ (ArrayList<?>) digester.parse(getInputStream("Test7.xml"));
assertEquals("Wrong array size", 4, root.size());
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/RulesBaseTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/RulesBaseTestCase.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/RulesBaseTestCase.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/RulesBaseTestCase.java Tue Dec 23 19:57:06 2008
@@ -204,8 +204,8 @@
*/
public void testBasicNamespaceMatching() {
- List list = null;
- Iterator it = null;
+ List<Rule> list = null;
+ Iterator<Rule> it = null;
// clear any existing rules
digester.getRules().clear();
@@ -272,11 +272,11 @@
digester.addRule("alpha/beta/gamma", new TestRule("three"));
// test that rules are returned in set order
- List list = digester.getRules().match(null, "alpha/beta/gamma");
+ List<Rule> list = digester.getRules().match(null, "alpha/beta/gamma");
assertEquals("Testing ordering mismatch (A)", 3, list.size());
- Iterator it = list.iterator();
+ Iterator<Rule> it = list.iterator();
assertEquals("Testing ordering mismatch (B)", "one", ((TestRule) it.next()).getIdentifier());
assertEquals("Testing ordering mismatch (C)", "two", ((TestRule) it.next()).getIdentifier());
assertEquals("Testing ordering mismatch (D)", "three", ((TestRule) it.next()).getIdentifier());
@@ -300,11 +300,11 @@
digester.addRule("beta/gamma/alpha", new TestRule("three"));
// test that rules are returned in set order
- List list = digester.getRules().match(null, "alpha/beta/gamma");
+ List<Rule> list = digester.getRules().match(null, "alpha/beta/gamma");
assertEquals("Testing number of matches", 1, list.size());
- Iterator it = list.iterator();
+ Iterator<Rule> it = list.iterator();
assertEquals("Testing ordering (A)", "one", ((TestRule) it.next()).getIdentifier());
// clean up
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/TestFactoryCreate.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/TestFactoryCreate.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/TestFactoryCreate.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/TestFactoryCreate.java Tue Dec 23 19:57:06 2008
@@ -146,7 +146,7 @@
digester.addSetNext("root", "add");
xml = new String (
"<?xml version='1.0' ?><root one='good' two='bad' three='ugly'><element/></root>");
- List list = new ArrayList();
+ List<TestObjectCreationFactory> list = new ArrayList<TestObjectCreationFactory>();
digester.push(list);
digester.parse(new StringReader(xml));
@@ -176,7 +176,7 @@
digester.addSetNext("root", "add");
xml = new String (
"<?xml version='1.0' ?><root one='good' two='bad' three='ugly'><element/></root>");
- list = new ArrayList();
+ list = new ArrayList<TestObjectCreationFactory>();
digester.push(list);
digester.parse(new StringReader(xml));
@@ -207,7 +207,7 @@
"<?xml version='1.0' ?><root one='good' two='bad' three='ugly' "
+ " override='org.apache.commons.digester.OtherTestObjectCreationFactory' >"
+ "<element/></root>");
- list = new ArrayList();
+ list = new ArrayList<TestObjectCreationFactory>();
digester.push(list);
digester.parse(new StringReader(xml));
@@ -240,7 +240,7 @@
digester.addSetNext("root", "add");
xml = new String (
"<?xml version='1.0' ?><root one='good' two='bad' three='ugly'><element/></root>");
- list = new ArrayList();
+ list = new ArrayList<TestObjectCreationFactory>();
digester.push(list);
digester.parse(new StringReader(xml));
@@ -271,7 +271,7 @@
"<?xml version='1.0' ?><root one='good' two='bad' three='ugly' "
+ " override='org.apache.commons.digester.OtherTestObjectCreationFactory' >"
+ "<element/></root>");
- list = new ArrayList();
+ list = new ArrayList<TestObjectCreationFactory>();
digester.push(list);
digester.parse(new StringReader(xml));
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/TestRule.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/TestRule.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/TestRule.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/TestRule.java Tue Dec 23 19:57:06 2008
@@ -46,7 +46,7 @@
private String bodyText;
/** Used when testing call orders */
- private List order;
+ private List<Rule> order;
// ----------------------------------------------------------- Constructors
@@ -136,7 +136,7 @@
/**
* Get call order list.
*/
- public List getOrder() {
+ public List<Rule> getOrder() {
return order;
}
@@ -144,7 +144,7 @@
/**
* Set call order list
*/
- public void setOrder(List order) {
+ public void setOrder(List<Rule> order) {
this.order = order;
}
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/WDRulesWrapperTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/WDRulesWrapperTestCase.java?rev=729212&r1=729211&r2=729212&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/WDRulesWrapperTestCase.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/WDRulesWrapperTestCase.java Tue Dec 23 19:57:06 2008
@@ -87,7 +87,7 @@
rules.addDefault(new TestRule("Roger"));
rules.addDefault(new TestRule("Rabbit"));
- List matches = rules.match("", "alpha");
+ List<Rule> matches = rules.match("", "alpha");
assertEquals("Wrong size (1)", 3 , matches.size());
assertEquals("Wrong order (1)", "Tom" , ((TestRule) matches.get(0)).getIdentifier());
assertEquals("Wrong order (2)", "Dick" , ((TestRule) matches.get(1)).getIdentifier());