svn commit: r1588819 - in /commons/proper/configuration/branches/immutableNodes/src: main/java/org/apache/commons/configuration/tree/TrackedNodeModel.java test/java/org/apache/commons/configuration/tree/TestTrackedNodeModel.java

[oheger]

Author: oheger
Date: Sun Apr 20 19:18:59 2014
New Revision: 1588819

URL: http://svn.apache.org/r1588819
Log:
Adapted TrackedNodeModel to change in NodeModel interface.

The clearTree() method now returns the result of clearTree() of the underlying
model.

Modified:
    
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/TrackedNodeModel.java
    
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestTrackedNodeModel.java

Modified: 
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/TrackedNodeModel.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/TrackedNodeModel.java?rev=1588819&r1=1588818&r2=1588819&view=diff
==============================================================================
--- 
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/TrackedNodeModel.java
 (original)
+++ 
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/TrackedNodeModel.java
 Sun Apr 20 19:18:59 2014
@@ -17,6 +17,7 @@
 package org.apache.commons.configuration.tree;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -191,9 +192,10 @@ public class TrackedNodeModel implements
         getParentModel().setProperty(key, getSelector(), value, resolver);
     }
 
-    public void clearTree(String key, NodeKeyResolver<ImmutableNode> resolver)
+    public List<QueryResult<ImmutableNode>> clearTree(String key,
+            NodeKeyResolver<ImmutableNode> resolver)
     {
-        getParentModel().clearTree(key, getSelector(), resolver);
+        return getParentModel().clearTree(key, getSelector(), resolver);
     }
 
     public void clearProperty(String key,

Modified: 
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestTrackedNodeModel.java
URL: 
http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestTrackedNodeModel.java?rev=1588819&r1=1588818&r2=1588819&view=diff
==============================================================================
--- 
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestTrackedNodeModel.java
 (original)
+++ 
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestTrackedNodeModel.java
 Sun Apr 20 19:18:59 2014
@@ -19,6 +19,7 @@ package org.apache.commons.configuration
 import static org.junit.Assert.assertSame;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.easymock.EasyMock;
@@ -191,10 +192,17 @@ public class TestTrackedNodeModel
     @Test
     public void testClearTree()
     {
-        parentModel.clearTree(KEY, selector, resolver);
+        QueryResult<ImmutableNode> result =
+                QueryResult.createNodeResult(NodeStructureHelper.createNode(
+                        "test", null));
+        List<QueryResult<ImmutableNode>> removed =
+                Collections.singletonList(result);
+        EasyMock.expect(parentModel.clearTree(KEY, selector, resolver))
+                .andReturn(removed);
         EasyMock.replay(parentModel);
 
-        setUpModel().clearTree(KEY, resolver);
+        assertSame("Wrong removed elements", removed,
+                setUpModel().clearTree(KEY, resolver));
         EasyMock.verify(parentModel);
     }
 
@@ -217,7 +225,8 @@ public class TestTrackedNodeModel
     @Test
     public void testClear()
     {
-        parentModel.clearTree(null, selector, resolver);
+        EasyMock.expect(parentModel.clearTree(null, selector, resolver))
+                .andReturn(null);
         EasyMock.replay(parentModel);
 
         setUpModel().clear(resolver);