sanders 02/01/23 14:38:01
Modified: digester/src/java/org/apache/commons/digester
AbstractObjectCreationFactory.java
BeanPropertySetterRule.java
digester/src/test/org/apache/commons/digester Address.java
BeanPropertySetterRuleTestCase.java
DigesterTestCase.java EBRTestCase.java
Employee.java RuleTestCase.java
RulesBaseTestCase.java SimpleTestBean.java
TestBean.java TestRule.java TestRuleSet.java
digester/src/test/org/apache/commons/digester/xmlrules
DigesterLoaderTest.java
DigesterPatternStackTest.java TestObject.java
Log:
Formatting updates. No code changes.
Revision Changes Path
1.4 +2 -3
jakarta-commons/digester/src/java/org/apache/commons/digester/AbstractObjectCreationFactory.java
Index: AbstractObjectCreationFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/AbstractObjectCreationFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractObjectCreationFactory.java 9 Jan 2002 20:22:49 -0000 1.3
+++ AbstractObjectCreationFactory.java 23 Jan 2002 22:38:01 -0000 1.4
@@ -58,16 +58,15 @@
package org.apache.commons.digester;
-import java.lang.ClassLoader;
-
import org.xml.sax.Attributes;
+
/**
* <p>Abstract base class for <code>ObjectCreationFactory</code>
* implementations.</p>
*
* @author Robert Burrell Donkin
- * @version $Revision: 1.3 $ $Date: 2002/01/09 20:22:49 $
+ * @version $Revision: 1.4 $ $Date: 2002/01/23 22:38:01 $
*/
abstract public class AbstractObjectCreationFactory implements
ObjectCreationFactory {
1.7 +8 -8
jakarta-commons/digester/src/java/org/apache/commons/digester/BeanPropertySetterRule.java
Index: BeanPropertySetterRule.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/BeanPropertySetterRule.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BeanPropertySetterRule.java 23 Jan 2002 21:25:22 -0000 1.6
+++ BeanPropertySetterRule.java 23 Jan 2002 22:38:01 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/BeanPropertySetterRule.java,v
1.6 2002/01/23 21:25:22 sanders Exp $
- * $Revision: 1.6 $
- * $Date: 2002/01/23 21:25:22 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/BeanPropertySetterRule.java,v
1.7 2002/01/23 22:38:01 sanders Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/01/23 22:38:01 $
*
* ====================================================================
*
@@ -62,9 +62,9 @@
package org.apache.commons.digester;
+
import java.util.HashMap;
-import org.xml.sax.Attributes;
import org.apache.commons.beanutils.BeanUtils;
@@ -81,7 +81,7 @@
* on the parent object.</p>
*
* @author Robert Burrell Donkin
- * @version $Revision: 1.6 $ $Date: 2002/01/23 21:25:22 $
+ * @version $Revision: 1.7 $ $Date: 2002/01/23 22:38:01 $
*/
public class BeanPropertySetterRule extends Rule {
@@ -146,7 +146,7 @@
// log some debugging information
if (digester.log.isDebugEnabled()) {
digester.log.debug("[BeanPropertySetterRule]{" +
- digester.match + "} Called with text " + bodyText);
+ digester.match + "} Called with text " + bodyText);
}
this.bodyText = bodyText.trim();
@@ -177,7 +177,7 @@
// log some debugging information
if (digester.log.isDebugEnabled()) {
digester.log.debug("[BeanPropertySetterRule]{" + digester.match +
- "} Setting property " + property + " with text " + bodyText);
+ "} Setting property " + property + " with text " + bodyText);
}
// going to use beanutils so need to specify property using map
@@ -191,7 +191,7 @@
// just log and return
if (digester.log.isDebugEnabled()) {
digester.log.debug("[BeanPropertySetterRule]{" +
- digester.match + "} Top object is null.");
+ digester.match + "} Top object is null.");
}
return;
}
1.4 +13 -3
jakarta-commons/digester/src/test/org/apache/commons/digester/Address.java
Index: Address.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/Address.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Address.java 14 Jan 2002 02:12:23 -0000 1.3
+++ Address.java 23 Jan 2002 22:38:01 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/Address.java,v
1.3 2002/01/14 02:12:23 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2002/01/14 02:12:23 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/Address.java,v
1.4 2002/01/23 22:38:01 sanders Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/01/23 22:38:01 $
*
* ====================================================================
*
@@ -82,41 +82,51 @@
}
private String city = null;
+
public String getCity() {
return (this.city);
}
+
public void setCity(String city) {
this.city = city;
}
private String state = null;
+
public String getState() {
return (this.state);
}
+
public void setState(String state) {
this.state = state;
}
private String street = null;
+
public String getStreet() {
return (this.street);
}
+
public void setStreet(String street) {
this.street = street;
}
private String type = null;
+
public String getType() {
return (this.type);
}
+
public void setType(String type) {
this.type = type;
}
private String zipCode = null;
+
public String getZipCode() {
return (this.zipCode);
}
+
public void setZipCode(String zipCode) {
this.zipCode = zipCode;
}
1.4 +87 -89
jakarta-commons/digester/src/test/org/apache/commons/digester/BeanPropertySetterRuleTestCase.java
Index: BeanPropertySetterRuleTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/BeanPropertySetterRuleTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BeanPropertySetterRuleTestCase.java 9 Jan 2002 20:22:50 -0000 1.3
+++ BeanPropertySetterRuleTestCase.java 23 Jan 2002 22:38:01 -0000 1.4
@@ -59,15 +59,15 @@
package org.apache.commons.digester;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringBufferInputStream;
import java.util.ArrayList;
import java.util.List;
-import java.io.StringBufferInputStream;
-import java.io.InputStream;
-import java.io.IOException;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.commons.logging.SimpleLog;
/**
@@ -84,7 +84,7 @@
* Simple test xml document used in the tests.
*/
protected final static String TEST_XML =
- "<?xml version='1.0'?><root>ROOT BODY<alpha>ALPHA BODY</alpha><beta>BETA
BODY</beta><gamma>GAMMA BODY</gamma></root>";
+ "<?xml version='1.0'?><root>ROOT BODY<alpha>ALPHA
BODY</alpha><beta>BETA BODY</beta><gamma>GAMMA BODY</gamma></root>";
/**
@@ -157,19 +157,19 @@
digester.setRules(new RulesBase());
// add first test rule
- TestRule firstRule=new TestRule(digester,"first");
+ TestRule firstRule = new TestRule(digester, "first");
firstRule.setOrder(callOrder);
- digester.addRule("root/alpha",firstRule);
+ digester.addRule("root/alpha", firstRule);
// add second test rule
- TestRule secondRule=new TestRule(digester,"second");
+ TestRule secondRule = new TestRule(digester, "second");
secondRule.setOrder(callOrder);
- digester.addRule("root/alpha",secondRule);
+ digester.addRule("root/alpha", secondRule);
// add third test rule
- TestRule thirdRule=new TestRule(digester,"third");
+ TestRule thirdRule = new TestRule(digester, "third");
thirdRule.setOrder(callOrder);
- digester.addRule("root/alpha",thirdRule);
+ digester.addRule("root/alpha", thirdRule);
try {
@@ -181,58 +181,58 @@
// we should have nine entries in our list of calls
- assertEquals(
- "Nine calls should have been made.",
- 9,
- callOrder.size());
+ assertEquals(
+ "Nine calls should have been made.",
+ 9,
+ callOrder.size());
// begin should be called in the order added
assertEquals(
- "First rule begin not called first.",
- "first",
- ((TestRule)callOrder.get(0)).getIdentifier());
+ "First rule begin not called first.",
+ "first",
+ ((TestRule) callOrder.get(0)).getIdentifier());
assertEquals(
- "Second rule begin not called second.",
- "second",
- ((TestRule)callOrder.get(1)).getIdentifier());
+ "Second rule begin not called second.",
+ "second",
+ ((TestRule) callOrder.get(1)).getIdentifier());
assertEquals(
- "Third rule begin not called third.",
- "third",
- ((TestRule)callOrder.get(2)).getIdentifier());
+ "Third rule begin not called third.",
+ "third",
+ ((TestRule) callOrder.get(2)).getIdentifier());
- // body text should be called in the order added
+ // body text should be called in the order added
assertEquals(
- "First rule body text not called first.",
- "first",
- ((TestRule)callOrder.get(3)).getIdentifier());
+ "First rule body text not called first.",
+ "first",
+ ((TestRule) callOrder.get(3)).getIdentifier());
assertEquals(
- "Second rule body text not called second.",
- "second",
- ((TestRule)callOrder.get(4)).getIdentifier());
+ "Second rule body text not called second.",
+ "second",
+ ((TestRule) callOrder.get(4)).getIdentifier());
assertEquals(
- "Third rule body text not called third.",
- "third",
- ((TestRule)callOrder.get(5)).getIdentifier());
+ "Third rule body text not called third.",
+ "third",
+ ((TestRule) callOrder.get(5)).getIdentifier());
- // end should be called in reverse order
+ // end should be called in reverse order
assertEquals(
- "Third rule end not called first.",
- "third",
- ((TestRule)callOrder.get(6)).getIdentifier());
+ "Third rule end not called first.",
+ "third",
+ ((TestRule) callOrder.get(6)).getIdentifier());
assertEquals(
- "Second rule end not called second.",
- "second",
- ((TestRule)callOrder.get(7)).getIdentifier());
+ "Second rule end not called second.",
+ "second",
+ ((TestRule) callOrder.get(7)).getIdentifier());
assertEquals(
- "First rule end not called third.",
- "first",
- ((TestRule)callOrder.get(8)).getIdentifier());
+ "First rule end not called third.",
+ "first",
+ ((TestRule) callOrder.get(8)).getIdentifier());
}
@@ -248,20 +248,20 @@
digester.setRules(new RulesBase());
// add test rule to catch body text
- TestRule rootRule=new TestRule(digester,"root");
- digester.addRule("root",rootRule);
+ TestRule rootRule = new TestRule(digester, "root");
+ digester.addRule("root", rootRule);
// add test rule to catch body text
- TestRule alphaRule=new TestRule(digester,"root/alpha");
- digester.addRule("root/alpha",alphaRule);
+ TestRule alphaRule = new TestRule(digester, "root/alpha");
+ digester.addRule("root/alpha", alphaRule);
// add test rule to catch body text
- TestRule betaRule=new TestRule(digester,"root/beta");
- digester.addRule("root/beta",betaRule);
+ TestRule betaRule = new TestRule(digester, "root/beta");
+ digester.addRule("root/beta", betaRule);
// add test rule to catch body text
- TestRule gammaRule=new TestRule(digester,"root/gamma");
- digester.addRule("root/gamma",gammaRule);
+ TestRule gammaRule = new TestRule(digester, "root/gamma");
+ digester.addRule("root/gamma", gammaRule);
try {
digester.parse(xmlTestStream());
@@ -271,24 +271,24 @@
}
assertEquals(
- "Root body text not set correct.",
- "ROOT BODY",
- rootRule.getBodyText());
+ "Root body text not set correct.",
+ "ROOT BODY",
+ rootRule.getBodyText());
assertEquals(
- "Alpha body text not set correct.",
- "ALPHA BODY",
- alphaRule.getBodyText());
+ "Alpha body text not set correct.",
+ "ALPHA BODY",
+ alphaRule.getBodyText());
assertEquals(
- "Beta body text not set correct.",
- "BETA BODY",
- betaRule.getBodyText());
+ "Beta body text not set correct.",
+ "BETA BODY",
+ betaRule.getBodyText());
assertEquals(
- "Gamma body text not set correct.",
- "GAMMA BODY",
- gammaRule.getBodyText());
+ "Gamma body text not set correct.",
+ "GAMMA BODY",
+ gammaRule.getBodyText());
}
@@ -302,13 +302,13 @@
digester.setRules(new RulesBase());
// going to be setting properties on a SimpleTestBean
-
digester.addObjectCreate("root","org.apache.commons.digester.SimpleTestBean");
+ digester.addObjectCreate("root",
"org.apache.commons.digester.SimpleTestBean");
// we'll set property alpha with the body text of root
- digester.addRule("root",new BeanPropertySetterRule(digester,"alpha"));
+ digester.addRule("root", new BeanPropertySetterRule(digester, "alpha"));
// we'll set property beta with the body text of child element alpha
- digester.addRule("root/alpha",new BeanPropertySetterRule(digester,"beta"));
+ digester.addRule("root/alpha", new BeanPropertySetterRule(digester,
"beta"));
// we'll leave property gamma alone
@@ -325,18 +325,18 @@
// check properties are set correctly
assertEquals(
- "Property alpha not set correctly",
- "ROOT BODY",
- bean.getAlpha());
+ "Property alpha not set correctly",
+ "ROOT BODY",
+ bean.getAlpha());
assertEquals(
- "Property beta not set correctly",
- "ALPHA BODY",
- bean.getBeta());
+ "Property beta not set correctly",
+ "ALPHA BODY",
+ bean.getBeta());
assertTrue(
- "Property gamma not set correctly",
- bean.getGamma()==null);
+ "Property gamma not set correctly",
+ bean.getGamma() == null);
}
@@ -349,10 +349,10 @@
digester.setRules(new ExtendedBaseRules());
// going to be setting properties on a SimpleTestBean
-
digester.addObjectCreate("root","org.apache.commons.digester.SimpleTestBean");
+ digester.addObjectCreate("root",
"org.apache.commons.digester.SimpleTestBean");
// match all children of root with this rule
- digester.addRule("root/?",new BeanPropertySetterRule(digester));
+ digester.addRule("root/?", new BeanPropertySetterRule(digester));
SimpleTestBean bean = null;
try {
@@ -365,20 +365,19 @@
// check properties are set correctly
assertEquals(
- "Property alpha not set correctly",
- "ALPHA BODY",
- bean.getAlpha());
+ "Property alpha not set correctly",
+ "ALPHA BODY",
+ bean.getAlpha());
assertEquals(
- "Property beta not set correctly",
- "BETA BODY",
- bean.getBeta());
+ "Property beta not set correctly",
+ "BETA BODY",
+ bean.getBeta());
assertEquals(
- "Property gamma not set correctly",
- "GAMMA BODY",
- bean.getGamma());
-
+ "Property gamma not set correctly",
+ "GAMMA BODY",
+ bean.getGamma());
}
@@ -386,8 +385,7 @@
/**
* Get input stream from {@link #TEST_XML}.
*/
- private InputStream xmlTestStream() throws IOException
- {
+ private InputStream xmlTestStream() throws IOException {
return new StringBufferInputStream(TEST_XML);
}
1.9 +32 -36
jakarta-commons/digester/src/test/org/apache/commons/digester/DigesterTestCase.java
Index: DigesterTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/DigesterTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DigesterTestCase.java 9 Jan 2002 20:22:50 -0000 1.8
+++ DigesterTestCase.java 23 Jan 2002 22:38:01 -0000 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/DigesterTestCase.java,v
1.8 2002/01/09 20:22:50 sanders Exp $
- * $Revision: 1.8 $
- * $Date: 2002/01/09 20:22:50 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/DigesterTestCase.java,v
1.9 2002/01/23 22:38:01 sanders Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/01/23 22:38:01 $
*
* ====================================================================
*
@@ -63,27 +63,24 @@
package org.apache.commons.digester;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import java.net.URL;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.xml.sax.ErrorHandler;
-
/**
* <p>Test Case for the Digester class. These tests exercise the individual
* methods of a Digester, but do not attempt to process complete documents.
* </p>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.8 $ $Date: 2002/01/09 20:22:50 $
+ * @version $Revision: 1.9 $ $Date: 2002/01/23 22:38:01 $
*/
public class DigesterTestCase extends TestCase {
@@ -170,31 +167,31 @@
public void testProperties() {
assertNull("Initial error handler is null",
- digester.getErrorHandler());
+ digester.getErrorHandler());
digester.setErrorHandler((ErrorHandler) digester);
assertTrue("Set error handler is digester",
- digester.getErrorHandler() == digester);
+ digester.getErrorHandler() == digester);
digester.setErrorHandler(null);
assertNull("Reset error handler is null",
- digester.getErrorHandler());
+ digester.getErrorHandler());
assertTrue("Initial namespace aware is false",
- !digester.getNamespaceAware());
+ !digester.getNamespaceAware());
digester.setNamespaceAware(true);
assertTrue("Set namespace aware is true",
- digester.getNamespaceAware());
+ digester.getNamespaceAware());
digester.setNamespaceAware(false);
assertTrue("Reset namespace aware is false",
- !digester.getNamespaceAware());
+ !digester.getNamespaceAware());
assertTrue("Initial validating is false",
- !digester.getValidating());
+ !digester.getValidating());
digester.setValidating(true);
assertTrue("Set validating is true",
- digester.getValidating());
+ digester.getValidating());
digester.setValidating(false);
assertTrue("Reset validating is false",
- !digester.getValidating());
+ !digester.getValidating());
}
@@ -224,20 +221,19 @@
while (keys.hasNext()) {
String key = (String) keys.next();
for (int i = 0; i < n; i++) {
- if (key.equals(registrations[i*2])) {
+ if (key.equals(registrations[i * 2])) {
count[i]++;
break;
}
}
}
for (int i = 0; i < n; i++)
- assertEquals("Count for key " + registrations[i*2],
- 1, count[i]);
+ assertEquals("Count for key " + registrations[i * 2],
+ 1, count[i]);
}
-
/**
* Basic test for rule creation and matching.
*/
@@ -246,19 +242,19 @@
List list = null;
assertEquals("Initial rules list is empty",
- 0, digester.getRules().match(null, "a").size());
+ 0, digester.getRules().match(null, "a").size());
digester.addSetProperties("a");
assertEquals("Add a matching rule",
- 1, digester.getRules().match(null, "a").size());
+ 1, digester.getRules().match(null, "a").size());
digester.addSetProperties("b");
assertEquals("Add a non-matching rule",
- 1, digester.getRules().match(null, "a").size());
+ 1, digester.getRules().match(null, "a").size());
digester.addSetProperties("a/b");
assertEquals("Add a non-matching nested rule",
- 1, digester.getRules().match(null, "a").size());
+ 1, digester.getRules().match(null, "a").size());
digester.addSetProperties("a/b");
assertEquals("Add a second matching rule",
- 2, digester.getRules().match(null, "a/b").size());
+ 2, digester.getRules().match(null, "a/b").size());
}
@@ -276,7 +272,7 @@
public void testRulesBase() {
assertEquals("Initial rules list is empty",
- 0, digester.getRules().rules().size());
+ 0, digester.getRules().rules().size());
// We're going to set up
digester.addRule("a/b/c/d", new TestRule(digester, "a/b/c/d"));
@@ -285,24 +281,24 @@
// Test exact match
assertEquals("Exact match takes precedence 1",
- 1, digester.getRules().match(null, "a/b/c/d").size());
+ 1, digester.getRules().match(null, "a/b/c/d").size());
assertEquals("Exact match takes precedence 2",
- "a/b/c/d",
- ((TestRule) digester.getRules().match(null,
"a/b/c/d").iterator().next()).getIdentifier());
+ "a/b/c/d",
+ ((TestRule) digester.getRules().match(null,
"a/b/c/d").iterator().next()).getIdentifier());
// Test wildcard tail matching
assertEquals("Wildcard tail matching rule 1",
- 1, digester.getRules().match(null, "a/b/d").size());
+ 1, digester.getRules().match(null, "a/b/d").size());
assertEquals("Wildcard tail matching rule 2",
- "*/d",
- ((TestRule) digester.getRules().match(null,
"a/b/d").iterator().next()).getIdentifier());
+ "*/d",
+ ((TestRule) digester.getRules().match(null,
"a/b/d").iterator().next()).getIdentifier());
// Test the longest matching pattern rule
assertEquals("Longest tail rule 1",
- 1, digester.getRules().match(null, "x/c/d").size());
+ 1, digester.getRules().match(null, "x/c/d").size());
assertEquals("Longest tail rule 2",
- "*/c/d",
- ((TestRule) digester.getRules().match(null,
"x/c/d").iterator().next()).getIdentifier());
+ "*/c/d",
+ ((TestRule) digester.getRules().match(null,
"x/c/d").iterator().next()).getIdentifier());
}
1.3 +72 -73
jakarta-commons/digester/src/test/org/apache/commons/digester/EBRTestCase.java
Index: EBRTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/EBRTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EBRTestCase.java 9 Jan 2002 20:22:50 -0000 1.2
+++ EBRTestCase.java 23 Jan 2002 22:38:01 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/EBRTestCase.java,v
1.2 2002/01/09 20:22:50 sanders Exp $
- * $Revision: 1.2 $
- * $Date: 2002/01/09 20:22:50 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/EBRTestCase.java,v
1.3 2002/01/23 22:38:01 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/01/23 22:38:01 $
*
* ====================================================================
*
@@ -63,18 +63,18 @@
package org.apache.commons.digester;
+import java.util.Iterator;
+import java.util.List;
+
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
-import java.util.List;
-import java.util.Iterator;
/**
* <p> Runs standard tests for RulesBase as well as tests of extensions.
*
* @author Robert Burrell Donkin <[EMAIL PROTECTED]>
- * @version $Revision: 1.2 $ $Date: 2002/01/09 20:22:50 $
+ * @version $Revision: 1.3 $ $Date: 2002/01/23 22:38:01 $
*/
@@ -129,7 +129,7 @@
digester.getRules().clear();
assertEquals("Initial rules list is empty",
- 0, digester.getRules().rules().size());
+ 0, digester.getRules().rules().size());
// Set up rules
// since these are all NON-UNIVERSAL matches
@@ -140,47 +140,47 @@
digester.addRule("*/beta/gamma/?", new TestRule(digester, "wild_parent"));
- List list=null;
- Iterator it=null;
+ List list = null;
+ Iterator it = null;
// this should match just the exact since this has presidence
- list=digester.getRules().match(null,"alpha/beta/gamma/delta");
+ list = digester.getRules().match(null, "alpha/beta/gamma/delta");
// all three rules should match
- assertEquals("Testing basic parent mismatch (A)",1,list.size());
+ assertEquals("Testing basic parent mismatch (A)", 1, list.size());
- it=list.iterator();
- assertEquals("Testing basic parent mismatch
(B)","exact",((TestRule)it.next()).getIdentifier());
+ it = list.iterator();
+ assertEquals("Testing basic parent mismatch (B)", "exact", ((TestRule)
it.next()).getIdentifier());
// we don't have an exact match for this child so we should get the exact
parent
- list=digester.getRules().match(null,"alpha/beta/gamma/epsilon");
+ list = digester.getRules().match(null, "alpha/beta/gamma/epsilon");
// all three rules should match
- assertEquals("Testing basic parent mismatch (C)",1,list.size());
+ assertEquals("Testing basic parent mismatch (C)", 1, list.size());
- it=list.iterator();
- assertEquals("Testing basic parent mismatch
(D)","exact_parent",((TestRule)it.next()).getIdentifier());
+ it = list.iterator();
+ assertEquals("Testing basic parent mismatch (D)", "exact_parent",
((TestRule) it.next()).getIdentifier());
// wild child overrides wild parent
- list=digester.getRules().match(null,"alpha/omega/beta/gamma/epsilon");
+ list = digester.getRules().match(null, "alpha/omega/beta/gamma/epsilon");
// all three rules should match
- assertEquals("Testing basic parent mismatch (E)",1,list.size());
+ assertEquals("Testing basic parent mismatch (E)", 1, list.size());
- it=list.iterator();
- assertEquals("Testing basic parent mismatch
(F)","wild_child",((TestRule)it.next()).getIdentifier());
+ it = list.iterator();
+ assertEquals("Testing basic parent mismatch (F)", "wild_child", ((TestRule)
it.next()).getIdentifier());
// nothing else matches so return wild parent
- list=digester.getRules().match(null,"alpha/omega/beta/gamma/zeta");
+ list = digester.getRules().match(null, "alpha/omega/beta/gamma/zeta");
// all three rules should match
- assertEquals("Testing basic parent mismatch (G)",1,list.size());
+ assertEquals("Testing basic parent mismatch (G)", 1, list.size());
- it=list.iterator();
- assertEquals("Testing basic parent mismatch
(H)","wild_parent",((TestRule)it.next()).getIdentifier());
+ it = list.iterator();
+ assertEquals("Testing basic parent mismatch (H)", "wild_parent",
((TestRule) it.next()).getIdentifier());
// clean up
@@ -199,7 +199,7 @@
digester.getRules().clear();
assertEquals("Initial rules list is empty",
- 0, digester.getRules().rules().size());
+ 0, digester.getRules().rules().size());
// Set up rules
// set up universal matches against non-universal ones
@@ -214,56 +214,55 @@
digester.addRule("!*/epsilon/beta/gamma/?", new TestRule(digester,
"universal_wildhead_child"));
-
- List list=null;
- Iterator it=null;
+ List list = null;
+ Iterator it = null;
// test universal wild head
- list=digester.getRules().match(null,"alpha/beta/gamma");
+ list = digester.getRules().match(null, "alpha/beta/gamma");
- assertEquals("Testing universal wildcard mismatch (A)",2,list.size());
+ assertEquals("Testing universal wildcard mismatch (A)", 2, list.size());
- it=list.iterator();
- assertEquals("Testing universal wildcard mismatch
(B)","exact",((TestRule)it.next()).getIdentifier());
- assertEquals("Testing universal wildcard mismatch
(C)","universal_wild_head",((TestRule)it.next()).getIdentifier());
+ it = list.iterator();
+ assertEquals("Testing universal wildcard mismatch (B)", "exact",
((TestRule) it.next()).getIdentifier());
+ assertEquals("Testing universal wildcard mismatch (C)",
"universal_wild_head", ((TestRule) it.next()).getIdentifier());
// test universal parent
- list=digester.getRules().match(null,"alpha/beta/gamma/epsilon");
+ list = digester.getRules().match(null, "alpha/beta/gamma/epsilon");
- assertEquals("Testing universal wildcard mismatch (D)",2,list.size());
+ assertEquals("Testing universal wildcard mismatch (D)", 2, list.size());
- it=list.iterator();
- assertEquals("Testing universal wildcard mismatch
(E)","universal_wild_child",((TestRule)it.next()).getIdentifier());
- assertEquals("Testing universal wildcard mismatch
(F)","exact2",((TestRule)it.next()).getIdentifier());
+ it = list.iterator();
+ assertEquals("Testing universal wildcard mismatch (E)",
"universal_wild_child", ((TestRule) it.next()).getIdentifier());
+ assertEquals("Testing universal wildcard mismatch (F)", "exact2",
((TestRule) it.next()).getIdentifier());
// test universal parent
- list=digester.getRules().match(null,"alpha/beta/gamma/zeta");
+ list = digester.getRules().match(null, "alpha/beta/gamma/zeta");
- assertEquals("Testing universal wildcard mismatch (G)",2,list.size());
+ assertEquals("Testing universal wildcard mismatch (G)", 2, list.size());
- it=list.iterator();
- assertEquals("Testing universal wildcard mismatch
(H)","universal_wild_child",((TestRule)it.next()).getIdentifier());
- assertEquals("Testing universal wildcard mismatch
(I)","non_wild_child",((TestRule)it.next()).getIdentifier());
+ it = list.iterator();
+ assertEquals("Testing universal wildcard mismatch (H)",
"universal_wild_child", ((TestRule) it.next()).getIdentifier());
+ assertEquals("Testing universal wildcard mismatch (I)", "non_wild_child",
((TestRule) it.next()).getIdentifier());
// test wildcard universal parent
- list=digester.getRules().match(null,"alpha/epsilon/beta/gamma/alpha");
+ list = digester.getRules().match(null, "alpha/epsilon/beta/gamma/alpha");
- assertEquals("Testing universal wildcard mismatch (J)",2,list.size());
+ assertEquals("Testing universal wildcard mismatch (J)", 2, list.size());
- it=list.iterator();
- assertEquals("Testing universal wildcard mismatch
(K)","non_wildhead_child",((TestRule)it.next()).getIdentifier());
- assertEquals("Testing universal wildcard mismatch
(L)","universal_wildhead_child",((TestRule)it.next()).getIdentifier());
+ it = list.iterator();
+ assertEquals("Testing universal wildcard mismatch (K)",
"non_wildhead_child", ((TestRule) it.next()).getIdentifier());
+ assertEquals("Testing universal wildcard mismatch (L)",
"universal_wildhead_child", ((TestRule) it.next()).getIdentifier());
// test wildcard universal parent
- list=digester.getRules().match(null,"alpha/epsilon/beta/gamma/zeta");
+ list = digester.getRules().match(null, "alpha/epsilon/beta/gamma/zeta");
- assertEquals("Testing universal wildcard mismatch (M)",2,list.size());
+ assertEquals("Testing universal wildcard mismatch (M)", 2, list.size());
- it=list.iterator();
- assertEquals("Testing universal wildcard mismatch
(M)","exact3",((TestRule)it.next()).getIdentifier());
- assertEquals("Testing universal wildcard mismatch
(O)","universal_wildhead_child",((TestRule)it.next()).getIdentifier());
+ it = list.iterator();
+ assertEquals("Testing universal wildcard mismatch (M)", "exact3",
((TestRule) it.next()).getIdentifier());
+ assertEquals("Testing universal wildcard mismatch (O)",
"universal_wildhead_child", ((TestRule) it.next()).getIdentifier());
// clean up
@@ -284,7 +283,7 @@
digester.getRules().clear();
assertEquals("Initial rules list is empty",
- 0, digester.getRules().rules().size());
+ 0, digester.getRules().rules().size());
// Set up rules
// The combinations a little large to test everything but we'll pick a
couple and try them.
@@ -294,39 +293,39 @@
digester.addRule("*/beta/gamma/?", new TestRule(digester, "wild_parent"));
- List list=null;
- Iterator it=null;
+ List list = null;
+ Iterator it = null;
// The universal wild will always match whatever else does
- list=digester.getRules().match(null,"alpha/beta/gamma/delta");
+ list = digester.getRules().match(null, "alpha/beta/gamma/delta");
// all three rules should match
- assertEquals("Testing wild mismatch (A)",2,list.size());
+ assertEquals("Testing wild mismatch (A)", 2, list.size());
- it=list.iterator();
- assertEquals("Testing wild mismatch
(B)","universal_wild",((TestRule)it.next()).getIdentifier());
- assertEquals("Testing wild mismatch
(C)","exact",((TestRule)it.next()).getIdentifier());
+ it = list.iterator();
+ assertEquals("Testing wild mismatch (B)", "universal_wild", ((TestRule)
it.next()).getIdentifier());
+ assertEquals("Testing wild mismatch (C)", "exact", ((TestRule)
it.next()).getIdentifier());
// The universal wild will always match whatever else does
- list=digester.getRules().match(null,"alpha/beta/gamma/epsilon");
+ list = digester.getRules().match(null, "alpha/beta/gamma/epsilon");
- assertEquals("Testing wild mismatch (D)",2,list.size());
+ assertEquals("Testing wild mismatch (D)", 2, list.size());
- it=list.iterator();
- assertEquals("Testing wild mismatch
(E)","universal_wild",((TestRule)it.next()).getIdentifier());
- assertEquals("Testing wild mismatch
(F)","wild_parent",((TestRule)it.next()).getIdentifier());
+ it = list.iterator();
+ assertEquals("Testing wild mismatch (E)", "universal_wild", ((TestRule)
it.next()).getIdentifier());
+ assertEquals("Testing wild mismatch (F)", "wild_parent", ((TestRule)
it.next()).getIdentifier());
// The universal wild will always match whatever else does
// we have no other non-universal matching so this will match the
non-universal wild as well
- list=digester.getRules().match(null,"alpha/gamma");
+ list = digester.getRules().match(null, "alpha/gamma");
- assertEquals("Testing wild mismatch (G)",2,list.size());
+ assertEquals("Testing wild mismatch (G)", 2, list.size());
- it=list.iterator();
- assertEquals("Testing wild mismatch
(H)","basic_wild",((TestRule)it.next()).getIdentifier());
- assertEquals("Testing wild mismatch
(I)","universal_wild",((TestRule)it.next()).getIdentifier());
+ it = list.iterator();
+ assertEquals("Testing wild mismatch (H)", "basic_wild", ((TestRule)
it.next()).getIdentifier());
+ assertEquals("Testing wild mismatch (I)", "universal_wild", ((TestRule)
it.next()).getIdentifier());
// clean up
1.3 +12 -3
jakarta-commons/digester/src/test/org/apache/commons/digester/Employee.java
Index: Employee.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/Employee.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Employee.java 9 Jan 2002 20:22:50 -0000 1.2
+++ Employee.java 23 Jan 2002 22:38:01 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/Employee.java,v
1.2 2002/01/09 20:22:50 sanders Exp $
- * $Revision: 1.2 $
- * $Date: 2002/01/09 20:22:50 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/Employee.java,v
1.3 2002/01/23 22:38:01 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/01/23 22:38:01 $
*
* ====================================================================
*
@@ -61,9 +61,11 @@
package org.apache.commons.digester;
+
import java.util.ArrayList;
import java.util.Iterator;
+
/**
* Bean for Digester testing.
*/
@@ -81,9 +83,11 @@
}
private ArrayList addresses = new ArrayList();
+
public void addAddress(Address address) {
addresses.add(address);
}
+
public Address getAddress(String type) {
Iterator elements = addresses.iterator();
while (elements.hasNext()) {
@@ -93,22 +97,27 @@
}
return (null);
}
+
public void removeAddress(Address address) {
addresses.remove(address);
}
private String firstName = null;
+
public String getFirstName() {
return (this.firstName);
}
+
public void setFirstName(String firstName) {
this.firstName = firstName;
}
private String lastName = null;
+
public String getLastName() {
return (this.lastName);
}
+
public void setLastName(String lastName) {
this.lastName = lastName;
}
1.9 +71 -70
jakarta-commons/digester/src/test/org/apache/commons/digester/RuleTestCase.java
Index: RuleTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/RuleTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RuleTestCase.java 14 Jan 2002 02:12:23 -0000 1.8
+++ RuleTestCase.java 23 Jan 2002 22:38:01 -0000 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/RuleTestCase.java,v
1.8 2002/01/14 02:12:23 craigmcc Exp $
- * $Revision: 1.8 $
- * $Date: 2002/01/14 02:12:23 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/RuleTestCase.java,v
1.9 2002/01/23 22:38:01 sanders Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/01/23 22:38:01 $
*
* ====================================================================
*
@@ -63,8 +63,9 @@
package org.apache.commons.digester;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -76,7 +77,7 @@
*
* @author Craig R. McClanahan
* @author Janek Bogucki
- * @version $Revision: 1.8 $ $Date: 2002/01/14 02:12:23 $
+ * @version $Revision: 1.9 $ $Date: 2002/01/23 22:38:01 $
*/
public class RuleTestCase extends TestCase {
@@ -152,7 +153,7 @@
// Configure the digester as required
digester.addObjectCreate("employee",
- "org.apache.commons.digester.Employee");
+ "org.apache.commons.digester.Employee");
digester.addSetProperties("employee");
// Parse our test input.
@@ -164,14 +165,14 @@
}
assertNotNull("Digester returned an object", root);
assertTrue("Digester returned an Employee",
- root instanceof Employee);
+ root instanceof Employee);
Employee employee = (Employee) root;
assertEquals("First name is correct",
- "First Name",
- employee.getFirstName());
+ "First Name",
+ employee.getFirstName());
assertEquals("Last name is correct",
- "Last Name",
- employee.getLastName());
+ "Last Name",
+ employee.getLastName());
}
@@ -189,7 +190,7 @@
digester.addObjectCreate("employee", Employee.class);
digester.addSetProperties("employee");
digester.addObjectCreate("employee/address",
- "org.apache.commons.digester.Address");
+ "org.apache.commons.digester.Address");
digester.addSetProperties("employee/address");
// Parse our test input.
@@ -201,14 +202,14 @@
}
assertNotNull("Digester returned an object", root);
assertTrue("Digester returned an Employee",
- root instanceof Employee);
+ root instanceof Employee);
Employee employee = (Employee) root;
assertEquals("First name is correct",
- "First Name",
- employee.getFirstName());
+ "First Name",
+ employee.getFirstName());
assertEquals("Last name is correct",
- "Last Name",
- employee.getLastName());
+ "Last Name",
+ employee.getLastName());
}
@@ -226,10 +227,10 @@
digester.addObjectCreate("employee", Employee.class);
digester.addSetProperties("employee");
digester.addObjectCreate("employee/address",
- "org.apache.commons.digester.Address");
+ "org.apache.commons.digester.Address");
digester.addSetProperties("employee/address");
digester.addSetNext("employee/address",
- "addAddress");
+ "addAddress");
// Parse our test input once
Object root = null;
@@ -260,10 +261,10 @@
// Configure the digester as required
digester.addObjectCreate("employee", Employee.class);
digester.addCallMethod("employee",
- "setFirstName", 1);
+ "setFirstName", 1);
digester.addCallParam("employee", 0, "firstName");
digester.addCallMethod("employee",
- "setLastName", 1);
+ "setLastName", 1);
digester.addCallParam("employee", 0, "lastName");
@@ -276,14 +277,14 @@
}
assertNotNull("Digester returned an object", root);
assertTrue("Digester returned an Employee",
- root instanceof Employee);
+ root instanceof Employee);
Employee employee = (Employee) root;
assertEquals("First name is correct",
- "First Name",
- employee.getFirstName());
+ "First Name",
+ employee.getFirstName());
assertEquals("Last name is correct",
- "Last Name",
- employee.getLastName());
+ "Last Name",
+ employee.getLastName());
}
@@ -299,10 +300,10 @@
digester.addObjectCreate("employee", Employee.class);
digester.addSetProperties("employee");
digester.addObjectCreate("employee/address",
- "org.apache.commons.digester.Address");
+ "org.apache.commons.digester.Address");
digester.addSetProperties("employee/address");
digester.addSetNext("employee/address",
- "addAddress");
+ "addAddress");
// Parse our test input the first time
Object root1 = null;
@@ -324,7 +325,7 @@
// Make sure that it was a different root
assertTrue("Different tree instances were returned",
- root1 != root2);
+ root1 != root2);
}
@@ -351,18 +352,18 @@
assertNotNull("Digester returned an object", root);
assertTrue("Digester returned an Employee",
- root instanceof Employee);
+ root instanceof Employee);
Employee employee = (Employee) root;
assertEquals("First name is correct",
- "First Name",
- employee.getFirstName());
+ "First Name",
+ employee.getFirstName());
assertEquals("Last name is correct",
- "Last Name",
- employee.getLastName());
+ "Last Name",
+ employee.getLastName());
assertNotNull("Can retrieve home address",
- employee.getAddress("home"));
+ employee.getAddress("home"));
assertNotNull("Can retrieve office address",
- employee.getAddress("office"));
+ employee.getAddress("office"));
}
@@ -375,7 +376,7 @@
// Configure the digester as required
digester.setNamespaceAware(true);
RuleSet rs = new TestRuleSet(null,
- "http://jakarta.apache.org/digester/Foo";);
+ "http://jakarta.apache.org/digester/Foo";);
digester.addRuleSet(rs);
// Parse our test input.
@@ -388,18 +389,18 @@
assertNotNull("Digester returned an object", root);
assertTrue("Digester returned an Employee",
- root instanceof Employee);
+ root instanceof Employee);
Employee employee = (Employee) root;
assertEquals("First name is correct",
- "First Name",
- employee.getFirstName());
+ "First Name",
+ employee.getFirstName());
assertEquals("Last name is correct",
- "Last Name",
- employee.getLastName());
+ "Last Name",
+ employee.getLastName());
assertNotNull("Can retrieve home address",
- employee.getAddress("home"));
+ employee.getAddress("home"));
assertNotNull("Can retrieve office address",
- employee.getAddress("office"));
+ employee.getAddress("office"));
}
@@ -414,7 +415,7 @@
// Configure the digester as required
digester.setNamespaceAware(true);
RuleSet rs = new TestRuleSet(null,
- "http://jakarta.apache.org/digester/Foo";);
+ "http://jakarta.apache.org/digester/Foo";);
digester.addRuleSet(rs);
// Parse our test input.
@@ -427,18 +428,18 @@
assertNotNull("Digester returned an object", root);
assertTrue("Digester returned an Employee",
- root instanceof Employee);
+ root instanceof Employee);
Employee employee = (Employee) root;
assertEquals("First name is correct",
- "First Name",
- employee.getFirstName());
+ "First Name",
+ employee.getFirstName());
assertEquals("Last name is correct",
- "Last Name",
- employee.getLastName());
+ "Last Name",
+ employee.getLastName());
assertNull("Can not retrieve home address",
- employee.getAddress("home"));
+ employee.getAddress("home"));
assertNull("Can not retrieve office address",
- employee.getAddress("office"));
+ employee.getAddress("office"));
}
@@ -457,10 +458,10 @@
// Configure the digester as required
digester.addObjectCreate("employee",
- "org.apache.commons.digester.Employee");
+ "org.apache.commons.digester.Employee");
digester.addSetProperties("employee");
digester.addObjectCreate("employee/address",
- "org.apache.commons.digester.Address");
+ "org.apache.commons.digester.Address");
digester.addSetProperties("employee/address");
digester.addSetTop("employee/address", "setEmployee");
@@ -484,13 +485,13 @@
// Configure the digester as required
digester.addObjectCreate("employee",
- "org.apache.commons.digester.Employee");
+ "org.apache.commons.digester.Employee");
digester.addSetProperties("employee");
digester.addObjectCreate("employee/address",
- "org.apache.commons.digester.Address");
+ "org.apache.commons.digester.Address");
digester.addSetProperties("employee/address");
digester.addSetTop("employee/address", "setEmployee",
- "org.apache.commons.digester.Employee");
+ "org.apache.commons.digester.Employee");
// Parse our test input.
Object root = null;
@@ -533,38 +534,38 @@
// Validate the retrieved Employee
assertNotNull("Digester returned an object", root);
assertTrue("Digester returned an Employee",
- root instanceof Employee);
+ root instanceof Employee);
Employee employee = (Employee) root;
assertEquals("First name is correct",
- "First Name",
- employee.getFirstName());
+ "First Name",
+ employee.getFirstName());
assertEquals("Last name is correct",
- "Last Name",
- employee.getLastName());
+ "Last Name",
+ employee.getLastName());
// Validate the corresponding "home" Address
Address home = employee.getAddress("home");
assertNotNull("Retrieved home address", home);
assertEquals("Home street", "Home Street",
- home.getStreet());
+ home.getStreet());
assertEquals("Home city", "Home City",
- home.getCity());
+ home.getCity());
assertEquals("Home state", "HS",
- home.getState());
+ home.getState());
assertEquals("Home zip", "HmZip",
- home.getZipCode());
+ home.getZipCode());
// Validate the corresponding "office" Address
Address office = employee.getAddress("office");
assertNotNull("Retrieved office address", office);
assertEquals("Office street", "Office Street",
- office.getStreet());
+ office.getStreet());
assertEquals("Office city", "Office City",
- office.getCity());
+ office.getCity());
assertEquals("Office state", "OS",
- office.getState());
+ office.getState());
assertEquals("Office zip", "OfZip",
- office.getZipCode());
+ office.getZipCode());
}
1.4 +47 -56
jakarta-commons/digester/src/test/org/apache/commons/digester/RulesBaseTestCase.java
Index: RulesBaseTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/RulesBaseTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RulesBaseTestCase.java 9 Jan 2002 20:22:50 -0000 1.3
+++ RulesBaseTestCase.java 23 Jan 2002 22:38:01 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/RulesBaseTestCase.java,v
1.3 2002/01/09 20:22:50 sanders Exp $
- * $Revision: 1.3 $
- * $Date: 2002/01/09 20:22:50 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/RulesBaseTestCase.java,v
1.4 2002/01/23 22:38:01 sanders Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/01/23 22:38:01 $
*
* ====================================================================
*
@@ -63,20 +63,12 @@
package org.apache.commons.digester;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
+
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.xml.sax.ErrorHandler;
-
/**
@@ -87,7 +79,7 @@
* </p>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2002/01/09 20:22:50 $
+ * @version $Revision: 1.4 $ $Date: 2002/01/23 22:38:01 $
*/
public class RulesBaseTestCase extends TestCase {
@@ -134,8 +126,7 @@
*
* @return the matching rules to be tested.
*/
- protected Rules createMatchingRulesForTest()
- {
+ protected Rules createMatchingRulesForTest() {
return new RulesBase();
}
@@ -174,19 +165,19 @@
List list = null;
assertEquals("Initial rules list is empty",
- 0, digester.getRules().match("a").size());
+ 0, digester.getRules().match("a").size());
digester.addSetProperties("a");
assertEquals("Add a matching rule",
- 1, digester.getRules().match(null,"a").size());
+ 1, digester.getRules().match(null, "a").size());
digester.addSetProperties("b");
assertEquals("Add a non-matching rule",
- 1, digester.getRules().match(null,"a").size());
+ 1, digester.getRules().match(null, "a").size());
digester.addSetProperties("a/b");
assertEquals("Add a non-matching nested rule",
- 1, digester.getRules().match(null,"a").size());
+ 1, digester.getRules().match(null, "a").size());
digester.addSetProperties("a/b");
assertEquals("Add a second matching rule",
- 2, digester.getRules().match(null,"a/b").size());
+ 2, digester.getRules().match(null, "a/b").size());
// clean up
digester.getRules().clear();
@@ -209,7 +200,7 @@
digester.getRules().clear();
assertEquals("Initial rules list is empty",
- 0, digester.getRules().rules().size());
+ 0, digester.getRules().rules().size());
// We're going to set up
digester.addRule("a/b/c/d", new TestRule(digester, "a/b/c/d"));
@@ -218,24 +209,24 @@
// Test exact match
assertEquals("Exact match takes precedence 1",
- 1, digester.getRules().match(null,"a/b/c/d").size());
+ 1, digester.getRules().match(null, "a/b/c/d").size());
assertEquals("Exact match takes precedence 2",
- "a/b/c/d",
- ((TestRule)
digester.getRules().match(null,"a/b/c/d").iterator().next()).getIdentifier());
+ "a/b/c/d",
+ ((TestRule) digester.getRules().match(null,
"a/b/c/d").iterator().next()).getIdentifier());
// Test wildcard tail matching
assertEquals("Wildcard tail matching rule 1",
- 1, digester.getRules().match(null,"a/b/d").size());
+ 1, digester.getRules().match(null, "a/b/d").size());
assertEquals("Wildcard tail matching rule 2",
- "*/d",
- ((TestRule)
digester.getRules().match(null,"a/b/d").iterator().next()).getIdentifier());
+ "*/d",
+ ((TestRule) digester.getRules().match(null,
"a/b/d").iterator().next()).getIdentifier());
// Test the longest matching pattern rule
assertEquals("Longest tail rule 1",
- 1, digester.getRules().match(null,"x/c/d").size());
+ 1, digester.getRules().match(null, "x/c/d").size());
assertEquals("Longest tail rule 2",
- "*/c/d",
- ((TestRule)
digester.getRules().match(null,"x/c/d").iterator().next()).getIdentifier());
+ "*/c/d",
+ ((TestRule) digester.getRules().match(null,
"x/c/d").iterator().next()).getIdentifier());
// clean up
digester.getRules().clear();
@@ -247,51 +238,51 @@
*/
public void testBasicNamespaceMatching() {
- List list=null;
- Iterator it=null;
+ List list = null;
+ Iterator it = null;
// clear any existing rules
digester.getRules().clear();
assertEquals("Initial rules list is empty",
- 0, digester.getRules().rules().size());
+ 0, digester.getRules().rules().size());
// Set up rules
digester.addRule("alpha/beta/gamma", new TestRule(digester,
"No-Namespace"));
- digester.addRule("alpha/beta/gamma", new TestRule(digester,
"Euclidean-Namespace","euclidean"));
+ digester.addRule("alpha/beta/gamma", new TestRule(digester,
"Euclidean-Namespace", "euclidean"));
- list=digester.getRules().rules();
+ list = digester.getRules().rules();
// test that matching null namespace brings back namespace and
non-namespace rules
- list=digester.getRules().match(null,"alpha/beta/gamma");
+ list = digester.getRules().match(null, "alpha/beta/gamma");
- assertEquals("Null namespace match (A)",2,list.size());
+ assertEquals("Null namespace match (A)", 2, list.size());
- it=list.iterator();
- assertEquals("Null namespace match
(B)","No-Namespace",((TestRule)it.next()).getIdentifier());
- assertEquals("Null namespace match
(C)","Euclidean-Namespace",((TestRule)it.next()).getIdentifier());
+ it = list.iterator();
+ assertEquals("Null namespace match (B)", "No-Namespace", ((TestRule)
it.next()).getIdentifier());
+ assertEquals("Null namespace match (C)", "Euclidean-Namespace", ((TestRule)
it.next()).getIdentifier());
// test that matching euclid namespace brings back namespace and
non-namespace rules
- list=digester.getRules().match("euclidean","alpha/beta/gamma");
+ list = digester.getRules().match("euclidean", "alpha/beta/gamma");
- assertEquals("Matching namespace match (A)",2,list.size());
+ assertEquals("Matching namespace match (A)", 2, list.size());
- it=list.iterator();
- assertEquals("Matching namespace match
(B)","No-Namespace",((TestRule)it.next()).getIdentifier());
- assertEquals("Matching namespace match
(C)","Euclidean-Namespace",((TestRule)it.next()).getIdentifier());
+ it = list.iterator();
+ assertEquals("Matching namespace match (B)", "No-Namespace", ((TestRule)
it.next()).getIdentifier());
+ assertEquals("Matching namespace match (C)", "Euclidean-Namespace",
((TestRule) it.next()).getIdentifier());
// test that matching another namespace brings back only non-namespace rule
- list=digester.getRules().match("hyperbolic","alpha/beta/gamma");
+ list = digester.getRules().match("hyperbolic", "alpha/beta/gamma");
- assertEquals("Non matching namespace match (A)",1,list.size());
+ assertEquals("Non matching namespace match (A)", 1, list.size());
- it=list.iterator();
- assertEquals("Non matching namespace match
(B)","No-Namespace",((TestRule)it.next()).getIdentifier());
+ it = list.iterator();
+ assertEquals("Non matching namespace match (B)", "No-Namespace",
((TestRule) it.next()).getIdentifier());
// clean up
digester.getRules().clear();
@@ -307,7 +298,7 @@
digester.getRules().clear();
assertEquals("Initial rules list is empty",
- 0, digester.getRules().rules().size());
+ 0, digester.getRules().rules().size());
// Set up rules
digester.addRule("alpha/beta/gamma", new TestRule(digester, "one"));
@@ -315,14 +306,14 @@
digester.addRule("alpha/beta/gamma", new TestRule(digester, "three"));
// test that rules are returned in set order
- List list=digester.getRules().match(null,"alpha/beta/gamma");
+ List list = digester.getRules().match(null, "alpha/beta/gamma");
- assertEquals("Testing ordering mismatch (A)",3,list.size());
+ assertEquals("Testing ordering mismatch (A)", 3, list.size());
- Iterator 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());
+ Iterator 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());
// clean up
digester.getRules().clear();
1.3 +9 -16
jakarta-commons/digester/src/test/org/apache/commons/digester/SimpleTestBean.java
Index: SimpleTestBean.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/SimpleTestBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleTestBean.java 9 Jan 2002 20:22:50 -0000 1.2
+++ SimpleTestBean.java 23 Jan 2002 22:38:01 -0000 1.3
@@ -70,38 +70,31 @@
private String gamma;
- public String getAlpha()
- {
+ public String getAlpha() {
return alpha;
}
- public void setAlpha(String alpha)
- {
+ public void setAlpha(String alpha) {
this.alpha = alpha;
}
- public String getBeta()
- {
+ public String getBeta() {
return beta;
}
- public void setBeta(String beta)
- {
- this.beta=beta;
+ public void setBeta(String beta) {
+ this.beta = beta;
}
- public String getGamma()
- {
+ public String getGamma() {
return gamma;
}
- public void setGamma(String gamma)
- {
- this.gamma=gamma;
+ public void setGamma(String gamma) {
+ this.gamma = gamma;
}
- public String toString()
- {
+ public String toString() {
StringBuffer sb = new StringBuffer("[SimpleTestBean]");
sb.append(" alpha=");
sb.append(alpha);
1.3 +7 -7
jakarta-commons/digester/src/test/org/apache/commons/digester/TestBean.java
Index: TestBean.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/TestBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestBean.java 9 Jan 2002 20:22:50 -0000 1.2
+++ TestBean.java 23 Jan 2002 22:38:01 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/TestBean.java,v
1.2 2002/01/09 20:22:50 sanders Exp $
- * $Revision: 1.2 $
- * $Date: 2002/01/09 20:22:50 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/TestBean.java,v
1.3 2002/01/23 22:38:01 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/01/23 22:38:01 $
*
* ====================================================================
*
@@ -67,7 +67,7 @@
* General purpose test bean for Digester tests.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2002/01/09 20:22:50 $
+ * @version $Revision: 1.3 $ $Date: 2002/01/23 22:38:01 $
*/
public class TestBean {
@@ -198,7 +198,7 @@
* A multiple-String SELECT element.
*/
private String[] multipleSelect = { "Multiple 3", "Multiple 5",
- "Multiple 7" };
+ "Multiple 7" };
public String[] getMultipleSelect() {
return (this.multipleSelect);
@@ -267,7 +267,7 @@
* String arrays that are accessed as an array as well as indexed.
*/
private String stringArray[] =
- { "String 0", "String 1", "String 2", "String 3", "String 4" };
+ { "String 0", "String 1", "String 2", "String 3", "String 4" };
public String[] getStringArray() {
return (this.stringArray);
@@ -278,7 +278,7 @@
}
private String stringIndexed[] =
- { "String 0", "String 1", "String 2", "String 3", "String 4" };
+ { "String 0", "String 1", "String 2", "String 3", "String 4" };
public String getStringIndexed(int index) {
return (stringIndexed[index]);
1.6 +4 -3
jakarta-commons/digester/src/test/org/apache/commons/digester/TestRule.java
Index: TestRule.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/TestRule.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestRule.java 9 Jan 2002 20:22:50 -0000 1.5
+++ TestRule.java 23 Jan 2002 22:38:01 -0000 1.6
@@ -60,6 +60,7 @@
import java.util.List;
+
import org.xml.sax.Attributes;
@@ -69,7 +70,7 @@
* at the identifier.</p>
*
* @author Robert Burrell Donkin
- * @revision $Revision: 1.5 $ $Date: 2002/01/09 20:22:50 $
+ * @revision $Revision: 1.6 $ $Date: 2002/01/23 22:38:01 $
*/
public class TestRule extends Rule {
@@ -98,8 +99,8 @@
*/
public TestRule(Digester digester, String identifier) {
- super(digester);
- this.identifier=identifier;
+ super(digester);
+ this.identifier = identifier;
}
1.4 +6 -6
jakarta-commons/digester/src/test/org/apache/commons/digester/TestRuleSet.java
Index: TestRuleSet.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/TestRuleSet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestRuleSet.java 9 Jan 2002 20:22:51 -0000 1.3
+++ TestRuleSet.java 23 Jan 2002 22:38:01 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/TestRuleSet.java,v
1.3 2002/01/09 20:22:51 sanders Exp $
- * $Revision: 1.3 $
- * $Date: 2002/01/09 20:22:51 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/TestRuleSet.java,v
1.4 2002/01/23 22:38:01 sanders Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/01/23 22:38:01 $
*
* ====================================================================
*
@@ -68,7 +68,7 @@
* optionally associated with a particular namespace URI.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2002/01/09 20:22:51 $
+ * @version $Revision: 1.4 $ $Date: 2002/01/23 22:38:01 $
*/
public class TestRuleSet extends RuleSetBase {
@@ -146,10 +146,10 @@
digester.addObjectCreate(prefix + "employee", Employee.class);
digester.addSetProperties(prefix + "employee");
digester.addObjectCreate("employee/address",
- "org.apache.commons.digester.Address");
+ "org.apache.commons.digester.Address");
digester.addSetProperties(prefix + "employee/address");
digester.addSetNext(prefix + "employee/address",
- "addAddress");
+ "addAddress");
}
1.4 +4 -3
jakarta-commons/digester/src/test/org/apache/commons/digester/xmlrules/DigesterLoaderTest.java
Index: DigesterLoaderTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/xmlrules/DigesterLoaderTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DigesterLoaderTest.java 9 Jan 2002 20:22:51 -0000 1.3
+++ DigesterLoaderTest.java 23 Jan 2002 22:38:01 -0000 1.4
@@ -60,10 +60,11 @@
import java.io.InputStream;
-import java.io.PrintWriter;
import java.net.URL;
import java.util.ArrayList;
+
import org.apache.commons.digester.Digester;
+
import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -120,7 +121,7 @@
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());
- if (! (root instanceof ArrayList)) {
+ if (!(root instanceof ArrayList)) {
fail("Unexpected object returned from DigesterLoader. Expected
ArrayList; got " + root.getClass().getName());
}
assertEquals(root.toString(), "[foo1 baz1 foo2, foo3 foo4]");
@@ -134,7 +135,7 @@
URL rules =
ClassLoader.getSystemResource("org/apache/commons/digester/xmlrules/testrules.xml");
InputStream input =
ClassLoader.getSystemResource("org/apache/commons/digester/xmlrules/test.xml").openStream();
Object root = DigesterLoader.load(rules, getClass().getClassLoader(),
input, new ArrayList());
- if (! (root instanceof ArrayList)) {
+ if (!(root instanceof ArrayList)) {
fail("Unexpected object returned from DigesterLoader. Expected
ArrayList; got " + root.getClass().getName());
}
assertEquals(root.toString(), "[foo1 baz1 foo2, foo3 foo4]");
1.3 +4 -0
jakarta-commons/digester/src/test/org/apache/commons/digester/xmlrules/DigesterPatternStackTest.java
Index: DigesterPatternStackTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/xmlrules/DigesterPatternStackTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DigesterPatternStackTest.java 9 Jan 2002 20:22:51 -0000 1.2
+++ DigesterPatternStackTest.java 23 Jan 2002 22:38:01 -0000 1.3
@@ -56,9 +56,12 @@
*/
package org.apache.commons.digester.xmlrules;
+
+
import junit.framework.TestCase;
import junit.framework.TestSuite;
+
/**
* This test case tests the behavior of
* DigesterRuleParser.PatternStack, a specialized stack whose
@@ -68,6 +71,7 @@
* formatted string.
*/
public class DigesterPatternStackTest extends TestCase {
+
public DigesterPatternStackTest(String testName) {
super(testName);
}
1.3 +4 -1
jakarta-commons/digester/src/test/org/apache/commons/digester/xmlrules/TestObject.java
Index: TestObject.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/test/org/apache/commons/digester/xmlrules/TestObject.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestObject.java 9 Jan 2002 20:22:51 -0000 1.2
+++ TestObject.java 23 Jan 2002 22:38:01 -0000 1.3
@@ -56,9 +56,12 @@
*/
package org.apache.commons.digester.xmlrules;
+
+
import java.util.ArrayList;
import java.util.Iterator;
+
/**
* Test harness object for holding results of digestion.
*
@@ -77,7 +80,7 @@
public String toString() {
String str = value;
- for (Iterator i = children.iterator(); i.hasNext(); ) {
+ for (Iterator i = children.iterator(); i.hasNext();) {
str += " " + i.next();
}
return str;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
