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/12 20:03:33 UTC
svn commit: r1102402 [19/20] - in /commons/sandbox/digester3/trunk/src:
main/java/org/apache/commons/digester3/
main/java/org/apache/commons/digester3/annotations/
main/java/org/apache/commons/digester3/annotations/handlers/
main/java/org/apache/common...
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/DumperRule.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/DumperRule.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/DumperRule.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/DumperRule.java Thu May 12 18:03:26 2011
@@ -23,38 +23,44 @@ import org.apache.commons.digester3.Rule
/**
* Demonstrates the behaviour of the Delegate interface.
*/
-public class DumperRule extends Rule {
+public class DumperRule
+ extends Rule
+{
@Override
- public void begin(String namespace, String name, Attributes attributes)
- throws Exception {
- System.out.print("<");
- System.out.print(name);
-
+ public void begin( String namespace, String name, Attributes attributes )
+ throws Exception
+ {
+ System.out.print( "<" );
+ System.out.print( name );
+
int nAttributes = attributes.getLength();
- for(int i=0; i<nAttributes; ++i) {
- String key = attributes.getQName(i);
- String value = attributes.getValue(i);
- System.out.print(" ");
- System.out.print(key);
- System.out.print("=");
- System.out.print("'");
- System.out.print(value);
- System.out.print("'");
+ for ( int i = 0; i < nAttributes; ++i )
+ {
+ String key = attributes.getQName( i );
+ String value = attributes.getValue( i );
+ System.out.print( " " );
+ System.out.print( key );
+ System.out.print( "=" );
+ System.out.print( "'" );
+ System.out.print( value );
+ System.out.print( "'" );
}
- System.out.println(">");
+ System.out.println( ">" );
}
-
+
@Override
- public void body(String namespace, String name, String text)
- throws Exception {
- System.out.print(text);
+ public void body( String namespace, String name, String text )
+ throws Exception
+ {
+ System.out.print( text );
}
-
+
@Override
- public void end(String namespace, String name)
- throws Exception {
- System.out.print("</");
- System.out.print(name);
- System.out.println(">");
+ public void end( String namespace, String name )
+ throws Exception
+ {
+ System.out.print( "</" );
+ System.out.print( name );
+ System.out.println( ">" );
}
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/ObjectTestImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/ObjectTestImpl.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/ObjectTestImpl.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/ObjectTestImpl.java Thu May 12 18:03:26 2011
@@ -22,18 +22,22 @@ package org.apache.commons.digester3.plu
* Test harness object for holding results of digestion.
*/
-public class ObjectTestImpl {
+public class ObjectTestImpl
+{
private String value;
- public ObjectTestImpl() {
+ public ObjectTestImpl()
+ {
}
- public void setValue(String val) {
+ public void setValue( String val )
+ {
value = val;
}
- public String getValue() {
+ public String getValue()
+ {
return value;
}
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Slider.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Slider.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Slider.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Slider.java Thu May 12 18:03:26 2011
@@ -20,56 +20,71 @@ package org.apache.commons.digester3.plu
import org.apache.commons.digester3.Digester;
-public class Slider implements Widget {
+public class Slider
+ implements Widget
+{
private String label = "nolabel";
+
private int min = 0;
+
private int max = 0;
// define rules on this class
- public static void addRules(Digester digester, String pattern) {
- digester.addSetProperties(pattern);
-
- Class<?>[] paramtypes = {Integer.class};
- digester.addCallMethod(pattern+"/min", "setMin", 0, paramtypes);
- digester.addCallMethod(pattern+"/max", "setMax", 0, paramtypes);
+ public static void addRules( Digester digester, String pattern )
+ {
+ digester.addSetProperties( pattern );
+
+ Class<?>[] paramtypes = { Integer.class };
+ digester.addCallMethod( pattern + "/min", "setMin", 0, paramtypes );
+ digester.addCallMethod( pattern + "/max", "setMax", 0, paramtypes );
}
-
+
// define different rules on this class
- public static void addRangeRules(Digester digester, String pattern) {
+ public static void addRangeRules( Digester digester, String pattern )
+ {
// note: deliberately no addSetProperties rule
- Class<?>[] paramtypes = {Integer.class, Integer.class};
- digester.addCallMethod(pattern+"/range", "setRange", 2, paramtypes);
- digester.addCallParam(pattern+"/range", 0, "min");
- digester.addCallParam(pattern+"/range", 1, "max");
- }
-
- public Slider() {}
-
- public String getLabel() {
+ Class<?>[] paramtypes = { Integer.class, Integer.class };
+ digester.addCallMethod( pattern + "/range", "setRange", 2, paramtypes );
+ digester.addCallParam( pattern + "/range", 0, "min" );
+ digester.addCallParam( pattern + "/range", 1, "max" );
+ }
+
+ public Slider()
+ {
+ }
+
+ public String getLabel()
+ {
return label;
}
-
- public void setLabel(String label) {
+
+ public void setLabel( String label )
+ {
this.label = label;
}
-
- public void setMin(int min) {
+
+ public void setMin( int min )
+ {
this.min = min;
}
-
- public int getMin() {
+
+ public int getMin()
+ {
return min;
}
-
- public void setMax(int max) {
+
+ public void setMax( int max )
+ {
this.max = max;
}
-
- public int getMax() {
+
+ public int getMax()
+ {
return max;
}
-
- public void setRange(int min, int max) {
+
+ public void setRange( int min, int max )
+ {
this.min = min;
this.max = max;
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestConfigurablePluginAttributes.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestConfigurablePluginAttributes.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestConfigurablePluginAttributes.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestConfigurablePluginAttributes.java Thu May 12 18:03:26 2011
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-
package org.apache.commons.digester3.plugins;
import static org.junit.Assert.*;
@@ -31,66 +30,72 @@ import org.apache.commons.digester3.plug
import org.junit.Test;
/**
- * Test cases for functionality which sets what xml attributes specify
- * the plugin class or plugin declaration id.
+ * Test cases for functionality which sets what xml attributes specify the plugin class or plugin declaration id.
*/
-public class TestConfigurablePluginAttributes {
+public class TestConfigurablePluginAttributes
+{
// --------------------------------------------------------------- Test cases
@Test
- public void testDefaultBehaviour() throws Exception {
- // tests that by default the attributes used are
+ public void testDefaultBehaviour()
+ throws Exception
+ {
+ // tests that by default the attributes used are
// named "plugin-class" and "plugin-id"
Digester digester = new Digester();
- digester.setNamespaceAware(true);
+ digester.setNamespaceAware( true );
PluginRules rc = new PluginRules();
- digester.setRules(rc);
-
+ digester.setRules( rc );
+
PluginDeclarationRule pdr = new PluginDeclarationRule();
- digester.addRule("root/plugin", pdr);
-
- PluginCreateRule widgetPluginRule = new PluginCreateRule(Widget.class);
- digester.addRule("root/widget", widgetPluginRule);
- digester.addSetNext("root/widget", "addWidget");
-
- PluginCreateRule gadgetPluginRule = new PluginCreateRule(Widget.class);
- digester.addRule("root/gadget", gadgetPluginRule);
- digester.addSetNext("root/gadget", "addGadget");
+ digester.addRule( "root/plugin", pdr );
+
+ PluginCreateRule widgetPluginRule = new PluginCreateRule( Widget.class );
+ digester.addRule( "root/widget", widgetPluginRule );
+ digester.addSetNext( "root/widget", "addWidget" );
+
+ PluginCreateRule gadgetPluginRule = new PluginCreateRule( Widget.class );
+ digester.addRule( "root/gadget", gadgetPluginRule );
+ digester.addSetNext( "root/gadget", "addGadget" );
MultiContainer root = new MultiContainer();
- digester.push(root);
-
- try {
- digester.parse(
- Utils.getInputStream(this, "test7.xml"));
+ digester.push( root );
- } catch(Exception e) {
+ try
+ {
+ digester.parse( Utils.getInputStream( this, "test7.xml" ) );
+
+ }
+ catch ( Exception e )
+ {
throw e;
}
List<Widget> widgets = root.getWidgets();
- assertNotNull(widgets);
- assertEquals(4, widgets.size());
+ assertNotNull( widgets );
+ assertEquals( 4, widgets.size() );
+
+ assertEquals( TextLabel.class, widgets.get( 0 ).getClass() );
+ assertEquals( TextLabel.class, widgets.get( 1 ).getClass() );
+ assertEquals( TextLabel.class, widgets.get( 2 ).getClass() );
+ assertEquals( TextLabel.class, widgets.get( 3 ).getClass() );
- assertEquals(TextLabel.class, widgets.get(0).getClass());
- assertEquals(TextLabel.class, widgets.get(1).getClass());
- assertEquals(TextLabel.class, widgets.get(2).getClass());
- assertEquals(TextLabel.class, widgets.get(3).getClass());
-
List<Widget> gadgets = root.getGadgets();
- assertNotNull(gadgets);
- assertEquals(4, gadgets.size());
+ assertNotNull( gadgets );
+ assertEquals( 4, gadgets.size() );
- assertEquals(TextLabel.class, gadgets.get(0).getClass());
- assertEquals(TextLabel.class, gadgets.get(1).getClass());
- assertEquals(TextLabel.class, gadgets.get(2).getClass());
- assertEquals(TextLabel.class, gadgets.get(3).getClass());
+ assertEquals( TextLabel.class, gadgets.get( 0 ).getClass() );
+ assertEquals( TextLabel.class, gadgets.get( 1 ).getClass() );
+ assertEquals( TextLabel.class, gadgets.get( 2 ).getClass() );
+ assertEquals( TextLabel.class, gadgets.get( 3 ).getClass() );
}
@Test
- public void testGlobalOverride() throws Exception {
+ public void testGlobalOverride()
+ throws Exception
+ {
// Tests that using setDefaultPluginXXXX overrides behaviour for all
// PluginCreateRule instances. Also tests specifying attributes
// with "null" for namespace (ie attributes not in any namespace).
@@ -99,134 +104,146 @@ public class TestConfigurablePluginAttri
// to reset the global names after we finish here!
Digester digester = new Digester();
- digester.setNamespaceAware(true);
+ digester.setNamespaceAware( true );
PluginRules rc = new PluginRules();
- digester.setRules(rc);
+ digester.setRules( rc );
+
+ rc.setPluginIdAttribute( null, "id" );
+ rc.setPluginClassAttribute( null, "class" );
- rc.setPluginIdAttribute(null, "id");
- rc.setPluginClassAttribute(null, "class");
-
PluginDeclarationRule pdr = new PluginDeclarationRule();
- digester.addRule("root/plugin", pdr);
-
- PluginCreateRule widgetPluginRule = new PluginCreateRule(Widget.class);
- digester.addRule("root/widget", widgetPluginRule);
- digester.addSetNext("root/widget", "addWidget");
-
- PluginCreateRule gadgetPluginRule = new PluginCreateRule(Widget.class);
- digester.addRule("root/gadget", gadgetPluginRule);
- digester.addSetNext("root/gadget", "addGadget");
+ digester.addRule( "root/plugin", pdr );
+
+ PluginCreateRule widgetPluginRule = new PluginCreateRule( Widget.class );
+ digester.addRule( "root/widget", widgetPluginRule );
+ digester.addSetNext( "root/widget", "addWidget" );
+
+ PluginCreateRule gadgetPluginRule = new PluginCreateRule( Widget.class );
+ digester.addRule( "root/gadget", gadgetPluginRule );
+ digester.addSetNext( "root/gadget", "addGadget" );
MultiContainer root = new MultiContainer();
- digester.push(root);
-
- try {
- digester.parse(
- Utils.getInputStream(this, "test7.xml"));
-
- } catch(Exception e) {
+ digester.push( root );
+
+ try
+ {
+ digester.parse( Utils.getInputStream( this, "test7.xml" ) );
+
+ }
+ catch ( Exception e )
+ {
throw e;
}
List<Widget> widgets = root.getWidgets();
- assertNotNull(widgets);
- assertEquals(4, widgets.size());
+ assertNotNull( widgets );
+ assertEquals( 4, widgets.size() );
+
+ assertEquals( Slider.class, widgets.get( 0 ).getClass() );
+ assertEquals( Slider.class, widgets.get( 1 ).getClass() );
+ assertEquals( Slider.class, widgets.get( 2 ).getClass() );
+ assertEquals( Slider.class, widgets.get( 3 ).getClass() );
- assertEquals(Slider.class, widgets.get(0).getClass());
- assertEquals(Slider.class, widgets.get(1).getClass());
- assertEquals(Slider.class, widgets.get(2).getClass());
- assertEquals(Slider.class, widgets.get(3).getClass());
-
List<Widget> gadgets = root.getGadgets();
- assertNotNull(gadgets);
- assertEquals(4, gadgets.size());
+ assertNotNull( gadgets );
+ assertEquals( 4, gadgets.size() );
- assertEquals(Slider.class, gadgets.get(0).getClass());
- assertEquals(Slider.class, gadgets.get(1).getClass());
- assertEquals(Slider.class, gadgets.get(2).getClass());
- assertEquals(Slider.class, gadgets.get(3).getClass());
+ assertEquals( Slider.class, gadgets.get( 0 ).getClass() );
+ assertEquals( Slider.class, gadgets.get( 1 ).getClass() );
+ assertEquals( Slider.class, gadgets.get( 2 ).getClass() );
+ assertEquals( Slider.class, gadgets.get( 3 ).getClass() );
}
@Test
- public void testInstanceOverride() throws Exception {
+ public void testInstanceOverride()
+ throws Exception
+ {
// Tests that using setPluginXXXX overrides behaviour for only
// that particular PluginCreateRule instance. Also tests that
// attributes can be in namespaces.
Digester digester = new Digester();
- digester.setNamespaceAware(true);
+ digester.setNamespaceAware( true );
PluginRules rc = new PluginRules();
- digester.setRules(rc);
+ digester.setRules( rc );
PluginDeclarationRule pdr = new PluginDeclarationRule();
- digester.addRule("root/plugin", pdr);
+ digester.addRule( "root/plugin", pdr );
// for plugins at pattern "root/widget", use xml attributes "id" and
// "class" in the custom namespace as the values for plugin id and
- // class, not the default (and non-namespaced) values of
+ // class, not the default (and non-namespaced) values of
// "plugin-id" and "plugin-class".
- PluginCreateRule widgetPluginRule = new PluginCreateRule(Widget.class);
- widgetPluginRule.setPluginIdAttribute(
- "http://commons.apache.org/digester/plugins", "id");
- widgetPluginRule.setPluginClassAttribute(
- "http://commons.apache.org/digester/plugins", "class");
- digester.addRule("root/widget", widgetPluginRule);
- digester.addSetNext("root/widget", "addWidget");
-
- PluginCreateRule gadgetPluginRule = new PluginCreateRule(Widget.class);
- digester.addRule("root/gadget", gadgetPluginRule);
- digester.addSetNext("root/gadget", "addGadget");
+ PluginCreateRule widgetPluginRule = new PluginCreateRule( Widget.class );
+ widgetPluginRule.setPluginIdAttribute( "http://commons.apache.org/digester/plugins", "id" );
+ widgetPluginRule.setPluginClassAttribute( "http://commons.apache.org/digester/plugins", "class" );
+ digester.addRule( "root/widget", widgetPluginRule );
+ digester.addSetNext( "root/widget", "addWidget" );
+
+ PluginCreateRule gadgetPluginRule = new PluginCreateRule( Widget.class );
+ digester.addRule( "root/gadget", gadgetPluginRule );
+ digester.addSetNext( "root/gadget", "addGadget" );
MultiContainer root = new MultiContainer();
- digester.push(root);
-
- try {
- digester.parse(
- Utils.getInputStream(this, "test7.xml"));
- } catch(Exception e) {
+ digester.push( root );
+
+ try
+ {
+ digester.parse( Utils.getInputStream( this, "test7.xml" ) );
+ }
+ catch ( Exception e )
+ {
throw e;
}
List<Widget> widgets = root.getWidgets();
- assertNotNull(widgets);
- assertEquals(4, widgets.size());
+ assertNotNull( widgets );
+ assertEquals( 4, widgets.size() );
+
+ assertEquals( TextLabel2.class, widgets.get( 0 ).getClass() );
+ assertEquals( TextLabel2.class, widgets.get( 1 ).getClass() );
+ assertEquals( TextLabel2.class, widgets.get( 2 ).getClass() );
+ assertEquals( TextLabel2.class, widgets.get( 3 ).getClass() );
- assertEquals(TextLabel2.class, widgets.get(0).getClass());
- assertEquals(TextLabel2.class, widgets.get(1).getClass());
- assertEquals(TextLabel2.class, widgets.get(2).getClass());
- assertEquals(TextLabel2.class, widgets.get(3).getClass());
-
List<Widget> gadgets = root.getGadgets();
- assertNotNull(gadgets);
- assertEquals(4, gadgets.size());
+ assertNotNull( gadgets );
+ assertEquals( 4, gadgets.size() );
- assertEquals(TextLabel.class, gadgets.get(0).getClass());
- assertEquals(TextLabel.class, gadgets.get(1).getClass());
- assertEquals(TextLabel.class, gadgets.get(2).getClass());
- assertEquals(TextLabel.class, gadgets.get(3).getClass());
+ assertEquals( TextLabel.class, gadgets.get( 0 ).getClass() );
+ assertEquals( TextLabel.class, gadgets.get( 1 ).getClass() );
+ assertEquals( TextLabel.class, gadgets.get( 2 ).getClass() );
+ assertEquals( TextLabel.class, gadgets.get( 3 ).getClass() );
}
-
+
// inner classes used for testing
-
- public static class MultiContainer {
+
+ public static class MultiContainer
+ {
private LinkedList<Widget> widgets = new LinkedList<Widget>();
+
private LinkedList<Widget> gadgets = new LinkedList<Widget>();
-
- public MultiContainer() {}
-
- public void addWidget(Widget child) {
- widgets.add(child);
+
+ public MultiContainer()
+ {
+ }
+
+ public void addWidget( Widget child )
+ {
+ widgets.add( child );
}
-
- public List<Widget> getWidgets() {
+
+ public List<Widget> getWidgets()
+ {
return widgets;
}
- public void addGadget(Widget child) {
- gadgets.add(child);
+ public void addGadget( Widget child )
+ {
+ gadgets.add( child );
}
-
- public List<Widget> getGadgets() {
+
+ public List<Widget> getGadgets()
+ {
return gadgets;
}
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDeclaration.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDeclaration.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDeclaration.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDeclaration.java Thu May 12 18:03:26 2011
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-
package org.apache.commons.digester3.plugins;
import static org.junit.Assert.*;
@@ -33,48 +32,52 @@ import org.junit.Test;
* Test cases for basic PluginDeclarationRule behaviour.
*/
-public class TestDeclaration {
+public class TestDeclaration
+{
// --------------------------------------------------------------- Test cases
@Test
- public void testPredeclaration() throws Exception {
+ public void testPredeclaration()
+ throws Exception
+ {
// * tests that rules can be declared via a PluginDeclarationRule
Digester digester = new Digester();
PluginRules rc = new PluginRules();
- digester.setRules(rc);
-
+ digester.setRules( rc );
+
PluginDeclarationRule pdr = new PluginDeclarationRule();
- digester.addRule("root/plugin", pdr);
-
- PluginCreateRule pcr = new PluginCreateRule(Widget.class);
- digester.addRule("root/widget", pcr);
- digester.addSetNext("root/widget", "addChild");
+ digester.addRule( "root/plugin", pdr );
+
+ PluginCreateRule pcr = new PluginCreateRule( Widget.class );
+ digester.addRule( "root/widget", pcr );
+ digester.addSetNext( "root/widget", "addChild" );
Container root = new Container();
- digester.push(root);
-
- try {
- digester.parse(
- Utils.getInputStream(this, "test3.xml"));
+ digester.push( root );
+
+ try
+ {
+ digester.parse( Utils.getInputStream( this, "test3.xml" ) );
}
- catch(Exception e) {
+ catch ( Exception e )
+ {
throw e;
}
-
+
Object child;
List<Widget> children = root.getChildren();
- assertNotNull(children);
- assertEquals(2, children.size());
-
- child = children.get(0);
- assertNotNull(child);
- assertEquals(TextLabel.class, child.getClass());
- assertEquals("label1", ((TextLabel)child).getLabel());
-
- child = children.get(1);
- assertNotNull(child);
- assertEquals(TextLabel.class, child.getClass());
- assertEquals("label2", ((TextLabel)child).getLabel());
+ assertNotNull( children );
+ assertEquals( 2, children.size() );
+
+ child = children.get( 0 );
+ assertNotNull( child );
+ assertEquals( TextLabel.class, child.getClass() );
+ assertEquals( "label1", ( (TextLabel) child ).getLabel() );
+
+ child = children.get( 1 );
+ assertNotNull( child );
+ assertEquals( TextLabel.class, child.getClass() );
+ assertEquals( "label2", ( (TextLabel) child ).getLabel() );
}
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDefaultPlugin.java Thu May 12 18:03:26 2011
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-
package org.apache.commons.digester3.plugins;
import static org.junit.Assert.*;
@@ -33,124 +32,132 @@ import org.apache.commons.logging.impl.N
import org.junit.Test;
import org.xml.sax.SAXParseException;
-public class TestDefaultPlugin {
+public class TestDefaultPlugin
+{
// --------------------------------------------------------------- Test cases
@Test
- public void testDefaultPlugins1() throws Exception {
+ public void testDefaultPlugins1()
+ throws Exception
+ {
// * tests that when a PluginCreateRule is defined with a default
- // class, that the default class is instantiated when no class
- // or id is specified in the xml file.
+ // class, that the default class is instantiated when no class
+ // or id is specified in the xml file.
Digester digester = new Digester();
PluginRules rc = new PluginRules();
- digester.setRules(rc);
-
- PluginCreateRule pcr = new PluginCreateRule(Widget.class, TextLabel.class);
- digester.addRule("root/widget", pcr);
- digester.addSetNext("root/widget", "addChild");
+ digester.setRules( rc );
+
+ PluginCreateRule pcr = new PluginCreateRule( Widget.class, TextLabel.class );
+ digester.addRule( "root/widget", pcr );
+ digester.addSetNext( "root/widget", "addChild" );
Container root = new Container();
- digester.push(root);
-
- try {
- digester.parse(
- Utils.getInputStream(this, "test2.xml"));
+ digester.push( root );
+
+ try
+ {
+ digester.parse( Utils.getInputStream( this, "test2.xml" ) );
}
- catch(Exception e) {
+ catch ( Exception e )
+ {
throw e;
}
-
+
Object child;
List<Widget> children = root.getChildren();
- assertNotNull(children);
- assertEquals(3, children.size());
-
- child = children.get(0);
- assertNotNull(child);
- assertEquals(TextLabel.class, child.getClass());
+ assertNotNull( children );
+ assertEquals( 3, children.size() );
+
+ child = children.get( 0 );
+ assertNotNull( child );
+ assertEquals( TextLabel.class, child.getClass() );
TextLabel label1 = (TextLabel) child;
- assertEquals("label1", label1.getLabel());
-
- child = children.get(1);
- assertNotNull(child);
- assertEquals(TextLabel.class, child.getClass());
+ assertEquals( "label1", label1.getLabel() );
+
+ child = children.get( 1 );
+ assertNotNull( child );
+ assertEquals( TextLabel.class, child.getClass() );
TextLabel label2 = (TextLabel) child;
- assertEquals("label2", label2.getLabel());
-
- child = children.get(2);
- assertNotNull(child);
- assertEquals(Slider.class, child.getClass());
+ assertEquals( "label2", label2.getLabel() );
+
+ child = children.get( 2 );
+ assertNotNull( child );
+ assertEquals( Slider.class, child.getClass() );
Slider slider1 = (Slider) child;
- assertEquals("slider1", slider1.getLabel());
+ assertEquals( "slider1", slider1.getLabel() );
}
- public void testDefaultPlugins2() throws Exception {
+ public void testDefaultPlugins2()
+ throws Exception
+ {
// * tests that when there is no default plugin, it is an error
- // not to have one of plugin-class or plugin-id specified
+ // not to have one of plugin-class or plugin-id specified
Digester digester = new Digester();
PluginRules rc = new PluginRules();
- digester.setRules(rc);
-
- PluginCreateRule pcr = new PluginCreateRule(Widget.class);
- digester.addRule("root/widget", pcr);
- digester.addSetNext("root/widget", "addChild");
+ digester.setRules( rc );
+
+ PluginCreateRule pcr = new PluginCreateRule( Widget.class );
+ digester.addRule( "root/widget", pcr );
+ digester.addSetNext( "root/widget", "addChild" );
Container root = new Container();
- digester.push(root);
-
+ digester.push( root );
+
Exception exception = null;
Log oldLog = digester.getLogger();
- try {
- digester.setLogger(new NoOpLog());
- digester.parse(
- Utils.getInputStream(this, "test2.xml"));
+ try
+ {
+ digester.setLogger( new NoOpLog() );
+ digester.parse( Utils.getInputStream( this, "test2.xml" ) );
}
- catch(Exception e) {
+ catch ( Exception e )
+ {
exception = e;
}
- finally {
- digester.setLogger(oldLog);
+ finally
+ {
+ digester.setLogger( oldLog );
}
-
- assertNotNull(exception);
- assertEquals(SAXParseException.class, exception.getClass());
- assertEquals(
- PluginInvalidInputException.class,
- ((SAXParseException)exception).getException().getClass());
+
+ assertNotNull( exception );
+ assertEquals( SAXParseException.class, exception.getClass() );
+ assertEquals( PluginInvalidInputException.class, ( (SAXParseException) exception ).getException().getClass() );
}
- public void testDefaultPlugins3() throws Exception {
+ public void testDefaultPlugins3()
+ throws Exception
+ {
// * tests that the default plugin must implement or extend the
- // plugin base class.
+ // plugin base class.
Digester digester = new Digester();
PluginRules rc = new PluginRules();
- digester.setRules(rc);
+ digester.setRules( rc );
- PluginCreateRule pcr = new PluginCreateRule(Widget.class, Object.class);
- digester.addRule("root/widget", pcr);
- digester.addSetNext("root/widget", "addChild");
+ PluginCreateRule pcr = new PluginCreateRule( Widget.class, Object.class );
+ digester.addRule( "root/widget", pcr );
+ digester.addSetNext( "root/widget", "addChild" );
Container root = new Container();
- digester.push(root);
-
+ digester.push( root );
+
Exception exception = null;
Log oldLog = digester.getLogger();
- try {
- digester.setLogger(new NoOpLog());
- digester.parse(
- Utils.getInputStream(this, "test2.xml"));
+ try
+ {
+ digester.setLogger( new NoOpLog() );
+ digester.parse( Utils.getInputStream( this, "test2.xml" ) );
}
- catch(Exception e) {
+ catch ( Exception e )
+ {
exception = e;
}
- finally {
- digester.setLogger(oldLog);
+ finally
+ {
+ digester.setLogger( oldLog );
}
-
- assertNotNull(exception);
- assertEquals(SAXParseException.class, exception.getClass());
- assertEquals(
- PluginConfigurationException.class,
- ((SAXParseException)exception).getException().getClass());
+
+ assertNotNull( exception );
+ assertEquals( SAXParseException.class, exception.getClass() );
+ assertEquals( PluginConfigurationException.class, ( (SAXParseException) exception ).getException().getClass() );
}
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDelegate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDelegate.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDelegate.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestDelegate.java Thu May 12 18:03:26 2011
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-
package org.apache.commons.digester3.plugins;
import org.apache.commons.digester3.Digester;
@@ -27,31 +26,36 @@ import org.junit.Test;
* Test cases for Delegate behaviour.
*/
-public class TestDelegate {
+public class TestDelegate
+{
// --------------------------------------------------------------- Test cases
@Test
- public void testDummy() {
+ public void testDummy()
+ {
// it is an error if a TestSuite doesn't have at least one test,
// so here is one...
}
-
- public void ignoretestDelegate() throws Exception {
+
+ public void ignoretestDelegate()
+ throws Exception
+ {
// this method tests the Delegate functionality by capturing all
// data below the specified pattern, and printing it to stdout.
// I can't for the moment think how to turn this into a unit test,
// so this test is disabled.
Digester digester = new Digester();
PluginRules rc = new PluginRules();
- digester.setRules(rc);
-
+ digester.setRules( rc );
+
DumperRule dr = new DumperRule();
- digester.addRule("root", dr);
-
- try {
- digester.parse(
- Utils.getInputStream(this, "test1.xml"));
+ digester.addRule( "root", dr );
+
+ try
+ {
+ digester.parse( Utils.getInputStream( this, "test1.xml" ) );
}
- catch(Exception e) {
+ catch ( Exception e )
+ {
throw e;
}
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestInline.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestInline.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestInline.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestInline.java Thu May 12 18:03:26 2011
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-
package org.apache.commons.digester3.plugins;
import static org.junit.Assert.*;
@@ -29,104 +28,110 @@ import org.apache.commons.digester3.plug
import org.junit.Test;
/**
- * Test cases for declaration of plugin classes "inline" (ie by specifying
- * plugin-class).
+ * Test cases for declaration of plugin classes "inline" (ie by specifying plugin-class).
*/
-public class TestInline {
+public class TestInline
+{
// --------------------------------------------------------------- Test cases
@Test
- public void testInlineDeclaration() throws Exception {
+ public void testInlineDeclaration()
+ throws Exception
+ {
// * tests that plugins can be specified by class, and that the
- // correct class gets loaded.
+ // correct class gets loaded.
// * tests that autosetproperties works
// * tests that multiple different classes can be loaded via the
- // same plugin rule (ie at the same pattern).
+ // same plugin rule (ie at the same pattern).
Digester digester = new Digester();
PluginRules rc = new PluginRules();
- digester.setRules(rc);
-
- PluginCreateRule pcr = new PluginCreateRule(Widget.class);
- digester.addRule("root/widget", pcr);
- digester.addSetNext("root/widget", "addChild");
+ digester.setRules( rc );
+
+ PluginCreateRule pcr = new PluginCreateRule( Widget.class );
+ digester.addRule( "root/widget", pcr );
+ digester.addSetNext( "root/widget", "addChild" );
Container root = new Container();
- digester.push(root);
-
- try {
- digester.parse(
- Utils.getInputStream(this, "test1.xml"));
+ digester.push( root );
+
+ try
+ {
+ digester.parse( Utils.getInputStream( this, "test1.xml" ) );
}
- catch(Exception e) {
+ catch ( Exception e )
+ {
throw e;
}
-
+
Object child;
List<Widget> children = root.getChildren();
- assertNotNull(children);
- assertEquals(2, children.size());
-
- child = children.get(0);
- assertNotNull(child);
- assertEquals(TextLabel.class, child.getClass());
+ assertNotNull( children );
+ assertEquals( 2, children.size() );
+
+ child = children.get( 0 );
+ assertNotNull( child );
+ assertEquals( TextLabel.class, child.getClass() );
TextLabel label1 = (TextLabel) child;
- assertEquals("anonymous", label1.getId());
- assertEquals("1", label1.getLabel());
-
- child = children.get(1);
- assertNotNull(child);
- assertEquals(TextLabel.class, child.getClass());
+ assertEquals( "anonymous", label1.getId() );
+ assertEquals( "1", label1.getLabel() );
+
+ child = children.get( 1 );
+ assertNotNull( child );
+ assertEquals( TextLabel.class, child.getClass() );
TextLabel label2 = (TextLabel) child;
- assertEquals("L1", label2.getId());
- assertEquals("2", label2.getLabel());
+ assertEquals( "L1", label2.getId() );
+ assertEquals( "2", label2.getLabel() );
}
@Test
- public void testLeadingSlash() throws Exception {
+ public void testLeadingSlash()
+ throws Exception
+ {
// Tests that PluginRules handles patterns with a leading slash.
- //
- // This test doesn't really belong in this class. If a separate test
+ //
+ // This test doesn't really belong in this class. If a separate test
// case class is created for PluginRules, then this method should be
// moved there.
Digester digester = new Digester();
PluginRules rc = new PluginRules();
- digester.setRules(rc);
-
- PluginCreateRule pcr = new PluginCreateRule(Widget.class);
- digester.addRule("/root/widget", pcr);
- digester.addSetNext("/root/widget", "addChild");
+ digester.setRules( rc );
+
+ PluginCreateRule pcr = new PluginCreateRule( Widget.class );
+ digester.addRule( "/root/widget", pcr );
+ digester.addSetNext( "/root/widget", "addChild" );
Container root = new Container();
- digester.push(root);
-
- try {
- digester.parse(
- Utils.getInputStream(this, "test1.xml"));
+ digester.push( root );
+
+ try
+ {
+ digester.parse( Utils.getInputStream( this, "test1.xml" ) );
}
- catch(Exception e) {
+ catch ( Exception e )
+ {
throw e;
}
-
+
Object child;
List<Widget> children = root.getChildren();
- assertNotNull(children);
- assertEquals(2, children.size());
-
- child = children.get(0);
- assertNotNull(child);
- assertEquals(TextLabel.class, child.getClass());
+ assertNotNull( children );
+ assertEquals( 2, children.size() );
+
+ child = children.get( 0 );
+ assertNotNull( child );
+ assertEquals( TextLabel.class, child.getClass() );
TextLabel label1 = (TextLabel) child;
- assertEquals("anonymous", label1.getId());
- assertEquals("1", label1.getLabel());
-
- child = children.get(1);
- assertNotNull(child);
- assertEquals(TextLabel.class, child.getClass());
+ assertEquals( "anonymous", label1.getId() );
+ assertEquals( "1", label1.getLabel() );
+
+ child = children.get( 1 );
+ assertNotNull( child );
+ assertEquals( TextLabel.class, child.getClass() );
TextLabel label2 = (TextLabel) child;
- assertEquals("L1", label2.getId());
- assertEquals("2", label2.getLabel());
+ assertEquals( "L1", label2.getId() );
+ assertEquals( "2", label2.getLabel() );
}
-
+
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestLocalRules.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestLocalRules.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestLocalRules.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestLocalRules.java Thu May 12 18:03:26 2011
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-
package org.apache.commons.digester3.plugins;
import static org.junit.Assert.*;
@@ -33,128 +32,135 @@ import org.junit.Test;
* Test cases for defining custom rules on the plugin class itself.
*/
-public class TestLocalRules {
+public class TestLocalRules
+{
// --------------------------------------------------------------- Test cases
@Test
- public void testLocalRules() throws Exception {
+ public void testLocalRules()
+ throws Exception
+ {
// * tests that the plugin class can define an addRules method,
- // which gets detected and executed.
+ // which gets detected and executed.
Digester digester = new Digester();
PluginRules rc = new PluginRules();
- digester.setRules(rc);
-
+ digester.setRules( rc );
+
PluginDeclarationRule pdr = new PluginDeclarationRule();
- digester.addRule("root/plugin", pdr);
-
- PluginCreateRule pcr2 = new PluginCreateRule(Widget.class);
- digester.addRule("root/widget", pcr2);
- digester.addSetNext("root/widget", "addChild");
+ digester.addRule( "root/plugin", pdr );
+
+ PluginCreateRule pcr2 = new PluginCreateRule( Widget.class );
+ digester.addRule( "root/widget", pcr2 );
+ digester.addSetNext( "root/widget", "addChild" );
Container root = new Container();
- digester.push(root);
-
- try {
- digester.parse(
- Utils.getInputStream(this, "test4a.xml"));
+ digester.push( root );
+
+ try
+ {
+ digester.parse( Utils.getInputStream( this, "test4a.xml" ) );
}
- catch(Exception e) {
+ catch ( Exception e )
+ {
throw e;
}
-
+
Object child;
List<Widget> children = root.getChildren();
- assertNotNull(children);
- assertEquals(3, children.size());
-
+ assertNotNull( children );
+ assertEquals( 3, children.size() );
+
// min/max rules should be in effect
// setproperties should be in effect
- child = children.get(0);
- assertNotNull(child);
- assertEquals(Slider.class, child.getClass());
+ child = children.get( 0 );
+ assertNotNull( child );
+ assertEquals( Slider.class, child.getClass() );
Slider slider1 = (Slider) child;
- assertEquals("slider1", slider1.getLabel());
- assertEquals(1, slider1.getMin());
- assertEquals(2, slider1.getMax());
-
+ assertEquals( "slider1", slider1.getLabel() );
+ assertEquals( 1, slider1.getMin() );
+ assertEquals( 2, slider1.getMax() );
+
// range rules should not be in effect
// setproperties should be in effect
- child = children.get(1);
- assertNotNull(child);
- assertEquals(Slider.class, child.getClass());
+ child = children.get( 1 );
+ assertNotNull( child );
+ assertEquals( Slider.class, child.getClass() );
Slider slider2 = (Slider) child;
- assertEquals("slider2", slider2.getLabel());
- assertEquals(0, slider2.getMin());
- assertEquals(0, slider2.getMax());
-
+ assertEquals( "slider2", slider2.getLabel() );
+ assertEquals( 0, slider2.getMin() );
+ assertEquals( 0, slider2.getMax() );
+
// setproperties should be working on text label
- child = children.get(2);
- assertNotNull(child);
- assertEquals(TextLabel.class, child.getClass());
- assertEquals("text1", ((TextLabel)child).getLabel());
+ child = children.get( 2 );
+ assertNotNull( child );
+ assertEquals( TextLabel.class, child.getClass() );
+ assertEquals( "text1", ( (TextLabel) child ).getLabel() );
}
@Test
- public void testNonStandardLocalRules() throws Exception {
+ public void testNonStandardLocalRules()
+ throws Exception
+ {
// * tests that using PluginDeclarationRule to declare an alternate
- // rule method name invokes that alternate method instead (the
- // input xml specifies that a method other than addRules is to
- // be used)
+ // rule method name invokes that alternate method instead (the
+ // input xml specifies that a method other than addRules is to
+ // be used)
// * tests that if a rule method is defined, then a SetProperties
- // rule is not automatically added.
+ // rule is not automatically added.
// * tests that a SetProperties rule applying to one class doesn't
- // apply to different plugin classes mounted at the same rule.
+ // apply to different plugin classes mounted at the same rule.
Digester digester = new Digester();
PluginRules rc = new PluginRules();
- digester.setRules(rc);
-
+ digester.setRules( rc );
+
PluginDeclarationRule pdr = new PluginDeclarationRule();
- digester.addRule("root/plugin", pdr);
-
- PluginCreateRule pcr2 = new PluginCreateRule(Widget.class);
- digester.addRule("root/widget", pcr2);
- digester.addSetNext("root/widget", "addChild");
+ digester.addRule( "root/plugin", pdr );
+
+ PluginCreateRule pcr2 = new PluginCreateRule( Widget.class );
+ digester.addRule( "root/widget", pcr2 );
+ digester.addSetNext( "root/widget", "addChild" );
Container root = new Container();
- digester.push(root);
-
- try {
- digester.parse(
- Utils.getInputStream(this, "test4b.xml"));
+ digester.push( root );
+
+ try
+ {
+ digester.parse( Utils.getInputStream( this, "test4b.xml" ) );
}
- catch(Exception e) {
+ catch ( Exception e )
+ {
throw e;
}
-
+
Object child;
List<Widget> children = root.getChildren();
- assertNotNull(children);
- assertEquals(3, children.size());
-
- // min/max rules should not be in effect
+ assertNotNull( children );
+ assertEquals( 3, children.size() );
+
+ // min/max rules should not be in effect
// setproperties should not be in effect
- child = children.get(0);
- assertNotNull(child);
- assertEquals(Slider.class, child.getClass());
+ child = children.get( 0 );
+ assertNotNull( child );
+ assertEquals( Slider.class, child.getClass() );
Slider slider1 = (Slider) child;
- assertEquals("nolabel", slider1.getLabel());
- assertEquals(0, slider1.getMin());
- assertEquals(0, slider1.getMax());
-
+ assertEquals( "nolabel", slider1.getLabel() );
+ assertEquals( 0, slider1.getMin() );
+ assertEquals( 0, slider1.getMax() );
+
// range rules should be in effect
// setproperties should not be in effect
- child = children.get(1);
- assertNotNull(child);
- assertEquals(Slider.class, child.getClass());
+ child = children.get( 1 );
+ assertNotNull( child );
+ assertEquals( Slider.class, child.getClass() );
Slider slider2 = (Slider) child;
- assertEquals("nolabel", slider2.getLabel());
- assertEquals(10, slider2.getMin());
- assertEquals(20, slider2.getMax());
-
+ assertEquals( "nolabel", slider2.getLabel() );
+ assertEquals( 10, slider2.getMin() );
+ assertEquals( 20, slider2.getMax() );
+
// setproperties should be working on text label
- child = children.get(2);
- assertNotNull(child);
- assertEquals(TextLabel.class, child.getClass());
- assertEquals("text1", ((TextLabel)child).getLabel());
+ child = children.get( 2 );
+ assertNotNull( child );
+ assertEquals( TextLabel.class, child.getClass() );
+ assertEquals( "text1", ( (TextLabel) child ).getLabel() );
}
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestRecursion.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestRecursion.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestRecursion.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestRecursion.java Thu May 12 18:03:26 2011
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-
package org.apache.commons.digester3.plugins;
import static org.junit.Assert.*;
@@ -30,52 +29,59 @@ import org.apache.commons.digester3.plug
import org.junit.Test;
/**
- * Test cases for plugins with custom rules which include PluginCreateRule
- * instances, allowing recursive datastructures to be processed.
+ * Test cases for plugins with custom rules which include PluginCreateRule instances, allowing recursive datastructures
+ * to be processed.
*/
-public class TestRecursion {
+public class TestRecursion
+{
// --------------------------------------------------------------- Test cases
@Test
- public void testRecursiveRules() throws Exception {
+ public void testRecursiveRules()
+ throws Exception
+ {
// * tests that a rule can declare custom PluginCreateRules
- // that allow it to plug in instances of itself below
- // itself.
+ // that allow it to plug in instances of itself below
+ // itself.
Digester digester = new Digester();
PluginRules rc = new PluginRules();
- digester.setRules(rc);
-
+ digester.setRules( rc );
+
PluginDeclarationRule pdr = new PluginDeclarationRule();
- digester.addRule("*/plugin", pdr);
-
- PluginCreateRule pcr = new PluginCreateRule(Widget.class);
- digester.addRule("root/widget", pcr);
- digester.addSetNext("root/widget", "addChild");
+ digester.addRule( "*/plugin", pdr );
+
+ PluginCreateRule pcr = new PluginCreateRule( Widget.class );
+ digester.addRule( "root/widget", pcr );
+ digester.addSetNext( "root/widget", "addChild" );
Container root = new Container();
- digester.push(root);
-
- try {
- digester.parse(
- Utils.getInputStream(this, "test6.xml"));
+ digester.push( root );
+
+ try
+ {
+ digester.parse( Utils.getInputStream( this, "test6.xml" ) );
}
- catch(Exception e) {
+ catch ( Exception e )
+ {
throw e;
}
-
- int nDescendants = countWidgets(root);
- assertEquals(10, nDescendants);
+
+ int nDescendants = countWidgets( root );
+ assertEquals( 10, nDescendants );
}
- private int countWidgets(Container c) {
+ private int countWidgets( Container c )
+ {
List<Widget> l = c.getChildren();
int sum = 0;
- for(Widget w : l) {
- ++sum;
- if (w instanceof Container) {
- sum += countWidgets((Container) w);
+ for ( Widget w : l )
+ {
+ ++sum;
+ if ( w instanceof Container )
+ {
+ sum += countWidgets( (Container) w );
}
}
return sum;
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestRuleInfo.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestRuleInfo.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestRuleInfo.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestRuleInfo.java Thu May 12 18:03:26 2011
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-
package org.apache.commons.digester3.plugins;
import static org.junit.Assert.*;
@@ -30,138 +29,147 @@ import org.apache.commons.digester3.plug
import org.junit.Test;
/**
- * Test cases for the declaration of custom rules for a plugin using
- * a separate class to define the rules.
+ * Test cases for the declaration of custom rules for a plugin using a separate class to define the rules.
*/
-public class TestRuleInfo {
+public class TestRuleInfo
+{
// --------------------------------------------------------------- Test cases
@Test
- public void testRuleInfoExplicitClass() throws Exception {
- // * tests that custom rules can be declared on a
- // separate class by explicitly declaring the rule class.
+ public void testRuleInfoExplicitClass()
+ throws Exception
+ {
+ // * tests that custom rules can be declared on a
+ // separate class by explicitly declaring the rule class.
Digester digester = new Digester();
PluginRules rc = new PluginRules();
- digester.setRules(rc);
-
+ digester.setRules( rc );
+
PluginDeclarationRule pdr = new PluginDeclarationRule();
- digester.addRule("root/plugin", pdr);
-
- PluginCreateRule pcr = new PluginCreateRule(Widget.class);
- digester.addRule("root/widget", pcr);
- digester.addSetNext("root/widget", "addChild");
+ digester.addRule( "root/plugin", pdr );
+
+ PluginCreateRule pcr = new PluginCreateRule( Widget.class );
+ digester.addRule( "root/widget", pcr );
+ digester.addSetNext( "root/widget", "addChild" );
Container root = new Container();
- digester.push(root);
-
- try {
- digester.parse(
- Utils.getInputStream(this, "test5a.xml"));
+ digester.push( root );
+
+ try
+ {
+ digester.parse( Utils.getInputStream( this, "test5a.xml" ) );
}
- catch(Exception e) {
+ catch ( Exception e )
+ {
throw e;
}
Object child;
List<Widget> children = root.getChildren();
- assertNotNull(children);
- assertEquals(1, children.size());
-
- child = children.get(0);
- assertNotNull(child);
- assertEquals(TextLabel2.class, child.getClass());
+ assertNotNull( children );
+ assertEquals( 1, children.size() );
+
+ child = children.get( 0 );
+ assertNotNull( child );
+ assertEquals( TextLabel2.class, child.getClass() );
TextLabel2 label = (TextLabel2) child;
-
+
// id should not be mapped, label should
- assertEquals("anonymous", label.getId());
- assertEquals("std label", label.getLabel());
+ assertEquals( "anonymous", label.getId() );
+ assertEquals( "std label", label.getLabel() );
}
@Test
- public void testRuleInfoExplicitMethod() throws Exception {
- // * tests that custom rules can be declared on a
- // separate class by explicitly declaring the rule class.
- // and explicitly declaring the rule method name.
+ public void testRuleInfoExplicitMethod()
+ throws Exception
+ {
+ // * tests that custom rules can be declared on a
+ // separate class by explicitly declaring the rule class.
+ // and explicitly declaring the rule method name.
Digester digester = new Digester();
PluginRules rc = new PluginRules();
- digester.setRules(rc);
-
+ digester.setRules( rc );
+
PluginDeclarationRule pdr = new PluginDeclarationRule();
- digester.addRule("root/plugin", pdr);
-
- PluginCreateRule pcr = new PluginCreateRule(Widget.class);
- digester.addRule("root/widget", pcr);
- digester.addSetNext("root/widget", "addChild");
+ digester.addRule( "root/plugin", pdr );
+
+ PluginCreateRule pcr = new PluginCreateRule( Widget.class );
+ digester.addRule( "root/widget", pcr );
+ digester.addSetNext( "root/widget", "addChild" );
Container root = new Container();
- digester.push(root);
-
- try {
- digester.parse(
- Utils.getInputStream(this, "test5b.xml"));
+ digester.push( root );
+
+ try
+ {
+ digester.parse( Utils.getInputStream( this, "test5b.xml" ) );
}
- catch(Exception e) {
+ catch ( Exception e )
+ {
throw e;
}
Object child;
List<Widget> children = root.getChildren();
- assertNotNull(children);
- assertEquals(1, children.size());
-
- child = children.get(0);
- assertNotNull(child);
- assertEquals(TextLabel2.class, child.getClass());
+ assertNotNull( children );
+ assertEquals( 1, children.size() );
+
+ child = children.get( 0 );
+ assertNotNull( child );
+ assertEquals( TextLabel2.class, child.getClass() );
TextLabel2 label = (TextLabel2) child;
-
+
// id should not be mapped, altlabel should
- assertEquals("anonymous", label.getId());
- assertEquals("alt label", label.getLabel());
+ assertEquals( "anonymous", label.getId() );
+ assertEquals( "alt label", label.getLabel() );
}
@Test
- public void testRuleInfoAutoDetect() throws Exception {
- // * tests that custom rules can be declared on a
- // separate class with name {plugin-class}RuleInfo,
- // and they are automatically detected and loaded.
+ public void testRuleInfoAutoDetect()
+ throws Exception
+ {
+ // * tests that custom rules can be declared on a
+ // separate class with name {plugin-class}RuleInfo,
+ // and they are automatically detected and loaded.
Digester digester = new Digester();
PluginRules rc = new PluginRules();
- digester.setRules(rc);
-
+ digester.setRules( rc );
+
PluginDeclarationRule pdr = new PluginDeclarationRule();
- digester.addRule("root/plugin", pdr);
-
- PluginCreateRule pcr = new PluginCreateRule(Widget.class);
- digester.addRule("root/widget", pcr);
- digester.addSetNext("root/widget", "addChild");
+ digester.addRule( "root/plugin", pdr );
+
+ PluginCreateRule pcr = new PluginCreateRule( Widget.class );
+ digester.addRule( "root/widget", pcr );
+ digester.addSetNext( "root/widget", "addChild" );
Container root = new Container();
- digester.push(root);
-
- try {
- digester.parse(
- Utils.getInputStream(this, "test5c.xml"));
+ digester.push( root );
+
+ try
+ {
+ digester.parse( Utils.getInputStream( this, "test5c.xml" ) );
}
- catch(Exception e) {
+ catch ( Exception e )
+ {
throw e;
}
Object child;
List<Widget> children = root.getChildren();
- assertNotNull(children);
- assertEquals(1, children.size());
-
- child = children.get(0);
- assertNotNull(child);
- assertEquals(TextLabel2.class, child.getClass());
+ assertNotNull( children );
+ assertEquals( 1, children.size() );
+
+ child = children.get( 0 );
+ assertNotNull( child );
+ assertEquals( TextLabel2.class, child.getClass() );
TextLabel2 label = (TextLabel2) child;
-
+
// id should not be mapped, label should
- assertEquals("anonymous", label.getId());
- assertEquals("std label", label.getLabel());
+ assertEquals( "anonymous", label.getId() );
+ assertEquals( "std label", label.getLabel() );
}
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestXmlRuleInfo.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestXmlRuleInfo.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestXmlRuleInfo.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TestXmlRuleInfo.java Thu May 12 18:03:26 2011
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-
package org.apache.commons.digester3.plugins;
import static org.junit.Assert.*;
@@ -30,128 +29,140 @@ import org.apache.commons.digester3.plug
import org.junit.Test;
/**
- * Test cases for the declaration of custom rules for a plugin using
- * xmlrules format files.
+ * Test cases for the declaration of custom rules for a plugin using xmlrules format files.
*/
-public class TestXmlRuleInfo {
+public class TestXmlRuleInfo
+{
// --------------------------------------------------------------- Test cases
@Test
- public void testXmlRuleInfoExplicitFile() throws Exception {
- // * tests that custom rules can be declared on a
- // separate class by explicitly declaring a file containing
- // the rules, using a relative or absolute path name.
-
+ public void testXmlRuleInfoExplicitFile()
+ throws Exception
+ {
+ // * tests that custom rules can be declared on a
+ // separate class by explicitly declaring a file containing
+ // the rules, using a relative or absolute path name.
+
StringBuilder input = new StringBuilder();
- input.append("<root>");
- input.append(" <plugin");
- input.append(" id='testobject'");
- input.append(" class='org.apache.commons.digester3.plugins.ObjectTestImpl'");
- input.append(" file='src/test/resources/org/apache/commons/digester3/plugins/xmlrules1.xml'");
- input.append(" />");
- input.append(" <object plugin-id='testobject'/>");
- input.append("</root>");
+ input.append( "<root>" );
+ input.append( " <plugin" );
+ input.append( " id='testobject'" );
+ input.append( " class='org.apache.commons.digester3.plugins.ObjectTestImpl'" );
+ input.append( " file='src/test/resources/org/apache/commons/digester3/plugins/xmlrules1.xml'" );
+ input.append( " />" );
+ input.append( " <object plugin-id='testobject'/>" );
+ input.append( "</root>" );
Digester digester = new Digester();
PluginRules rc = new PluginRules();
- digester.setRules(rc);
-
+ digester.setRules( rc );
+
PluginDeclarationRule pdr = new PluginDeclarationRule();
- digester.addRule("root/plugin", pdr);
-
- PluginCreateRule pcr = new PluginCreateRule(ObjectTestImpl.class);
- digester.addRule("root/object", pcr);
-
- try {
- digester.parse(new StringReader(input.toString()));
+ digester.addRule( "root/plugin", pdr );
+
+ PluginCreateRule pcr = new PluginCreateRule( ObjectTestImpl.class );
+ digester.addRule( "root/object", pcr );
+
+ try
+ {
+ digester.parse( new StringReader( input.toString() ) );
}
- catch(Exception e) {
+ catch ( Exception e )
+ {
throw e;
}
Object root = digester.getRoot();
- assertEquals(ObjectTestImpl.class, root.getClass());
+ assertEquals( ObjectTestImpl.class, root.getClass() );
ObjectTestImpl testObject = (ObjectTestImpl) root;
- assertEquals("xmlrules1", testObject.getValue());
+ assertEquals( "xmlrules1", testObject.getValue() );
}
@Test
- public void testXmlRuleInfoExplicitResource() throws Exception {
- // * tests that custom rules can be declared on a
- // separate class by explicitly declaring the rule class.
- // and explicitly declaring a file which is somewhere in the
- // classpath.
+ public void testXmlRuleInfoExplicitResource()
+ throws Exception
+ {
+ // * tests that custom rules can be declared on a
+ // separate class by explicitly declaring the rule class.
+ // and explicitly declaring a file which is somewhere in the
+ // classpath.
StringBuilder input = new StringBuilder();
- input.append("<root>");
- input.append(" <plugin");
- input.append(" id='testobject'");
- input.append(" class='org.apache.commons.digester3.plugins.ObjectTestImpl'");
- input.append(" resource='org/apache/commons/digester3/plugins/xmlrules2.xml'");
- input.append(" />");
- input.append(" <object plugin-id='testobject'/>");
- input.append("</root>");
+ input.append( "<root>" );
+ input.append( " <plugin" );
+ input.append( " id='testobject'" );
+ input.append( " class='org.apache.commons.digester3.plugins.ObjectTestImpl'" );
+ input.append( " resource='org/apache/commons/digester3/plugins/xmlrules2.xml'" );
+ input.append( " />" );
+ input.append( " <object plugin-id='testobject'/>" );
+ input.append( "</root>" );
Digester digester = new Digester();
PluginRules rc = new PluginRules();
- digester.setRules(rc);
-
+ digester.setRules( rc );
+
PluginDeclarationRule pdr = new PluginDeclarationRule();
- digester.addRule("root/plugin", pdr);
-
- PluginCreateRule pcr = new PluginCreateRule(ObjectTestImpl.class);
- digester.addRule("root/object", pcr);
+ digester.addRule( "root/plugin", pdr );
+
+ PluginCreateRule pcr = new PluginCreateRule( ObjectTestImpl.class );
+ digester.addRule( "root/object", pcr );
- try {
- digester.parse(new StringReader(input.toString()));
+ try
+ {
+ digester.parse( new StringReader( input.toString() ) );
}
- catch(Exception e) {
+ catch ( Exception e )
+ {
throw e;
}
Object root = digester.getRoot();
- assertEquals(ObjectTestImpl.class, root.getClass());
+ assertEquals( ObjectTestImpl.class, root.getClass() );
ObjectTestImpl testObject = (ObjectTestImpl) root;
- assertEquals("xmlrules2", testObject.getValue());
+ assertEquals( "xmlrules2", testObject.getValue() );
}
@Test
- public void testXmlRuleImplicitResource() throws Exception {
- // * tests that custom rules can be declared on a
- // separate class by explicitly declaring the rule class.
- // and explicitly declaring a file which is somewhere in the
- // classpath.
+ public void testXmlRuleImplicitResource()
+ throws Exception
+ {
+ // * tests that custom rules can be declared on a
+ // separate class by explicitly declaring the rule class.
+ // and explicitly declaring a file which is somewhere in the
+ // classpath.
StringBuilder input = new StringBuilder();
- input.append("<root>");
- input.append(" <plugin");
- input.append(" id='testobject'");
- input.append(" class='org.apache.commons.digester3.plugins.ObjectTestImpl'");
- input.append(" />");
- input.append(" <object plugin-id='testobject'/>");
- input.append("</root>");
+ input.append( "<root>" );
+ input.append( " <plugin" );
+ input.append( " id='testobject'" );
+ input.append( " class='org.apache.commons.digester3.plugins.ObjectTestImpl'" );
+ input.append( " />" );
+ input.append( " <object plugin-id='testobject'/>" );
+ input.append( "</root>" );
Digester digester = new Digester();
PluginRules rc = new PluginRules();
- digester.setRules(rc);
-
+ digester.setRules( rc );
+
PluginDeclarationRule pdr = new PluginDeclarationRule();
- digester.addRule("root/plugin", pdr);
-
- PluginCreateRule pcr = new PluginCreateRule(ObjectTestImpl.class);
- digester.addRule("root/object", pcr);
+ digester.addRule( "root/plugin", pdr );
+
+ PluginCreateRule pcr = new PluginCreateRule( ObjectTestImpl.class );
+ digester.addRule( "root/object", pcr );
- try {
- digester.parse(new StringReader(input.toString()));
+ try
+ {
+ digester.parse( new StringReader( input.toString() ) );
}
- catch(Exception e) {
+ catch ( Exception e )
+ {
throw e;
}
Object root = digester.getRoot();
- assertEquals(ObjectTestImpl.class, root.getClass());
+ assertEquals( ObjectTestImpl.class, root.getClass() );
ObjectTestImpl testObject = (ObjectTestImpl) root;
- assertEquals("xmlrules-ruleinfo", testObject.getValue());
+ assertEquals( "xmlrules-ruleinfo", testObject.getValue() );
}
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel.java Thu May 12 18:03:26 2011
@@ -17,25 +17,34 @@
*/
package org.apache.commons.digester3.plugins;
-public class TextLabel implements Widget {
+public class TextLabel
+ implements Widget
+{
private String id = "anonymous";
+
private String label = "nolabel";
- public TextLabel() {}
-
- public String getId() {
+ public TextLabel()
+ {
+ }
+
+ public String getId()
+ {
return id;
}
-
- public void setId(String id) {
+
+ public void setId( String id )
+ {
this.id = id;
}
- public String getLabel() {
+ public String getLabel()
+ {
return label;
}
-
- public void setLabel(String label) {
+
+ public void setLabel( String label )
+ {
this.label = label;
}
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel2.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel2.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel2.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel2.java Thu May 12 18:03:26 2011
@@ -18,25 +18,34 @@
package org.apache.commons.digester3.plugins;
-public class TextLabel2 implements Widget {
+public class TextLabel2
+ implements Widget
+{
private String id = "anonymous";
+
private String label = "nolabel";
- public TextLabel2() {}
-
- public String getId() {
+ public TextLabel2()
+ {
+ }
+
+ public String getId()
+ {
return id;
}
-
- public void setId(String id) {
+
+ public void setId( String id )
+ {
this.id = id;
}
- public String getLabel() {
+ public String getLabel()
+ {
return label;
}
-
- public void setLabel(String label) {
+
+ public void setLabel( String label )
+ {
this.label = label;
}
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel2RuleInfo.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel2RuleInfo.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel2RuleInfo.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/TextLabel2RuleInfo.java Thu May 12 18:03:26 2011
@@ -20,16 +20,19 @@ package org.apache.commons.digester3.plu
import org.apache.commons.digester3.Digester;
-public class TextLabel2RuleInfo {
+public class TextLabel2RuleInfo
+{
// define default rules
- public static void addRules(Digester digester, String pattern) {
- digester.addCallMethod(pattern+"/id", "setId", 0);
- digester.addCallMethod(pattern+"/label", "setLabel", 0);
+ public static void addRules( Digester digester, String pattern )
+ {
+ digester.addCallMethod( pattern + "/id", "setId", 0 );
+ digester.addCallMethod( pattern + "/label", "setLabel", 0 );
}
-
+
// define different rules on this class
- public static void addAltRules(Digester digester, String pattern) {
- digester.addCallMethod(pattern+"/alt-id", "setId", 0);
- digester.addCallMethod(pattern+"/alt-label", "setLabel", 0);
+ public static void addAltRules( Digester digester, String pattern )
+ {
+ digester.addCallMethod( pattern + "/alt-id", "setId", 0 );
+ digester.addCallMethod( pattern + "/alt-label", "setLabel", 0 );
}
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Utils.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Utils.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Utils.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Utils.java Thu May 12 18:03:26 2011
@@ -25,20 +25,19 @@ import java.io.InputStream;
*
* @author Simon Kitching
*/
-public class Utils {
+public class Utils
+{
/**
- * Return an appropriate InputStream for the specified test file (which
- * must be inside our current package.
- *
+ * Return an appropriate InputStream for the specified test file (which must be inside our current package.
+ *
* @param caller is always "this" for the calling object.
* @param name is the test file we want
- *
* @exception IOException if an input/output error occurs
*/
- public static InputStream getInputStream(Object caller, String name)
- throws IOException {
- return (caller.getClass().getResourceAsStream
- ("/org/apache/commons/digester3/plugins/" + name));
+ public static InputStream getInputStream( Object caller, String name )
+ throws IOException
+ {
+ return ( caller.getClass().getResourceAsStream( "/org/apache/commons/digester3/plugins/" + name ) );
}
}
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Widget.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Widget.java?rev=1102402&r1=1102401&r2=1102402&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Widget.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/plugins/Widget.java Thu May 12 18:03:26 2011
@@ -18,6 +18,6 @@
package org.apache.commons.digester3.plugins;
-public interface Widget {
+public interface Widget
+{
}
-