You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2014/04/05 21:44:38 UTC
svn commit: r1585182 - in
/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree:
NodeStructureHelper.java TestInMemoryNodeModelTrackedNodes.java
Author: oheger
Date: Sat Apr 5 19:44:38 2014
New Revision: 1585182
URL: http://svn.apache.org/r1585182
Log:
Added mock support for resolve add key operations.
The method for preparing a resolver mock to support add keys was moved from
TestInMemoryNodeModelTrackedNodes to NodeStructureHelper. It is useful for
other tests, too.
Modified:
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/NodeStructureHelper.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestInMemoryNodeModelTrackedNodes.java
Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/NodeStructureHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/NodeStructureHelper.java?rev=1585182&r1=1585181&r2=1585182&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/NodeStructureHelper.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/NodeStructureHelper.java Sat Apr 5 19:44:38 2014
@@ -394,6 +394,32 @@ public class NodeStructureHelper
}
/**
+ * Prepares the passed in resolver mock to resolve add keys. They are
+ * interpreted on a default expression engine.
+ *
+ * @param resolver the {@code NodeKeyResolver} mock
+ */
+ public static void expectResolveAddKeys(
+ NodeKeyResolver<ImmutableNode> resolver)
+ {
+ EasyMock.expect(
+ resolver.resolveAddKey(EasyMock.anyObject(ImmutableNode.class),
+ EasyMock.anyString(),
+ EasyMock.anyObject(TreeData.class)))
+ .andAnswer(new IAnswer<NodeAddData<ImmutableNode>>() {
+ public NodeAddData<ImmutableNode> answer() throws Throwable {
+ ImmutableNode root =
+ (ImmutableNode) EasyMock.getCurrentArguments()[0];
+ String key = (String) EasyMock.getCurrentArguments()[1];
+ TreeData handler =
+ (TreeData) EasyMock.getCurrentArguments()[2];
+ return DefaultExpressionEngine.INSTANCE.prepareAdd(
+ root, key, handler);
+ }
+ }).anyTimes();
+ }
+
+ /**
* Creates as tree with database table data based on the passed in arrays of
* table names and fields for tables. Works like the method without
* parameters, but allows defining the data of the structure.
Modified: commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestInMemoryNodeModelTrackedNodes.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestInMemoryNodeModelTrackedNodes.java?rev=1585182&r1=1585181&r2=1585182&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestInMemoryNodeModelTrackedNodes.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestInMemoryNodeModelTrackedNodes.java Sat Apr 5 19:44:38 2014
@@ -434,32 +434,6 @@ public class TestInMemoryNodeModelTracke
}
/**
- * Prepares the passed in resolver mock to resolve add keys. They are
- * interpreted on a default expression engine.
- *
- * @param resolver the {@code NodeKeyResolver} mock
- */
- private static void prepareResolverForAddKeys(
- NodeKeyResolver<ImmutableNode> resolver)
- {
- EasyMock.expect(
- resolver.resolveAddKey(EasyMock.anyObject(ImmutableNode.class),
- EasyMock.anyString(),
- EasyMock.anyObject(TreeData.class)))
- .andAnswer(new IAnswer<NodeAddData<ImmutableNode>>() {
- public NodeAddData<ImmutableNode> answer() throws Throwable {
- ImmutableNode root =
- (ImmutableNode) EasyMock.getCurrentArguments()[0];
- String key = (String) EasyMock.getCurrentArguments()[1];
- TreeData handler =
- (TreeData) EasyMock.getCurrentArguments()[2];
- return DefaultExpressionEngine.INSTANCE.prepareAdd(
- root, key, handler);
- }
- }).anyTimes();
- }
-
- /**
* Tests whether a field node was added.
*
* @param nodeFields the fields node
@@ -498,7 +472,7 @@ public class TestInMemoryNodeModelTracke
public void testAddPropertyOnTrackedNode()
{
NodeKeyResolver<ImmutableNode> resolver = createResolver(false);
- prepareResolverForAddKeys(resolver);
+ NodeStructureHelper.expectResolveAddKeys(resolver);
EasyMock.replay(resolver);
model.trackNode(selector, resolver);
model.addProperty("fields.field(-1).name", selector,
@@ -514,7 +488,7 @@ public class TestInMemoryNodeModelTracke
public void testAddPropertyOnDetachedNode()
{
NodeKeyResolver<ImmutableNode> resolver = createResolver(false);
- prepareResolverForAddKeys(resolver);
+ NodeStructureHelper.expectResolveAddKeys(resolver);
EasyMock.replay(resolver);
model.trackNode(selector, resolver);
initDetachedNode(resolver);
@@ -532,7 +506,7 @@ public class TestInMemoryNodeModelTracke
public void testAddNodesOnTrackedNode()
{
NodeKeyResolver<ImmutableNode> resolver = createResolver(false);
- prepareResolverForAddKeys(resolver);
+ NodeStructureHelper.expectResolveAddKeys(resolver);
EasyMock.replay(resolver);
model.trackNode(selector, resolver);
model.addNodes("fields", selector, Collections
@@ -549,7 +523,7 @@ public class TestInMemoryNodeModelTracke
public void testAddNodesOnDetachedNode()
{
NodeKeyResolver<ImmutableNode> resolver = createResolver(false);
- prepareResolverForAddKeys(resolver);
+ NodeStructureHelper.expectResolveAddKeys(resolver);
EasyMock.replay(resolver);
model.trackNode(selector, resolver);
initDetachedNode(resolver);