From 09bb602ea7953ce96dfe1fd98de934c9c5d123aa Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Fri, 24 Oct 2008 17:49:57 +0000 Subject: QPID-1394 : Renamed file, that was miss named, to end in Test so that it is picked up by the test phase. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@707695 13f79535-47bb-0310-9956-ffa450edef68 --- .../client/MultipleJCAProviderRegistration.java | 101 --------------------- .../MultipleJCAProviderRegistrationTest.java | 101 +++++++++++++++++++++ 2 files changed, 101 insertions(+), 101 deletions(-) delete mode 100644 java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistration.java create mode 100644 java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java (limited to 'java') diff --git a/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistration.java b/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistration.java deleted file mode 100644 index 07e4eef02f..0000000000 --- a/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistration.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -package org.apache.qpid.client; - -import org.apache.qpid.test.utils.QpidTestCase; -import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry; -import org.apache.qpid.server.registry.ApplicationRegistry; -import org.apache.qpid.client.transport.TransportConnection; - -import java.io.File; -import java.security.Provider; -import java.security.Security; -import java.util.List; -import java.util.LinkedList; - -/** - * QPID-1394 : Test to ensure that the client can register their custom JCAProviders after the broker to ensure that - * the Qpid custom authentication SASL plugins are used. - */ -public class MultipleJCAProviderRegistration extends QpidTestCase -{ - public void setUp() throws Exception - { - super.setUp(); - - stopBroker(); - - final String QpidHome = System.getProperty("QPID_HOME"); - - assertNotNull("QPID_HOME not set",QpidHome); - - final File defaultaclConfigFile = new File(QpidHome, "etc/config.xml"); - - if (!defaultaclConfigFile.exists()) - { - System.err.println("Configuration file not found:" + defaultaclConfigFile); - fail("Configuration file not found:" + defaultaclConfigFile); - } - - ConfigurationFileApplicationRegistry config = new ConfigurationFileApplicationRegistry(defaultaclConfigFile); - - // This is a bit evil it should be updated with QPID-1103 - config.getConfiguration().setProperty("management.enabled", "false"); - - ApplicationRegistry.initialise(config, 1); - - TransportConnection.createVMBroker(1); - } - - public void test() throws Exception - { - // Get the providers before connection - Provider[] providers = Security.getProviders(); - - // Force the client to load the providers - getConnection(); - - Provider[] afterConnectionCreation = Security.getProviders(); - - // Find the additions - List additions = new LinkedList(); - for (Provider afterCreation : afterConnectionCreation) - { - boolean found = false; - for (Provider provider : providers) - { - if (provider == afterCreation) - { - found=true; - break; - } - } - - // Record added registies - if (!found) - { - additions.add(afterCreation); - } - } - - assertTrue("Client did not register any providers", additions.size() > 0); - } -} diff --git a/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java b/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java new file mode 100644 index 0000000000..31299ff9ff --- /dev/null +++ b/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java @@ -0,0 +1,101 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.qpid.client; + +import org.apache.qpid.test.utils.QpidTestCase; +import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry; +import org.apache.qpid.server.registry.ApplicationRegistry; +import org.apache.qpid.client.transport.TransportConnection; + +import java.io.File; +import java.security.Provider; +import java.security.Security; +import java.util.List; +import java.util.LinkedList; + +/** + * QPID-1394 : Test to ensure that the client can register their custom JCAProviders after the broker to ensure that + * the Qpid custom authentication SASL plugins are used. + */ +public class MultipleJCAProviderRegistrationTest extends QpidTestCase +{ + public void setUp() throws Exception + { + super.setUp(); + + stopBroker(); + + final String QpidHome = System.getProperty("QPID_HOME"); + + assertNotNull("QPID_HOME not set",QpidHome); + + final File defaultaclConfigFile = new File(QpidHome, "etc/config.xml"); + + if (!defaultaclConfigFile.exists()) + { + System.err.println("Configuration file not found:" + defaultaclConfigFile); + fail("Configuration file not found:" + defaultaclConfigFile); + } + + ConfigurationFileApplicationRegistry config = new ConfigurationFileApplicationRegistry(defaultaclConfigFile); + + // This is a bit evil it should be updated with QPID-1103 + config.getConfiguration().setProperty("management.enabled", "false"); + + ApplicationRegistry.initialise(config, 1); + + TransportConnection.createVMBroker(1); + } + + public void test() throws Exception + { + // Get the providers before connection + Provider[] providers = Security.getProviders(); + + // Force the client to load the providers + getConnection(); + + Provider[] afterConnectionCreation = Security.getProviders(); + + // Find the additions + List additions = new LinkedList(); + for (Provider afterCreation : afterConnectionCreation) + { + boolean found = false; + for (Provider provider : providers) + { + if (provider == afterCreation) + { + found=true; + break; + } + } + + // Record added registies + if (!found) + { + additions.add(afterCreation); + } + } + + assertTrue("Client did not register any providers", additions.size() > 0); + } +} -- cgit v1.2.1