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 05:05:01 UTC
svn commit: r729217 - in
/commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules:
DigesterLoaderTest.java IncludeTest.java TestObject.java
Author: rahul
Date: Tue Dec 23 20:05:00 2008
New Revision: 729217
URL: http://svn.apache.org/viewvc?rev=729217&view=rev
Log:
Address various compiler warnings and use JDK 1.5 features in tests (org.apache.commons.digester.xmlrules test package).
Modified:
commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/DigesterLoaderTest.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/IncludeTest.java
commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/TestObject.java
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/DigesterLoaderTest.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/DigesterLoaderTest.java?rev=729217&r1=729216&r2=729217&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/DigesterLoaderTest.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/DigesterLoaderTest.java Tue Dec 23 20:05:00 2008
@@ -70,7 +70,7 @@
assertNotNull("The test could not locate testrules.xml", rules);
assertNotNull("The test could not locate test.xml", input);
Digester digester = DigesterLoader.createDigester(rules);
- digester.push(new ArrayList());
+ digester.push(new ArrayList<Object>());
Object root = digester.parse(input.openStream());
assertEquals("[foo1 baz1 foo2, foo3 foo4]",root.toString());
}
@@ -86,13 +86,13 @@
URL input = classLoader.getResource("org/apache/commons/digester/xmlrules/test.xml");
assertNotNull("The test could not locate testrules.xml", rules);
assertNotNull("The test could not locate test.xml", input);
- Object root = DigesterLoader.load(rules, classLoader, input, new ArrayList());
+ Object root = DigesterLoader.load(rules, classLoader, input, new ArrayList<Object>());
if (!(root instanceof ArrayList)) {
fail("Unexpected object returned from DigesterLoader. Expected ArrayList; got " + root.getClass().getName());
}
assertEquals( "[foo1 baz1 foo2, foo3 foo4]",root.toString());
- ArrayList al = (ArrayList)root;
+ ArrayList<Object> al = (ArrayList<Object>)root;
Object obj = al.get(0);
if (! (obj instanceof TestObject)) {
fail("Unexpected object returned from DigesterLoader. Expected TestObject; got " + obj.getClass().getName());
@@ -110,11 +110,11 @@
public void testLoad2() throws Exception {
URL rules = getClass().getClassLoader().getResource("org/apache/commons/digester/xmlrules/testrules.xml");
InputStream input = getClass().getClassLoader().getResource("org/apache/commons/digester/xmlrules/test.xml").openStream();
- Object root = DigesterLoader.load(rules, getClass().getClassLoader(), input, new ArrayList());
+ Object root = DigesterLoader.load(rules, getClass().getClassLoader(), input, new ArrayList<Object>());
if (!(root instanceof ArrayList)) {
fail("Unexpected object returned from DigesterLoader. Expected ArrayList; got " + root.getClass().getName());
}
- ArrayList list = (ArrayList) root;
+ ArrayList<Object> list = (ArrayList<Object>) root;
assertEquals(root.toString(), "[foo1 baz1 foo2, foo3 foo4]");
assertEquals("Wrong number of classes created", 2 , list.size());
assertEquals("Pushed first", true , ((TestObject)list.get(0)).isPushed());
@@ -150,7 +150,7 @@
rules,
getClass().getClassLoader(),
input,
- new ArrayList());
+ new ArrayList<Address>());
if (!(obj instanceof ArrayList)) {
fail(
@@ -158,36 +158,32 @@
+ obj.getClass().getName());
}
- ArrayList root = (ArrayList) obj;
+ ArrayList<Address> root = (ArrayList<Address>) obj;
assertEquals("Wrong array size", 4, root.size());
// note that the array is in popped order (rather than pushed)
- obj = root.get(0);
- assertTrue("(1) Should be an Address ", obj instanceof Address);
- Address addressOne = (Address) obj;
+ Address add = root.get(0);
+ Address addressOne = add;
assertEquals("(1) Street attribute", "New Street", addressOne.getStreet());
assertEquals("(1) City attribute", "Las Vegas", addressOne.getCity());
assertEquals("(1) State attribute", "Nevada", addressOne.getState());
- obj = root.get(1);
- assertTrue("(2) Should be an Address ", obj instanceof Address);
- Address addressTwo = (Address) obj;
+ add = root.get(1);
+ Address addressTwo = add;
assertEquals("(2) Street attribute", "Old Street", addressTwo.getStreet());
assertEquals("(2) City attribute", "Portland", addressTwo.getCity());
assertEquals("(2) State attribute", "Oregon", addressTwo.getState());
- obj = root.get(2);
- assertTrue("(3) Should be an Address ", obj instanceof Address);
- Address addressThree = (Address) obj;
+ add = root.get(2);
+ Address addressThree = add;
assertEquals("(3) Street attribute", "4th Street", addressThree.getStreet());
assertEquals("(3) City attribute", "Dayton", addressThree.getCity());
assertEquals("(3) State attribute", "US" , addressThree.getState());
- obj = root.get(3);
- assertTrue("(4) Should be an Address ", obj instanceof Address);
- Address addressFour = (Address) obj;
+ add = root.get(3);
+ Address addressFour = add;
assertEquals("(4) Street attribute", "6th Street", addressFour.getStreet());
assertEquals("(4) City attribute", "Cleveland", addressFour.getCity());
assertEquals("(4) State attribute", "Ohio", addressFour.getState());
@@ -203,7 +199,7 @@
rules,
getClass().getClassLoader(),
new StringReader(xml),
- new ArrayList());
+ new ArrayList<TestObjectCreationFactory>());
if (!(obj instanceof ArrayList)) {
fail(
@@ -211,10 +207,10 @@
+ obj.getClass().getName());
}
- ArrayList list = (ArrayList) obj;
+ ArrayList<TestObjectCreationFactory> list = (ArrayList<TestObjectCreationFactory>) obj;
assertEquals("List should contain only the factory object", list.size() , 1);
- TestObjectCreationFactory factory = (TestObjectCreationFactory) list.get(0);
+ TestObjectCreationFactory factory = list.get(0);
assertEquals("Object create not called(1)", factory.called , true);
assertEquals(
"Attribute not passed (1)",
@@ -322,16 +318,17 @@
assertNotNull("The test could not locate test-node-create-rules.xml", rules);
assertNotNull("The test could not locate test-node-create-rules-input.xml", input);
Digester digester = DigesterLoader.createDigester(rules);
- digester.push(new ArrayList());
+ digester.push(new ArrayList<Node>());
Object root = digester.parse(input.openStream());
- assertNotNull("root was null", root);
- assertTrue("no nodes were captured.", (((List)root).size() > 0));
- Object[] nodeArray = (Object[])((List)root).toArray();
+ assertNotNull("root was null", root);
+ List<Node> nlist = (List<Node>) root;
+ assertTrue("no nodes were captured.", nlist.size() > 0);
+ Node[] nodeArray = nlist.toArray(new Node[0]);
assertNotNull("resulting node array from array list was null", nodeArray);
// test foo1 structure
- Node foo1 = (Node)nodeArray[0];
+ Node foo1 = nodeArray[0];
assertTrue("foo1 didn't have any children", foo1.hasChildNodes());
Node foo1Bar1 = foo1.getFirstChild();
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/IncludeTest.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/IncludeTest.java?rev=729217&r1=729216&r2=729217&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/IncludeTest.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/IncludeTest.java Tue Dec 23 20:05:00 2008
@@ -37,7 +37,7 @@
digester.addRule("bar",
new Rule() {
public void body(String namespace, String name, String text) {
- ((ArrayList) this.digester.peek()).add(text);
+ ((ArrayList<String>) this.digester.peek()).add(text);
}
});
}
@@ -57,7 +57,7 @@
String xml = "<?xml version='1.0' ?><root><foo><bar>short</bar></foo></root>";
- ArrayList list = new ArrayList();
+ ArrayList<String> list = new ArrayList<String>();
Digester digester = DigesterLoader.createDigester(new InputSource(new StringReader(rulesXml)));
digester.push(list);
digester.parse(new StringReader(xml));
Modified: commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/TestObject.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/TestObject.java?rev=729217&r1=729216&r2=729217&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/TestObject.java (original)
+++ commons/proper/digester/trunk/src/test/org/apache/commons/digester/xmlrules/TestObject.java Tue Dec 23 20:05:00 2008
@@ -21,7 +21,6 @@
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
/**
@@ -33,13 +32,13 @@
*/
public class TestObject {
- private ArrayList children = new ArrayList();
+ private ArrayList<Object> children = new ArrayList<Object>();
private String value = "";
private Long longValue = new Long(-1L);
private String property = "";
- private HashMap mapValue = new HashMap();
+ private HashMap<String, String> mapValue = new HashMap<String, String>();
private boolean pushed = false;
@@ -48,8 +47,8 @@
public String toString() {
String str = value;
- for (Iterator i = children.iterator(); i.hasNext();) {
- str += " " + i.next();
+ for (Object o : children) {
+ str += " " + o;
}
return str;
}