You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sk...@apache.org on 2005/02/15 04:56:58 UTC

svn commit: r153892 - in jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions: CreateObjectActionTestCase.java CreateObjectWithFactoryActionTestCase.java LinkObjectsActionTestCase.java SetNextActionTestCase.java

Author: skitching
Date: Mon Feb 14 19:56:57 2005
New Revision: 153892

URL: http://svn.apache.org/viewcvs?view=rev&rev=153892
Log:
LinkObjectsAction now provides all the functionality of
digester1.x SetNextRule, SetTopRule and SetRootRule.

Added:
    jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/LinkObjectsActionTestCase.java
      - copied, changed from r153753, jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/SetNextActionTestCase.java
Removed:
    jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/SetNextActionTestCase.java
Modified:
    jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/CreateObjectActionTestCase.java
    jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/CreateObjectWithFactoryActionTestCase.java

Modified: jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/CreateObjectActionTestCase.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/CreateObjectActionTestCase.java?view=diff&r1=153891&r2=153892
==============================================================================
--- jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/CreateObjectActionTestCase.java (original)
+++ jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/CreateObjectActionTestCase.java Mon Feb 14 19:56:57 2005
@@ -98,7 +98,7 @@
 
         Digester d = new Digester();
         d.addRule("/root/item", new CreateObjectAction(Item.class));
-        d.addRule("/root/item", new SetNextAction("addItem"));
+        d.addRule("/root/item", new LinkObjectsAction("addItem"));
 
         TestObject testObject = new TestObject();
         d.setInitialObject(testObject);

Modified: jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/CreateObjectWithFactoryActionTestCase.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/CreateObjectWithFactoryActionTestCase.java?view=diff&r1=153891&r2=153892
==============================================================================
--- jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/CreateObjectWithFactoryActionTestCase.java (original)
+++ jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/CreateObjectWithFactoryActionTestCase.java Mon Feb 14 19:56:57 2005
@@ -121,7 +121,7 @@
         Digester d = new Digester();
         d.setInitialObject(root);
         d.addRule("/root/int", new CreateObjectWithFactoryAction(factory));
-        d.addRule("/root/int", new SetNextAction("addInteger"));
+        d.addRule("/root/int", new LinkObjectsAction("addInteger"));
 
         d.parse(source);
 
@@ -153,7 +153,7 @@
         Digester d = new Digester();
         d.setInitialObject(root);
         d.addRule("/root/int", new CreateObjectWithFactoryAction(IntegerFactory.class));
-        d.addRule("/root/int", new SetNextAction("addInteger"));
+        d.addRule("/root/int", new LinkObjectsAction("addInteger"));
 
         d.parse(source);
 

Copied: jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/LinkObjectsActionTestCase.java (from r153753, jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/SetNextActionTestCase.java)
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/LinkObjectsActionTestCase.java?view=diff&rev=153892&p1=jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/SetNextActionTestCase.java&r1=153753&p2=jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/LinkObjectsActionTestCase.java&r2=153892
==============================================================================
--- jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/SetNextActionTestCase.java (original)
+++ jakarta/commons/proper/digester/branches/digester2/src/test/org/apache/commons/digester2/actions/LinkObjectsActionTestCase.java Mon Feb 14 19:56:57 2005
@@ -30,10 +30,10 @@
 import org.apache.commons.digester2.Digester;
 
 /**
- * <p>Test Cases for the SetNextAction class.</p>
+ * <p>Test Cases for the LinkObjectsAction class.</p>
  */
 
-public class SetNextActionTestCase extends TestCase {
+public class LinkObjectsActionTestCase extends TestCase {
 
     public static class Item {
     }
@@ -54,7 +54,7 @@
      *
      * @param name Name of the test case
      */
-    public SetNextActionTestCase(String name) {
+    public LinkObjectsActionTestCase(String name) {
         super(name);
     }
 
@@ -72,7 +72,7 @@
      * Return the tests included in this test suite.
      */
     public static Test suite() {
-        return (new TestSuite(SetNextActionTestCase.class));
+        return (new TestSuite(LinkObjectsActionTestCase.class));
     }
 
     /**
@@ -98,7 +98,7 @@
 
         Digester d = new Digester();
         d.addRule("/root/item", new CreateObjectAction(Item.class));
-        d.addRule("/root/item", new SetNextAction("addItem"));
+        d.addRule("/root/item", new LinkObjectsAction("addItem"));
 
         TestObject testObject = new TestObject();
         d.setInitialObject(testObject);
@@ -106,6 +106,6 @@
         
         // string was passed ok
         Item item = testObject.getItem();
-        assertNotNull("SetNextAction works", item);
+        assertNotNull("LinkObjectsAction works", item);
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org