From d5b676fcd2b16ba2d416963b39df2d22828fc7d5 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Wed, 1 May 2013 12:14:40 +0000 Subject: QPID-4795: update naming of the UserManagement MBeans to remove restriction preventing there being multiple AuthenticationProviders capable of user management git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1477965 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/systest/management/jmx/UserManagementTest.java | 12 +++++++----- .../systest/rest/AuthenticationProviderRestTest.java | 17 ++--------------- .../java/org/apache/qpid/test/utils/JMXTestUtils.java | 5 +++-- 3 files changed, 12 insertions(+), 22 deletions(-) (limited to 'qpid/java/systests/src') diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java index 9fc92c98a3..9ab88f8bbf 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java @@ -23,7 +23,6 @@ import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; -import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -31,9 +30,6 @@ import javax.jms.Connection; import javax.jms.JMSException; import org.apache.qpid.management.common.mbeans.UserManagement; -import org.apache.qpid.server.model.Port; -import org.apache.qpid.server.model.Protocol; -import org.apache.qpid.server.model.Transport; import org.apache.qpid.server.plugin.AuthenticationManagerFactory; import org.apache.qpid.server.security.auth.manager.AbstractPrincipalDatabaseAuthManagerFactory; import org.apache.qpid.server.security.auth.manager.PlainPasswordFileAuthenticationManagerFactory; @@ -74,7 +70,7 @@ public class UserManagementTest extends QpidBrokerTestCase _testUserName = getTestName() + System.currentTimeMillis(); - _userManagement = _jmxUtils.getUserManagement(); + _userManagement = _jmxUtils.getUserManagement(TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER); } @@ -160,6 +156,12 @@ public class UserManagementTest extends QpidBrokerTestCase assertJmsConnectionSucceeds(_testUserName, TEST_PASSWORD); } + public void testGetAuthenticationProviderType() throws Exception + { + String actualType = _userManagement.getAuthenticationProviderType(); + assertEquals("unexpected authentication provider type", getAuthenticationManagerType(), actualType); + } + protected Passwd createPasswordEncodingUtility() { return new Passwd() diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java index 97c75d8d80..4ff0db8bc3 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java @@ -60,7 +60,7 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase } } - public void testPutCreateSecondPlainPrincipalDatabaseProviderFails() throws Exception + public void testPutCreateSecondPlainPrincipalDatabaseProviderSucceeds() throws Exception { File principalDatabase = getRestTestHelper().createTemporaryPasswdFile(new String[]{"admin2", "guest2", "test2"}); @@ -71,7 +71,7 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase attributes.put(PlainPasswordFileAuthenticationManagerFactory.ATTRIBUTE_PATH, principalDatabase.getAbsolutePath()); int responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName, "PUT", attributes); - assertEquals("Expected to fail because we can have only one password provider", 409, responseCode); + assertEquals("failed to create authentication provider", 201, responseCode); } public void testPutCreateNewAnonymousProvider() throws Exception @@ -107,19 +107,6 @@ public class AuthenticationProviderRestTest extends QpidRestTestCase assertEquals("Update with new ID should fail", 409, responseCode); } - public void testDeleteOfDefaultAuthenticationProviderFails() throws Exception - { - String providerName = TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER; - - int responseCode = getRestTestHelper().submitRequest("/rest/authenticationprovider/" + providerName , "DELETE", null); - assertEquals("Unexpected response code", 409, responseCode); - - List> providerDetails = getRestTestHelper().getJsonAsList("/rest/authenticationprovider/" + providerName); - assertNotNull("Providers details cannot be null", providerDetails); - assertEquals("Unexpected number of providers", 1, providerDetails.size()); - assertProvider(true, PlainPasswordFileAuthenticationManagerFactory.PROVIDER_TYPE, providerDetails.get(0)); - } - public void testDeleteOfUsedAuthenticationProviderFails() throws Exception { // create provider diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java index b8ca4b3f7f..4e5c4ca034 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java @@ -381,9 +381,10 @@ public class JMXTestUtils return getManagedObject(LoggingManagement.class, objectName); } - public UserManagement getUserManagement() throws MalformedObjectNameException + public UserManagement getUserManagement(String name) throws MalformedObjectNameException { - ObjectName objectName = new ObjectName("org.apache.qpid:type=UserManagement,name=UserManagement"); + String umName = ObjectName.quote(UserManagement.TYPE + "-" + name); + ObjectName objectName = new ObjectName("org.apache.qpid:type=UserManagement,name=" + umName); return getManagedObject(UserManagement.class, objectName); } -- cgit v1.2.1