You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/05/11 22:58:19 UTC
svn commit: r1102087 - in
/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3:
./ substitution/ xmlrules/
Author: simonetripodi
Date: Wed May 11 20:58:19 2011
New Revision: 1102087
URL: http://svn.apache.org/viewvc?rev=1102087&view=rev
Log:
tests use the digester magic cast on parse() methods invocation
Modified:
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/BeanPropertySetterRuleTestCase.java
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/CallMethodRuleTestCase.java
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/LocationTrackerTestCase.java
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/NodeCreateRuleTestCase.java
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/ObjectParamRuleTestCase.java
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RuleTestCase.java
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XIncludeTestCase.java
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/substitution/VariableExpansionTestCase.java
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterLoaderTest.java
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/BeanPropertySetterRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/BeanPropertySetterRuleTestCase.java?rev=1102087&r1=1102086&r2=1102087&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/BeanPropertySetterRuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/BeanPropertySetterRuleTestCase.java Wed May 11 20:58:19 2011
@@ -262,7 +262,7 @@ public class BeanPropertySetterRuleTestC
// we'll set property delta (a write-only property) also
digester.addRule("root/delta", new BeanPropertySetterRule("delta"));
- SimpleTestBean bean = (SimpleTestBean) digester.parse(xmlTestReader());
+ SimpleTestBean bean = digester.parse(xmlTestReader());
// check properties are set correctly
assertEquals(
@@ -303,8 +303,7 @@ public class BeanPropertySetterRuleTestC
// Attempt to parse the input
try {
- SimpleTestBean bean = (SimpleTestBean)
- digester.parse(xmlTestReader());
+ SimpleTestBean bean = digester.parse(xmlTestReader());
fail("Should have thrown NoSuchMethodException");
assertNotNull(bean); // just to avoid compiler warning on unused variable
} catch (Exception e) {
@@ -339,7 +338,7 @@ public class BeanPropertySetterRuleTestC
// match all children of root with this rule
digester.addRule("root/?", new BeanPropertySetterRule());
- SimpleTestBean bean = (SimpleTestBean) digester.parse(xmlTestReader());
+ SimpleTestBean bean = digester.parse(xmlTestReader());
// check properties are set correctly
assertEquals(
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/CallMethodRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/CallMethodRuleTestCase.java?rev=1102087&r1=1102086&r2=1102087&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/CallMethodRuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/CallMethodRuleTestCase.java Wed May 11 20:58:19 2011
@@ -125,8 +125,7 @@ public class CallMethodRuleTestCase {
digester.addCallMethod("employee/lastName", "setLastName", 0);
// Parse our test input
- Employee employee = (Employee)
- digester.parse(getInputStream("Test9.xml"));
+ Employee employee = digester.parse(getInputStream("Test9.xml"));
assertNotNull("parsed an employee", employee);
// Validate that the property setters were called
@@ -151,11 +150,9 @@ public class CallMethodRuleTestCase {
digester.addCallParam("employee/lastName", 0);
// Parse our test input
- Object root1 = null;
-
+
// an exception will be thrown if the method can't be found
- root1 = digester.parse(getInputStream("Test5.xml"));
- Employee employee = (Employee) root1;
+ Employee employee = digester.parse(getInputStream("Test5.xml"));
assertEquals("Failed to call Employee.setLastName",
"Last Name", employee.getLastName());
@@ -169,11 +166,8 @@ public class CallMethodRuleTestCase {
digester.addCallParam("employee/age", 0);
// Parse our test input
- root1 = null;
-
// an exception will be thrown if the method can't be found
- root1 = digester.parse(getInputStream("Test5.xml"));
- employee = (Employee) root1;
+ employee = digester.parse(getInputStream("Test5.xml"));
assertEquals("Failed to call Employee.setAge", 21, employee.getAge());
digester = new Digester();
@@ -184,11 +178,8 @@ public class CallMethodRuleTestCase {
digester.addCallParam("employee/active", 0);
// Parse our test input
- root1 = null;
-
// an exception will be thrown if the method can't be found
- root1 = digester.parse(getInputStream("Test5.xml"));
- employee = (Employee) root1;
+ employee = digester.parse(getInputStream("Test5.xml"));
assertEquals("Failed to call Employee.setActive",
true, employee.isActive());
@@ -200,10 +191,8 @@ public class CallMethodRuleTestCase {
digester.addCallParam("employee/salary", 0);
// Parse our test input
- root1 = null;
// an exception will be thrown if the method can't be found
- root1 = digester.parse(getInputStream("Test5.xml"));
- employee = (Employee) root1;
+ employee = digester.parse(getInputStream("Test5.xml"));
assertEquals("Failed to call Employee.setSalary",
1000000.0f, employee.getSalary(), 0.1f);
}
@@ -232,7 +221,7 @@ public class CallMethodRuleTestCase {
digester.addSetProperties("map/value");
digester.addCallParam("map/value", 1, true);
- HashMap<AlphaBean, BetaBean> map = (HashMap<AlphaBean, BetaBean>) digester.parse(new StringReader(xml.toString()));
+ HashMap<AlphaBean, BetaBean> map = digester.parse(new StringReader(xml.toString()));
assertNotNull(map);
assertEquals(1, map.size());
@@ -271,7 +260,7 @@ public class CallMethodRuleTestCase {
NamedBean root1 = null;
try {
// an exception will be thrown if the method can't be found
- root1 = (NamedBean) digester.parse(getInputStream("Test8.xml"));
+ root1 = digester.parse(getInputStream("Test8.xml"));
} catch (Throwable t) {
// this means that the method can't be found and so the test fails
@@ -635,7 +624,7 @@ public class CallMethodRuleTestCase {
digester.addCallParam("employee/address/type", 0);
digester.addCallParam("employee/address", 1, 0);
- HashMap<String, Address> map = (HashMap<String, Address>) digester.parse(getInputStream("Test5.xml"));
+ HashMap<String, Address> map = digester.parse(getInputStream("Test5.xml"));
assertNotNull(map);
Set<String> keys = map.keySet();
@@ -665,7 +654,7 @@ public class CallMethodRuleTestCase {
digester.addCallParam("employee/address/type", 0);
digester.addCallParam("employee/address", 1, 0);
- HashMap<String, Address> map = (HashMap<String, Address>) digester.parse(getInputStream("Test5.xml"));
+ HashMap<String, Address> map = digester.parse(getInputStream("Test5.xml"));
assertNotNull(map);
Set<String> keys = map.keySet();
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/LocationTrackerTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/LocationTrackerTestCase.java?rev=1102087&r1=1102086&r2=1102087&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/LocationTrackerTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/LocationTrackerTestCase.java Wed May 11 20:58:19 2011
@@ -84,9 +84,8 @@ public class LocationTrackerTestCase {
digester.addSetProperties("box/subBox");
digester.addSetNext("box/subBox", "addChild");
- Object result = digester.parse(new StringReader(TEST_XML));
- assertNotNull(result);
- Box root = (Box) result;
+ Box root = digester.parse(new StringReader(TEST_XML));
+ assertNotNull(root);
List<Box> children = root.getChildren();
assertEquals(3, children.size());
Box box1 = children.get(0);
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java?rev=1102087&r1=1102086&r2=1102087&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/NamespaceSnapshotTestCase.java Wed May 11 20:58:19 2011
@@ -72,10 +72,8 @@ public class NamespaceSnapshotTestCase {
digester.addRule("box/subBox", new NamespaceSnapshotRule());
digester.addSetNext("box/subBox", "addChild");
- Object result = digester.parse(getInputStream("Test11.xml"));
- assertNotNull(result);
+ NamespacedBox root = digester.parse(getInputStream("Test11.xml"));
- NamespacedBox root = (NamespacedBox) result;
Map<String, String> nsmap = root.getNamespaces();
assertEquals(3, nsmap.size());
assertEquals("", nsmap.get(""));
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/NodeCreateRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/NodeCreateRuleTestCase.java?rev=1102087&r1=1102086&r2=1102087&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/NodeCreateRuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/NodeCreateRuleTestCase.java Wed May 11 20:58:19 2011
@@ -193,11 +193,9 @@ public class NodeCreateRuleTestCase {
throws SAXException, ParserConfigurationException, IOException {
digester.addRule("root/alpha", new NodeCreateRule());
- Object result = digester.parse(new StringReader(TEST_XML));
+ Element element = digester.parse(new StringReader(TEST_XML));
- assertNotNull(result);
- assertTrue(result instanceof Element);
- Element element = (Element)result;
+ assertNotNull(element);
assertEquals("alpha", element.getNodeName());
assertNull(element.getLocalName());
assertNull(element.getNamespaceURI());
@@ -217,11 +215,9 @@ public class NodeCreateRuleTestCase {
digester.addRule("root",
new NodeCreateRule(Node.DOCUMENT_FRAGMENT_NODE));
- Object result = digester.parse(new StringReader(TEST_XML));
+ DocumentFragment fragment = digester.parse(new StringReader(TEST_XML));
- assertNotNull(result);
- assertTrue(result instanceof DocumentFragment);
- DocumentFragment fragment = (DocumentFragment)result;
+ assertNotNull(fragment);
assertEquals(4, fragment.getChildNodes().getLength());
Node rootBody = fragment.getFirstChild();
@@ -269,11 +265,9 @@ public class NodeCreateRuleTestCase {
digester.addSetRoot("root/a/b", "add");
digester.addObjectCreate("root/b", String.class);
digester.addSetRoot("root/b", "add");
- Object result = digester.parse(getInputStream("Test4.xml"));
+ List<?> list = digester.parse(getInputStream("Test4.xml"));
- assertNotNull(result);
- assertTrue(result instanceof List<?>);
- List<?> list = (List<?>)result;
+ assertNotNull(list);
assertEquals(2, list.size());
assertTrue(list.get(0) instanceof DocumentFragment);
@@ -301,11 +295,9 @@ public class NodeCreateRuleTestCase {
digester.addRule("employee",
new NodeCreateRule(Node.DOCUMENT_FRAGMENT_NODE));
- Object result = digester.parse(getInputStream("Test1.xml"));
+ DocumentFragment fragment = digester.parse(getInputStream("Test1.xml"));
- assertNotNull(result);
- assertTrue(result instanceof DocumentFragment);
- DocumentFragment fragment = (DocumentFragment)result;
+ assertNotNull(fragment);
assertEquals(2, fragment.getChildNodes().getLength());
assertEquals(Node.ELEMENT_NODE, fragment.getFirstChild().getNodeType());
@@ -343,11 +335,9 @@ public class NodeCreateRuleTestCase {
digester.setRuleNamespaceURI(null);
digester.addRule("employee",
new NodeCreateRule(Node.DOCUMENT_FRAGMENT_NODE));
- Object result = digester.parse(getInputStream("Test3.xml"));
+ DocumentFragment fragment = digester.parse(getInputStream("Test3.xml"));
- assertNotNull(result);
- assertTrue(result instanceof DocumentFragment);
- DocumentFragment fragment = (DocumentFragment)result;
+ assertNotNull(fragment);
assertEquals(2, fragment.getChildNodes().getLength());
assertEquals(Node.ELEMENT_NODE, fragment.getFirstChild().getNodeType());
@@ -390,11 +380,9 @@ public class NodeCreateRuleTestCase {
digester.setRuleNamespaceURI(null);
digester.addRule("employee",
new NodeCreateRule(Node.ELEMENT_NODE));
- Object result = digester.parse(getInputStream("Test10.xml"));
+ Element element = digester.parse(getInputStream("Test10.xml"));
- assertNotNull(result);
- assertTrue(result instanceof Element);
- Element element = (Element)result;
+ assertNotNull(element);
assertNotNull(element.getAttributeNodeNS("http://commons.apache.org/digester/Bar", "test"));
assertEquals("MyTestAttribute", element.getAttributeNodeNS("http://commons.apache.org/digester/Bar", "test").getNodeValue());
@@ -416,11 +404,9 @@ public class NodeCreateRuleTestCase {
digester.setRuleNamespaceURI(null);
digester.addRule("employee",
new NodeCreateRule(Node.ELEMENT_NODE));
- Object result = digester.parse(getInputStream("Test10.xml"));
+ Element element = digester.parse(getInputStream("Test10.xml"));
- assertNotNull(result);
- assertTrue(result instanceof Element);
- Element element = (Element)result;
+ assertNotNull(element);
assertNotNull(element.getAttributeNode("firstName"));
assertEquals("First Name", element.getAttributeNode("firstName").getNodeValue());
@@ -440,8 +426,7 @@ public class NodeCreateRuleTestCase {
digester.addRule("root",
new NodeCreateRule(Node.DOCUMENT_FRAGMENT_NODE));
- Object result = digester.parse(new StringReader(TEST_XML));
- DocumentFragment fragment = (DocumentFragment)result;
+ DocumentFragment fragment = digester.parse(new StringReader(TEST_XML));
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder builder = factory.newDocumentBuilder();
@@ -464,11 +449,9 @@ public class NodeCreateRuleTestCase {
"<?xml version='1.0'?><root><alpha>A A</alpha></root>";
digester.addRule("root/alpha", new NodeCreateRule());
- Object result = digester.parse(new StringReader(TEST_XML2));
+ Element element = digester.parse(new StringReader(TEST_XML2));
- assertNotNull(result);
- assertTrue(result instanceof Element);
- Element element = (Element)result;
+ assertNotNull(element);
assertEquals("alpha", element.getNodeName());
assertNull(element.getLocalName());
assertNull(element.getNamespaceURI());
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/ObjectParamRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/ObjectParamRuleTestCase.java?rev=1102087&r1=1102086&r2=1102087&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/ObjectParamRuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/ObjectParamRuleTestCase.java Wed May 11 20:58:19 2011
@@ -116,7 +116,7 @@ public class ObjectParamRuleTestCase {
digester.addRule("arraylist/E", opr);
//Parse it and obtain the ArrayList
- ArrayList<?> al = (ArrayList<?>)digester.parse(new StringReader(sb.toString()));
+ ArrayList<?> al = digester.parse(new StringReader(sb.toString()));
assertNotNull(al);
assertEquals(al.size(), 4);
assertTrue(al.contains(new Integer(-9)));
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RuleTestCase.java?rev=1102087&r1=1102086&r2=1102087&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RuleTestCase.java Wed May 11 20:58:19 2011
@@ -102,13 +102,9 @@ public class RuleTestCase {
digester.addSetProperties("employee");
// Parse our test input.
- Object root = null;
- root = digester.parse(getInputStream("Test1.xml"));
+ Employee employee = digester.parse(getInputStream("Test1.xml"));
- assertNotNull("Digester returned an object", root);
- assertTrue("Digester returned an Employee",
- root instanceof Employee);
- Employee employee = (Employee) root;
+ assertNotNull("Digester returned an object", employee);
assertEquals("First name is correct",
"First Name",
employee.getFirstName());
@@ -137,13 +133,9 @@ public class RuleTestCase {
digester.addSetProperties("employee/address");
// Parse our test input.
- Object root = null;
- root = digester.parse(getInputStream("Test1.xml"));
+ Employee employee = digester.parse(getInputStream("Test1.xml"));
- assertNotNull("Digester returned an object", root);
- assertTrue("Digester returned an Employee",
- root instanceof Employee);
- Employee employee = (Employee) root;
+ assertNotNull("Digester returned an object", employee);
assertEquals("First name is correct",
"First Name",
employee.getFirstName());
@@ -208,13 +200,9 @@ public class RuleTestCase {
// Parse our test input.
- Object root = null;
- root = digester.parse(getInputStream("Test1.xml"));
+ Employee employee = digester.parse(getInputStream("Test1.xml"));
- assertNotNull("Digester returned an object", root);
- assertTrue("Digester returned an Employee",
- root instanceof Employee);
- Employee employee = (Employee) root;
+ assertNotNull("Digester returned an object", employee);
assertEquals("First name is correct",
"First Name",
employee.getFirstName());
@@ -242,13 +230,9 @@ public class RuleTestCase {
// Parse our test input.
- Object root = null;
- root = digester.parse(getInputStream("Test5.xml"));
+ Employee employee = digester.parse(getInputStream("Test5.xml"));
- assertNotNull("Digester returned an object", root);
- assertTrue("Digester returned an Employee",
- root instanceof Employee);
- Employee employee = (Employee) root;
+ assertNotNull("Digester returned an object", employee);
assertEquals("First name is correct",
"First Name",
employee.getFirstName());
@@ -308,13 +292,9 @@ public class RuleTestCase {
digester.addRuleSet(rs);
// Parse our test input.
- Object root = null;
- root = digester.parse(getInputStream("Test1.xml"));
+ Employee employee = digester.parse(getInputStream("Test1.xml"));
- assertNotNull("Digester returned an object", root);
- assertTrue("Digester returned an Employee",
- root instanceof Employee);
- Employee employee = (Employee) root;
+ assertNotNull("Digester returned an object", employee);
assertEquals("First name is correct",
"First Name",
employee.getFirstName());
@@ -342,13 +322,9 @@ public class RuleTestCase {
digester.addRuleSet(rs);
// Parse our test input.
- Object root = null;
- root = digester.parse(getInputStream("Test2.xml"));
+ Employee employee = digester.parse(getInputStream("Test2.xml"));
- assertNotNull("Digester returned an object", root);
- assertTrue("Digester returned an Employee",
- root instanceof Employee);
- Employee employee = (Employee) root;
+ assertNotNull("Digester returned an object", employee);
assertEquals("First name is correct",
"First Name",
employee.getFirstName());
@@ -378,13 +354,9 @@ public class RuleTestCase {
digester.addRuleSet(rs);
// Parse our test input.
- Object root = null;
- root = digester.parse(getInputStream("Test3.xml"));
+ Employee employee = digester.parse(getInputStream("Test3.xml"));
- assertNotNull("Digester returned an object", root);
- assertTrue("Digester returned an Employee",
- root instanceof Employee);
- Employee employee = (Employee) root;
+ assertNotNull("Digester returned an object", employee);
assertEquals("First name is correct",
"First Name",
employee.getFirstName());
@@ -483,8 +455,7 @@ public class RuleTestCase {
digester.addSetNext("!*/b/?", "setChild");
digester.addSetNext("!*/a/?", "setChild");
digester.addSetNext("!root/?", "add");
- ArrayList<?> root =
- (ArrayList<?>) digester.parse(getInputStream("Test4.xml"));
+ ArrayList<?> root = digester.parse(getInputStream("Test4.xml"));
assertEquals("Wrong array size", 2, root.size());
AlphaBean one = (AlphaBean) root.get(0);
@@ -517,8 +488,7 @@ public class RuleTestCase {
digester.addSetTop("!*/a/?", "setParent");
digester.addSetRoot("!*/a", "add");
digester.addSetRoot("!*/b", "add");
- ArrayList<?> root =
- (ArrayList<?>) digester.parse(getInputStream("Test4.xml"));
+ ArrayList<?> root = digester.parse(getInputStream("Test4.xml"));
assertEquals("Wrong array size", 5, root.size());
@@ -578,8 +548,7 @@ public class RuleTestCase {
digester.addSetProperties("toplevel/four", "alt-city", "city");
- ArrayList<?> root =
- (ArrayList<?>) digester.parse(getInputStream("Test7.xml"));
+ ArrayList<?> root = digester.parse(getInputStream("Test7.xml"));
assertEquals("Wrong array size", 4, root.size());
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java?rev=1102087&r1=1102086&r2=1102087&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetNestedPropertiesRuleTestCase.java Wed May 11 20:58:19 2011
@@ -110,7 +110,7 @@ public class SetNestedPropertiesRuleTest
// match all children of root with this rule
digester.addRule("root", new SetNestedPropertiesRule());
- SimpleTestBean bean = (SimpleTestBean) digester.parse(xmlTestReader());
+ SimpleTestBean bean = digester.parse(xmlTestReader());
// check properties are set correctly
assertEquals(
@@ -156,7 +156,7 @@ public class SetNestedPropertiesRuleTest
digester.addRule("root", new SetNestedPropertiesRule());
try {
- SimpleTestBean bean = (SimpleTestBean) digester.parse(
+ SimpleTestBean bean = digester.parse(
new StringReader(TEST_XML));
// we should never get here...
@@ -205,7 +205,7 @@ public class SetNestedPropertiesRuleTest
digester.addRule("root", rule);
- SimpleTestBean bean = (SimpleTestBean) digester.parse(
+ SimpleTestBean bean = digester.parse(
new StringReader(TEST_XML));
// check properties are set correctly
@@ -260,7 +260,7 @@ public class SetNestedPropertiesRuleTest
Rule rule = new SetNestedPropertiesRule("alpha", null);
digester.addRule("root", rule);
- SimpleTestBean bean = (SimpleTestBean) digester.parse(
+ SimpleTestBean bean = digester.parse(
new StringReader(TEST_XML));
// check properties are set correctly
@@ -316,7 +316,7 @@ public class SetNestedPropertiesRuleTest
Rule rule = new SetNestedPropertiesRule("alpha-alt", "alpha");
digester.addRule("root", rule);
- SimpleTestBean bean = (SimpleTestBean) digester.parse(
+ SimpleTestBean bean = digester.parse(
new StringReader(TEST_XML));
// check properties are set correctly
@@ -381,7 +381,7 @@ public class SetNestedPropertiesRuleTest
digester.addSetProperties("root/testbean");
digester.addSetProperty("root/testbean/gamma/prop", "name", "value");
- SimpleTestBean bean = (SimpleTestBean) digester.parse(reader);
+ SimpleTestBean bean = digester.parse(reader);
assertNotNull("No object created", bean);
@@ -438,7 +438,7 @@ public class SetNestedPropertiesRuleTest
digester.addRule("root", rule);
try {
- SimpleTestBean bean = (SimpleTestBean) digester.parse(reader);
+ SimpleTestBean bean = digester.parse(reader);
fail("Expected to generate an exception.");
assertNotNull(bean); // just to prevent compiler warning on unused var
} catch(SAXException e) {
@@ -477,7 +477,7 @@ public class SetNestedPropertiesRuleTest
rule.setAllowUnknownChildElements(true);
digester.addRule("root", rule);
- SimpleTestBean bean = (SimpleTestBean) digester.parse(reader);
+ SimpleTestBean bean = digester.parse(reader);
assertNotNull(bean);
}
@@ -510,7 +510,7 @@ public class SetNestedPropertiesRuleTest
rule.setAllowUnknownChildElements(true);
digester.addRule("*/testbean", rule);
- SimpleTestBean bean = (SimpleTestBean) digester.parse(reader);
+ SimpleTestBean bean = digester.parse(reader);
assertNotNull(bean);
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java?rev=1102087&r1=1102086&r2=1102087&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertiesRuleTestCase.java Wed May 11 20:58:19 2011
@@ -109,8 +109,7 @@ public class SetPropertiesRuleTestCase {
digester.addSetProperties("root");
// Parse the input
- SimpleTestBean bean =
- (SimpleTestBean) digester.parse(xmlTestReader(TEST_XML_1));
+ SimpleTestBean bean = digester.parse(xmlTestReader(TEST_XML_1));
// Check that the properties were set correctly
assertEquals("alpha property set",
@@ -139,8 +138,7 @@ public class SetPropertiesRuleTestCase {
digester.addSetProperties("root");
// Parse the input
- SimpleTestBean bean =
- (SimpleTestBean) digester.parse(xmlTestReader(TEST_XML_2));
+ SimpleTestBean bean = digester.parse(xmlTestReader(TEST_XML_2));
// Check that the properties were set correctly
assertNull("alpha property not set",
@@ -171,8 +169,7 @@ public class SetPropertiesRuleTestCase {
try {
// Parse the input
- SimpleTestBean bean =
- (SimpleTestBean) digester.parse(xmlTestReader(TEST_XML_2));
+ SimpleTestBean bean = digester.parse(xmlTestReader(TEST_XML_2));
fail("Should have thrown NoSuchMethodException");
assertNotNull(bean); // just to prevent compiler warning on unused var
} catch (Exception e) {
@@ -210,8 +207,7 @@ public class SetPropertiesRuleTestCase {
digester.addRule("root", rule);
// Parse the input
- SimpleTestBean bean =
- (SimpleTestBean) digester.parse(xmlTestReader(TEST_XML_3));
+ SimpleTestBean bean = digester.parse(xmlTestReader(TEST_XML_3));
// Check that the properties were set correctly
assertEquals("alpha property set",
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java?rev=1102087&r1=1102086&r2=1102087&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/SetPropertyRuleTestCase.java Wed May 11 20:58:19 2011
@@ -110,8 +110,7 @@ public class SetPropertyRuleTestCase {
digester.addSetProperty("root/set", "name", "value");
// Parse the input
- SimpleTestBean bean =
- (SimpleTestBean) digester.parse(xmlTestReader(TEST_XML_1));
+ SimpleTestBean bean = digester.parse(xmlTestReader(TEST_XML_1));
// Check that the properties were set correctly
assertEquals("alpha property set",
@@ -142,8 +141,7 @@ public class SetPropertyRuleTestCase {
// Parse the input (should fail)
try {
- SimpleTestBean bean =
- (SimpleTestBean) digester.parse(xmlTestReader(TEST_XML_2));
+ SimpleTestBean bean = digester.parse(xmlTestReader(TEST_XML_2));
fail("Should have thrown NoSuchMethodException");
assertNotNull(bean); // just to prevent compiler warning on unused var
} catch (Exception e) {
@@ -198,7 +196,7 @@ public class SetPropertyRuleTestCase {
// Parse the input - should not throw an exception
@SuppressWarnings("unused")
- SimpleTestBean bean = (SimpleTestBean) digester.parse(xmlTestReader(TEST_XML_3));
+ SimpleTestBean bean = digester.parse(xmlTestReader(TEST_XML_3));
}
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XIncludeTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XIncludeTestCase.java?rev=1102087&r1=1102086&r2=1102087&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XIncludeTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XIncludeTestCase.java Wed May 11 20:58:19 2011
@@ -100,8 +100,7 @@ public class XIncludeTestCase {
digester.addSetNext("employee/address", "addAddress");
// Parse our test input
- Employee employee = (Employee)
- digester.parse(getInputStream("Test12.xml"));
+ Employee employee = digester.parse(getInputStream("Test12.xml"));
assertNotNull("failed to parsed an employee", employee);
// Test basics
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java?rev=1102087&r1=1102086&r2=1102087&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/XMLSchemaTestCase.java Wed May 11 20:58:19 2011
@@ -116,7 +116,7 @@ public class XMLSchemaTestCase {
digester.setErrorHandler(teh);
// Parse our test input
- Employee employee = (Employee) digester.parse(getInputStream("Test13-01.xml"));
+ Employee employee = digester.parse(getInputStream("Test13-01.xml"));
assertNotNull("failed to parsed an employee", employee);
assertTrue("Test13-01 should not generate errors in Schema validation", teh.clean);
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/substitution/VariableExpansionTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/substitution/VariableExpansionTestCase.java?rev=1102087&r1=1102086&r2=1102087&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/substitution/VariableExpansionTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/substitution/VariableExpansionTestCase.java Wed May 11 20:58:19 2011
@@ -107,13 +107,12 @@ public class VariableExpansionTestCase {
digester.addSetProperties("root");
// Parse our test input.
- Object root = digester.parse(input);
+ SimpleTestBean root = digester.parse(input);
assertNotNull("Digester returned no object", root);
- SimpleTestBean bean = (SimpleTestBean) root;
- assertEquals("${attr1}", bean.getAlpha());
- assertEquals("var{attr2}", bean.getBeta());
+ assertEquals("${attr1}", root.getAlpha());
+ assertEquals("var{attr2}", root.getBeta());
}
/**
@@ -133,13 +132,12 @@ public class VariableExpansionTestCase {
digester.addSetProperties("root");
// Parse our test input.
- Object root = digester.parse(input);
+ SimpleTestBean root = digester.parse(input);
assertNotNull("Digester returned no object", root);
- SimpleTestBean bean = (SimpleTestBean) root;
- assertEquals("${attr1}", bean.getAlpha());
- assertEquals("var{attr2}", bean.getBeta());
+ assertEquals("${attr1}", root.getAlpha());
+ assertEquals("var{attr2}", root.getBeta());
}
/**
@@ -232,15 +230,14 @@ public class VariableExpansionTestCase {
digester.addCallMethod("root", "setAlpha", 0);
// Parse our test input.
- Object root = digester.parse(input);
+ SimpleTestBean root = digester.parse(input);
assertNotNull("Digester returned no object", root);
- SimpleTestBean bean = (SimpleTestBean) root;
assertEquals(
"Twas brillig and the slithy toves" +
" did gyre and gimble in the wabe",
- bean.getAlpha());
+ root.getAlpha());
}
/**
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterLoaderTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterLoaderTest.java?rev=1102087&r1=1102086&r2=1102087&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterLoaderTest.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/xmlrules/DigesterLoaderTest.java Wed May 11 20:58:19 2011
@@ -321,11 +321,10 @@ public class DigesterLoaderTest {
assertNotNull("The test could not locate test-node-create-rules-input.xml", input);
Digester digester = DigesterLoader.createDigester(rules);
digester.push(new ArrayList<Node>());
- Object root = digester.parse(input.openStream());
+ List<Node> nlist = digester.parse(input.openStream());
+
+ assertNotNull("root was null", nlist);
- assertNotNull("root was null", root);
- @SuppressWarnings("unchecked") // if the assumption is incorrect, the test will fail
- 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);