Author: kwall
Date: Wed Feb 18 14:29:33 2015
New Revision: 1660634
URL: http://svn.apache.org/r1660634
Log:
QPID-6390: [Java Broker Tests] Remove tests that rely on presence of the Anon
Authentication Provider
Many of these tests were testing core mechanisim rather than auth provider
specific logic. Those that remained
would be more suited to a unit test.
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/StructureRestTest.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java?rev=1660634&r1=1660633&r2=1660634&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
Wed Feb 18 14:29:33 2015
@@ -36,7 +36,6 @@ import org.apache.qpid.test.utils.TestBr
public class QpidRestTestCase extends QpidBrokerTestCase
{
- public static final String ANONYMOUS_AUTHENTICATION_PROVIDER =
"testAnonymous";
public static final String EXTERNAL_AUTHENTICATION_PROVIDER =
"testExternal";
public static final String TEST1_VIRTUALHOST = "test";
@@ -88,11 +87,6 @@ public class QpidRestTestCase extends Qp
config.removeObjectConfiguration(Port.class,
TestBrokerConfiguration.ENTRY_NAME_JMX_PORT);
config.removeObjectConfiguration(Port.class,
TestBrokerConfiguration.ENTRY_NAME_RMI_PORT);
- Map<String, Object> anonymousProviderAttributes = new HashMap<String,
Object>();
- anonymousProviderAttributes.put(AuthenticationProvider.TYPE,
AnonymousAuthenticationManager.PROVIDER_TYPE);
- anonymousProviderAttributes.put(AuthenticationProvider.NAME,
ANONYMOUS_AUTHENTICATION_PROVIDER);
- config.addObjectConfiguration(AuthenticationProvider.class,
anonymousProviderAttributes);
-
config.setObjectAttribute(AuthenticationProvider.class,
TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER,
"secureOnlyMechanisms",
"{}");
Modified:
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java?rev=1660634&r1=1660633&r2=1660634&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java
Wed Feb 18 14:29:33 2015
@@ -35,7 +35,6 @@ import org.apache.qpid.server.model.Port
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.VirtualHostNode;
-import
org.apache.qpid.server.security.auth.manager.AnonymousAuthenticationManager;
import org.apache.qpid.server.virtualhost.ProvidedStoreVirtualHostImpl;
import org.apache.qpid.server.virtualhostnode.memory.MemoryVirtualHostNode;
import org.apache.qpid.systest.rest.QpidRestTestCase;
@@ -63,11 +62,6 @@ public class MBeanLifeCycleTest extends
config.addHttpManagementConfiguration();
config.setObjectAttribute(Port.class,
TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.PORT,
getRestTestHelper().getHttpPort());
- Map<String, Object> anonymousProviderAttributes = new HashMap<String,
Object>();
- anonymousProviderAttributes.put(AuthenticationProvider.TYPE,
AnonymousAuthenticationManager.PROVIDER_TYPE);
- anonymousProviderAttributes.put(AuthenticationProvider.NAME,
ANONYMOUS_AUTHENTICATION_PROVIDER);
- config.addObjectConfiguration(AuthenticationProvider.class,
anonymousProviderAttributes);
-
// set password authentication provider on http port for the tests
config.setObjectAttribute(Port.class,
TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.AUTHENTICATION_PROVIDER,
TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER);
Modified:
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java?rev=1660634&r1=1660633&r2=1660634&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java
Wed Feb 18 14:29:33 2015
@@ -46,16 +46,11 @@ public class AuthenticationProviderRestT
{
List<Map<String, Object>> providerDetails =
getRestTestHelper().getJsonAsList("authenticationprovider");
assertNotNull("Providers details cannot be null", providerDetails);
- assertEquals("Unexpected number of providers", 2,
providerDetails.size());
+ assertEquals("Unexpected number of providers", 1,
providerDetails.size());
for (Map<String, Object> provider : providerDetails)
{
boolean managesPrincipals = true;
String type =
PlainPasswordDatabaseAuthenticationManager.PROVIDER_TYPE;
- if
(ANONYMOUS_AUTHENTICATION_PROVIDER.equals(provider.get(AuthenticationProvider.NAME)))
- {
- type = AnonymousAuthenticationManager.PROVIDER_TYPE;
- managesPrincipals = false;
- }
assertProvider(managesPrincipals, type , provider);
Map<String, Object> data =
getRestTestHelper().getJsonAsSingletonList("authenticationprovider/"
+ provider.get(AuthenticationProvider.NAME));
@@ -258,53 +253,6 @@ public class AuthenticationProviderRestT
}
}
- public void
testCreateAndDeletePasswordAuthenticationProviderWithNonExistingFile() throws
Exception
- {
- stopBroker();
- getBrokerConfiguration().setSaved(false);
-
getBrokerConfiguration().removeObjectConfiguration(AuthenticationProvider.class,
TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER);
- getBrokerConfiguration().setObjectAttribute(Port.class,
TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT, Port.AUTHENTICATION_PROVIDER,
ANONYMOUS_AUTHENTICATION_PROVIDER);
- getBrokerConfiguration().setObjectAttribute(Port.class,
TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.AUTHENTICATION_PROVIDER,
ANONYMOUS_AUTHENTICATION_PROVIDER);
-
- startBroker();
-
- File file = new File(TMP_FOLDER + File.separator + getTestName());
- if (file.exists())
- {
- file.delete();
- }
- assertFalse("File " + file.getAbsolutePath() + " should not exist",
file.exists());
-
- // create provider
- String providerName = "test-provider";
- Map<String, Object> attributes = new HashMap<String, Object>();
- attributes.put(AuthenticationProvider.NAME, providerName);
- attributes.put(AuthenticationProvider.TYPE,
PlainPasswordDatabaseAuthenticationManager.PROVIDER_TYPE);
- attributes.put(ExternalFileBasedAuthenticationManager.PATH,
file.getAbsolutePath());
-
- int responseCode =
getRestTestHelper().submitRequest("authenticationprovider/" + providerName,
"PUT", attributes);
- assertEquals("Password provider was not created", 201, responseCode);
-
-
- Map<String, Object> providerDetails =
getRestTestHelper().getJsonAsSingletonList("authenticationprovider/" +
providerName);
- assertNotNull("Providers details cannot be null", providerDetails);
- assertEquals("Unexpected name", providerName,
providerDetails.get(AuthenticationProvider.NAME));
- assertEquals("Unexpected type",
PlainPasswordDatabaseAuthenticationManager.PROVIDER_TYPE,
providerDetails.get(AuthenticationProvider.TYPE));
- assertEquals("Unexpected path", file.getAbsolutePath(),
providerDetails.get(
- ExternalFileBasedAuthenticationManager.PATH));
-
- assertTrue("User file should be created", file.exists());
-
- responseCode =
getRestTestHelper().submitRequest("authenticationprovider/" + providerName ,
"DELETE");
- assertEquals("Unexpected response code for provider deletion", 200,
responseCode);
-
- List<Map<String, Object>> providers =
getRestTestHelper().getJsonAsList("authenticationprovider/" + providerName);
- assertNotNull("Providers details cannot be null", providers);
- assertEquals("Unexpected number of providers", 0, providers.size());
-
- assertFalse("File " + file.getAbsolutePath() + " should be deleted",
file.exists());
- }
-
private void assertProvider(boolean managesPrincipals, String type,
Map<String, Object> provider)
{
Asserts.assertAttributesPresent(provider,
BrokerModel.getInstance().getTypeRegistry().getAttributeNames(
Modified:
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java?rev=1660634&r1=1660633&r2=1660634&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
Wed Feb 18 14:29:33 2015
@@ -319,12 +319,12 @@ public class PortRestTest extends QpidRe
attributes = new HashMap<String, Object>();
attributes.put(Port.NAME, portName);
- attributes.put(Port.AUTHENTICATION_PROVIDER,
ANONYMOUS_AUTHENTICATION_PROVIDER);
+ attributes.put(Port.AUTHENTICATION_PROVIDER,
TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER);
responseCode = getRestTestHelper().submitRequest("port/" + portName,
"PUT", attributes);
assertEquals("Unexpected response when trying to change auth provider
to existing one", 200, responseCode);
Map<String, Object> port =
getRestTestHelper().getJsonAsSingletonList("port/" + portName);
- assertEquals("Unexpected auth provider",
ANONYMOUS_AUTHENTICATION_PROVIDER, port.get(Port.AUTHENTICATION_PROVIDER));
+ assertEquals("Unexpected auth provider",
TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER,
port.get(Port.AUTHENTICATION_PROVIDER));
}
public void testDefaultAmqpPortIsQuiescedWhenInManagementMode() throws
Exception
Modified:
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/StructureRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/StructureRestTest.java?rev=1660634&r1=1660633&r2=1660634&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/StructureRestTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/StructureRestTest.java
Wed Feb 18 14:29:33 2015
@@ -53,7 +53,7 @@ public class StructureRestTest extends Q
@SuppressWarnings("unchecked")
List<Map<String, Object>> providers = (List<Map<String, Object>>)
structure.get("authenticationproviders");
- assertEquals("Unexpected number of authentication providers", 2,
providers.size());
+ assertEquals("Unexpected number of authentication providers", 1,
providers.size());
for (String nodeName : EXPECTED_VIRTUALHOSTS)
{
Modified:
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java?rev=1660634&r1=1660633&r2=1660634&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/acl/BrokerACLTest.java
Wed Feb 18 14:29:33 2015
@@ -244,29 +244,6 @@ public class BrokerACLTest extends QpidR
assertPortDoesNotExist(portName);
}
- // TODO: test disabled until allowing the updating of active ports
outside management mode
- public void DISABLED_testSetPortAttributesAllowed() throws Exception
- {
- getRestTestHelper().setUsernameAndPassword(ALLOWED_USER, ALLOWED_USER);
-
- String portName = getTestName();
-
- int responseCode = createPort(portName);
- assertEquals("Port creation should be allowed", 201, responseCode);
-
- assertPortExists(portName);
-
-
- Map<String, Object> attributes = new HashMap<String, Object>();
- attributes.put(Port.NAME, portName);
- attributes.put(Port.AUTHENTICATION_PROVIDER,
ANONYMOUS_AUTHENTICATION_PROVIDER);
- responseCode = getRestTestHelper().submitRequest("port/" + portName,
"PUT", attributes);
- assertEquals("Setting of port attribites should be allowed", 200,
responseCode);
-
- Map<String, Object> port =
getRestTestHelper().getJsonAsSingletonList("port/" + portName);
- assertEquals("Unexpected authentication provider attribute value",
ANONYMOUS_AUTHENTICATION_PROVIDER,
- port.get(Port.AUTHENTICATION_PROVIDER));
- }
public void testSetPortAttributesDenied() throws Exception
{
@@ -284,7 +261,7 @@ public class BrokerACLTest extends QpidR
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(Port.NAME, portName);
attributes.put(Port.PROTOCOLS, Arrays.asList(Protocol.AMQP_0_9));
- attributes.put(Port.AUTHENTICATION_PROVIDER,
ANONYMOUS_AUTHENTICATION_PROVIDER);
+ attributes.put(Port.AUTHENTICATION_PROVIDER,
TestBrokerConfiguration.ENTRY_NAME_AUTHENTICATION_PROVIDER);
responseCode = getRestTestHelper().submitRequest("port/" + portName,
"PUT", attributes);
assertEquals("Setting of port attribites should be denied", 403,
responseCode);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
