[jboss-cvs] JBoss Messaging SVN: r4638 - trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 7 04:37:42 EDT 2008
Author: ataylor
Date: 2008-07-07 04:37:41 -0400 (Mon, 07 Jul 2008)
New Revision: 4638
Modified:
trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/BasicSecurityDeployerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueSettingsDeployerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java
Log:
created repository at instantiation time for injection dependency
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/BasicSecurityDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/BasicSecurityDeployerTest.java 2008-07-07 08:12:53 UTC (rev 4637)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/BasicSecurityDeployerTest.java 2008-07-07 08:37:41 UTC (rev 4638)
@@ -103,6 +103,7 @@
deployer.setJbmSecurityManager(securityManager);
EasyMock.replay(securityManager);
deploy(simpleSecurityXml);
+ EasyMock.verify(securityManager);
}
public void testSingleUserDeploySecurity() throws Exception
@@ -113,6 +114,7 @@
securityManager.addRole("guest", "guest");
EasyMock.replay(securityManager);
deploy(singleUserXml);
+ EasyMock.verify(securityManager);
}
public void testMultipleUserDeploySecurity() throws Exception
@@ -129,6 +131,7 @@
EasyMock.replay(securityManager);
deploy(multipleUserXml);
+ EasyMock.verify(securityManager);
}
public void testUndeploy() throws Exception
@@ -140,5 +143,6 @@
EasyMock.replay(securityManager);
undeploy(multipleUserXml);
+ EasyMock.verify(securityManager);
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueSettingsDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueSettingsDeployerTest.java 2008-07-07 08:12:53 UTC (rev 4637)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/QueueSettingsDeployerTest.java 2008-07-07 08:37:41 UTC (rev 4638)
@@ -24,7 +24,7 @@
import junit.framework.TestCase;
import org.easymock.EasyMock;
-import org.easymock.IArgumentMatcher;
+import org.easymock.IAnswer;
import org.jboss.messaging.core.deployers.DeploymentManager;
import org.jboss.messaging.core.deployers.impl.QueueSettingsDeployer;
import org.jboss.messaging.core.settings.HierarchicalRepository;
@@ -60,7 +60,7 @@
public void testDeploy() throws Exception
{
- QueueSettings queueSettings = new QueueSettings();
+ final QueueSettings queueSettings = new QueueSettings();
queueSettings.setClustered(false);
queueSettings.setRedeliveryDelay((long) 100);
queueSettings.setMaxSizeBytes(-100);
@@ -69,55 +69,34 @@
queueSettings.setDLQ(new SimpleString("DLQtest"));
queueSettings.setExpiryQueue(new SimpleString("ExpiryQueueTest"));
- repository.addMatch(EasyMock.eq("queues.*"), settings(queueSettings));
-
+ repository.addMatch(EasyMock.eq("queues.*"),(QueueSettings) EasyMock.anyObject());
+ EasyMock.expectLastCall().andAnswer(new IAnswer<Object>()
+ {
+ public Object answer() throws Throwable
+ {
+ QueueSettings q = (QueueSettings) EasyMock.getCurrentArguments()[1];
+ assertFalse(q.isClustered());
+ assertEquals(q.getRedeliveryDelay(), queueSettings.getRedeliveryDelay());
+ assertEquals(q.getMaxSizeBytes(), queueSettings.getMaxSizeBytes());
+ assertEquals(q.getDistributionPolicyClass(), queueSettings.getDistributionPolicyClass());
+ assertEquals(q.getMessageCounterHistoryDayLimit(), queueSettings.getMessageCounterHistoryDayLimit());
+ assertEquals(q.getDLQ(), queueSettings.getDLQ());
+ assertEquals(q.getExpiryQueue(), queueSettings.getExpiryQueue());
+ return null;
+ }
+ });
EasyMock.replay(repository);
- EasyMock.reportMatcher(new QueueSettingsMatcher(queueSettings));
queueSettingsDeployer.deploy(XMLUtil.stringToElement(conf));
+ EasyMock.verify(repository);
}
- public void testUndeploy()
+ public void testUndeploy() throws Exception
{
- repository.removeMatch(conf);
+ repository.removeMatch("queues.*");
EasyMock.replay(repository);
-
+ queueSettingsDeployer.undeploy(XMLUtil.stringToElement(conf));
+ EasyMock.verify(repository);
}
- public static QueueSettings settings(QueueSettings queueSettings)
- {
- EasyMock.reportMatcher(new QueueSettingsMatcher(queueSettings));
- return queueSettings;
- }
- static class QueueSettingsMatcher implements IArgumentMatcher
- {
- QueueSettings queueSettings;
-
- public QueueSettingsMatcher(QueueSettings queueSettings)
- {
- this.queueSettings = queueSettings;
- }
-
- public boolean matches(Object o)
- {
- QueueSettings that = (QueueSettings) o;
-
- if (!queueSettings.getDLQ().equals(that.getDLQ())) return false;
- if (!queueSettings.getExpiryQueue().equals(that.getExpiryQueue())) return false;
- if (!queueSettings.isClustered().equals(that.isClustered())) return false;
- if (!queueSettings.getDistributionPolicyClass().equals(that.getDistributionPolicyClass())) return false;
- if (!queueSettings.getMaxDeliveryAttempts().equals(that.getMaxDeliveryAttempts())) return false;
- if (!queueSettings.getMaxSizeBytes().equals(that.getMaxSizeBytes())) return false;
- if (!queueSettings.getMessageCounterHistoryDayLimit().equals(that.getMessageCounterHistoryDayLimit()))
- return false;
- if (!queueSettings.getRedeliveryDelay().equals(that.getRedeliveryDelay())) return false;
-
- return true;
- }
-
- public void appendTo(StringBuffer stringBuffer)
- {
- stringBuffer.append("Invalid Queue Settings created");
- }
- }
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java 2008-07-07 08:12:53 UTC (rev 4637)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java 2008-07-07 08:37:41 UTC (rev 4638)
@@ -32,6 +32,7 @@
import org.w3c.dom.Element;
import java.util.HashSet;
+import java.util.Set;
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
@@ -56,13 +57,13 @@
private String noRoles =
" <securityfoo match=\"queues.testQueue\">\n" +
" </securityfoo>";
- private HierarchicalRepository<HashSet<Role>> repository;
+ private HierarchicalRepository<Set<Role>> repository;
protected void setUp() throws Exception
{
repository = EasyMock.createStrictMock(HierarchicalRepository.class);
DeploymentManager deploymentManager = EasyMock.createNiceMock(DeploymentManager.class);
- deployer = new SecurityDeployer(deploymentManager, EasyMock.createStrictMock(HierarchicalRepository.class));
+ deployer = new SecurityDeployer(deploymentManager, repository);
}
public void testSingle() throws Exception
@@ -77,7 +78,8 @@
roles.add(role3);
repository.addMatch("topics.testTopic", roles);
EasyMock.replay(repository);
- deployer.deploy(e);
+ deployer.deploy(e);
+ EasyMock.verify(repository);
}
public void testMultiple() throws Exception
@@ -94,6 +96,7 @@
EasyMock.replay(repository);
deployer.deploy(XMLUtil.stringToElement(conf));
deployer.deploy(XMLUtil.stringToElement(conf2));
+ EasyMock.verify(repository);
}
public void testNoRolesAdded() throws Exception
@@ -102,6 +105,6 @@
repository.addMatch("queues.testQueue", roles);
EasyMock.replay(repository);
deployer.deploy(XMLUtil.stringToElement(noRoles));
-
+ EasyMock.verify(repository);
}
}
More information about the jboss-cvs-commits
mailing list