[jboss-cvs] JBoss Messaging SVN: r6665 - trunk/tests/src/org/jboss/messaging/tests/integration/management.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 5 13:33:58 EDT 2009
Author: jmesnil
Date: 2009-05-05 13:33:58 -0400 (Tue, 05 May 2009)
New Revision: 6665
Modified:
trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlUsingCoreTest.java
Log:
management refactoring
* "fixed" AddressControl tests
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlTest.java 2009-05-05 17:24:29 UTC (rev 6664)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlTest.java 2009-05-05 17:33:58 UTC (rev 6665)
@@ -36,7 +36,6 @@
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.management.AddressControlMBean;
-import org.jboss.messaging.core.management.RoleInfo;
import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
import org.jboss.messaging.core.security.CheckType;
@@ -131,17 +130,17 @@
newRoles.add(role);
server.getSecurityRepository().addMatch(address.toString(), newRoles);
- tabularData = addressControl.getRoles();
- assertEquals(1, tabularData.length);
- RoleInfo[] roleInfos = RoleInfo.from(tabularData);
- assertEquals(role.getName(), roleInfos[0].getName());
- assertEquals(CheckType.CONSUME.hasRole(role), roleInfos[0].isConsume());
- assertEquals(CheckType.CREATE_DURABLE_QUEUE.hasRole(role), roleInfos[0].isCreateDurableQueue());
- assertEquals(CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role), roleInfos[0].isCreateNonDurableQueue());
- assertEquals(CheckType.DELETE_DURABLE_QUEUE.hasRole(role), roleInfos[0].isDeleteDurableQueue());
- assertEquals(CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role), roleInfos[0].isDeleteNonDurableQueue());
- assertEquals(CheckType.MANAGE.hasRole(role), roleInfos[0].isManage());
- assertEquals(CheckType.SEND.hasRole(role), roleInfos[0].isSend());
+ Object[] roles = addressControl.getRoles();
+ assertEquals(1, roles.length);
+ Object[] r = (Object[])roles[0];
+ assertEquals(role.getName(), r[0]);
+ assertEquals(CheckType.SEND.hasRole(role), r[1]);
+ assertEquals(CheckType.CONSUME.hasRole(role), r[2]);
+ assertEquals(CheckType.CREATE_DURABLE_QUEUE.hasRole(role), r[3]);
+ assertEquals(CheckType.DELETE_DURABLE_QUEUE.hasRole(role), r[4]);
+ assertEquals(CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role), r[5]);
+ assertEquals(CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role), r[6]);
+ assertEquals(CheckType.MANAGE.hasRole(role), r[7]);
session.deleteQueue(queue);
}
@@ -162,8 +161,8 @@
session.createQueue(address, queue, true);
AddressControlMBean addressControl = createManagementControl(address);
- Object[] tabularData = addressControl.getRoles();
- assertEquals(0, tabularData.length);
+ Object[] roles = addressControl.getRoles();
+ assertEquals(0, roles.length);
addressControl.addRole(role.getName(),
CheckType.SEND.hasRole(role),
@@ -174,17 +173,17 @@
CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role),
CheckType.MANAGE.hasRole(role));
- tabularData = addressControl.getRoles();
- assertEquals(1, tabularData.length);
- RoleInfo[] roleInfos = RoleInfo.from(tabularData);
- assertEquals(role.getName(), roleInfos[0].getName());
- assertEquals(CheckType.CONSUME.hasRole(role), roleInfos[0].isConsume());
- assertEquals(CheckType.CREATE_DURABLE_QUEUE.hasRole(role), roleInfos[0].isCreateDurableQueue());
- assertEquals(CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role), roleInfos[0].isCreateNonDurableQueue());
- assertEquals(CheckType.DELETE_DURABLE_QUEUE.hasRole(role), roleInfos[0].isDeleteDurableQueue());
- assertEquals(CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role), roleInfos[0].isDeleteNonDurableQueue());
- assertEquals(CheckType.MANAGE.hasRole(role), roleInfos[0].isManage());
- assertEquals(CheckType.SEND.hasRole(role), roleInfos[0].isSend());
+ roles = addressControl.getRoles();
+ assertEquals(1, roles.length);
+ Object[] r = (Object[])roles[0];
+ assertEquals(role.getName(), r[0]);
+ assertEquals(CheckType.SEND.hasRole(role), r[1]);
+ assertEquals(CheckType.CONSUME.hasRole(role), r[2]);
+ assertEquals(CheckType.CREATE_DURABLE_QUEUE.hasRole(role), r[3]);
+ assertEquals(CheckType.DELETE_DURABLE_QUEUE.hasRole(role), r[4]);
+ assertEquals(CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role), r[5]);
+ assertEquals(CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role), r[6]);
+ assertEquals(CheckType.MANAGE.hasRole(role), r[7]);
session.deleteQueue(queue);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlUsingCoreTest.java 2009-05-05 17:24:29 UTC (rev 6664)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlUsingCoreTest.java 2009-05-05 17:33:58 UTC (rev 6665)
@@ -37,7 +37,6 @@
import org.jboss.messaging.core.config.impl.ConfigurationImpl;
import org.jboss.messaging.core.management.AddressControlMBean;
import org.jboss.messaging.core.management.ResourceNames;
-import org.jboss.messaging.core.management.RoleInfo;
import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
import org.jboss.messaging.core.security.CheckType;
@@ -120,25 +119,25 @@
session.createQueue(address, queue, true);
CoreMessagingProxy proxy = createProxy(address);
- Object[] data = (Object[])proxy.retrieveAttributeValue("Roles");
- assertEquals(0, data.length);
+ Object[] roles = (Object[])proxy.retrieveAttributeValue("Roles");
+ assertEquals(0, roles.length);
Set<Role> newRoles = new HashSet<Role>();
newRoles.add(role);
server.getSecurityRepository().addMatch(address.toString(), newRoles);
- data = (Object[])proxy.retrieveAttributeValue("Roles");
- assertEquals(1, data.length);
- RoleInfo[] roleInfos = RoleInfo.from(data);
- assertEquals(role.getName(), roleInfos[0].getName());
- assertEquals(CheckType.CONSUME.hasRole(role), roleInfos[0].isConsume());
- assertEquals(CheckType.CREATE_DURABLE_QUEUE.hasRole(role), roleInfos[0].isCreateDurableQueue());
- assertEquals(CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role), roleInfos[0].isCreateNonDurableQueue());
- assertEquals(CheckType.DELETE_DURABLE_QUEUE.hasRole(role), roleInfos[0].isDeleteDurableQueue());
- assertEquals(CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role), roleInfos[0].isDeleteNonDurableQueue());
- assertEquals(CheckType.MANAGE.hasRole(role), roleInfos[0].isManage());
- assertEquals(CheckType.SEND.hasRole(role), roleInfos[0].isSend());
-
+ roles = (Object[])proxy.retrieveAttributeValue("Roles");
+ assertEquals(1, roles.length);
+ Object[] r = (Object[])roles[0];
+ assertEquals(role.getName(), r[0]);
+ assertEquals(CheckType.SEND.hasRole(role), r[1]);
+ assertEquals(CheckType.CONSUME.hasRole(role), r[2]);
+ assertEquals(CheckType.CREATE_DURABLE_QUEUE.hasRole(role), r[3]);
+ assertEquals(CheckType.DELETE_DURABLE_QUEUE.hasRole(role), r[4]);
+ assertEquals(CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role), r[5]);
+ assertEquals(CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role), r[6]);
+ assertEquals(CheckType.MANAGE.hasRole(role), r[7]);
+
session.deleteQueue(queue);
}
@@ -151,8 +150,8 @@
session.createQueue(address, queue, true);
CoreMessagingProxy proxy = createProxy(address);
- Object[] data = (Object[])proxy.retrieveAttributeValue("Roles");
- assertEquals(0, data.length);
+ Object[] roles = (Object[])proxy.retrieveAttributeValue("Roles");
+ assertEquals(0, roles.length);
proxy.invokeOperation("addRole", role.getName(),
CheckType.SEND.hasRole(role),
@@ -163,19 +162,20 @@
CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role),
CheckType.MANAGE.hasRole(role));
- data = (Object[])proxy.retrieveAttributeValue("Roles");
- assertEquals(1, data.length);
- RoleInfo[] roleInfos = RoleInfo.from(data);
- assertEquals(role.getName(), roleInfos[0].getName());
- assertEquals(CheckType.CONSUME.hasRole(role), roleInfos[0].isConsume());
- assertEquals(CheckType.CREATE_DURABLE_QUEUE.hasRole(role), roleInfos[0].isCreateDurableQueue());
- assertEquals(CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role), roleInfos[0].isCreateNonDurableQueue());
- assertEquals(CheckType.DELETE_DURABLE_QUEUE.hasRole(role), roleInfos[0].isDeleteDurableQueue());
- assertEquals(CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role), roleInfos[0].isDeleteNonDurableQueue());
- assertEquals(CheckType.MANAGE.hasRole(role), roleInfos[0].isManage());
- assertEquals(CheckType.SEND.hasRole(role), roleInfos[0].isSend());
+ roles = (Object[])proxy.retrieveAttributeValue("Roles");
+ assertEquals(1, roles.length);
+ Object[] r = (Object[])roles[0];
+ assertEquals(role.getName(), r[0]);
+ assertEquals(CheckType.SEND.hasRole(role), r[1]);
+ assertEquals(CheckType.CONSUME.hasRole(role), r[2]);
+ assertEquals(CheckType.CREATE_DURABLE_QUEUE.hasRole(role), r[3]);
+ assertEquals(CheckType.DELETE_DURABLE_QUEUE.hasRole(role), r[4]);
+ assertEquals(CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role), r[5]);
+ assertEquals(CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role), r[6]);
+ assertEquals(CheckType.MANAGE.hasRole(role), r[7]);
+
session.deleteQueue(queue);
}
More information about the jboss-cvs-commits
mailing list