You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2018/04/01 20:26:28 UTC
[21/30] qpid-broker-j git commit: QPID-8151: [Broker-J] [Unit tests]
Factor out QpidTestCase
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java
index 02f9b34..6ee283a 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueEntryListTest.java
@@ -21,29 +21,31 @@
package org.apache.qpid.server.queue;
import static org.apache.qpid.server.model.Queue.QUEUE_SCAVANGE_COUNT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import java.security.Principal;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
-import org.apache.qpid.server.logging.EventLogger;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
-import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.store.TransactionLogResource;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-
public class StandardQueueEntryListTest extends QueueEntryListTestBase
{
@@ -52,14 +54,13 @@ public class StandardQueueEntryListTest extends QueueEntryListTestBase
private ConfiguredObjectFactoryImpl _factory;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
Map<String,Object> queueAttributes = new HashMap<String, Object>();
queueAttributes.put(Queue.ID, UUID.randomUUID());
- queueAttributes.put(Queue.NAME, getName());
- final QueueManagingVirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH");
+ queueAttributes.put(Queue.NAME, getTestName());
+ final QueueManagingVirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH", this);
_testQueue = new StandardQueueImpl(queueAttributes, virtualHost);
_testQueue.open();
_sqel = _testQueue.getEntries();
@@ -84,8 +85,8 @@ public class StandardQueueEntryListTest extends QueueEntryListTestBase
{
Map<String,Object> queueAttributes = new HashMap<String, Object>();
queueAttributes.put(Queue.ID, UUID.randomUUID());
- queueAttributes.put(Queue.NAME, getName());
- final QueueManagingVirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH");
+ queueAttributes.put(Queue.NAME, getTestName());
+ final QueueManagingVirtualHost virtualHost = BrokerTestHelper.createVirtualHost("testVH", this);
StandardQueueImpl queue = new StandardQueueImpl(queueAttributes, virtualHost);
queue.open();
return queue.getEntries();
@@ -120,6 +121,7 @@ public class StandardQueueEntryListTest extends QueueEntryListTestBase
return _testQueue;
}
+ @Test
public void testScavenge() throws Exception
{
StandardQueueImpl mockQueue = mock(StandardQueueImpl.class);
@@ -142,34 +144,34 @@ public class StandardQueueEntryListTest extends QueueEntryListTestBase
//requiring a scavenge once the requested threshold of 9 deletes is passed
//Delete the 2nd message only
- assertTrue("Failed to delete QueueEntry", remove(entriesMap,2));
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap, 2));
verifyDeletedButPresentBeforeScavenge(head, 2);
//Delete messages 12 to 14
- assertTrue("Failed to delete QueueEntry", remove(entriesMap,12));
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap, 12));
verifyDeletedButPresentBeforeScavenge(head, 12);
- assertTrue("Failed to delete QueueEntry", remove(entriesMap,13));
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap, 13));
verifyDeletedButPresentBeforeScavenge(head, 13);
- assertTrue("Failed to delete QueueEntry", remove(entriesMap,14));
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap, 14));
verifyDeletedButPresentBeforeScavenge(head, 14);
//Delete message 20 only
- assertTrue("Failed to delete QueueEntry", remove(entriesMap,20));
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap, 20));
verifyDeletedButPresentBeforeScavenge(head, 20);
//Delete messages 81 to 84
- assertTrue("Failed to delete QueueEntry", remove(entriesMap,81));
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap, 81));
verifyDeletedButPresentBeforeScavenge(head, 81);
- assertTrue("Failed to delete QueueEntry", remove(entriesMap,82));
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap, 82));
verifyDeletedButPresentBeforeScavenge(head, 82);
- assertTrue("Failed to delete QueueEntry", remove(entriesMap,83));
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap, 83));
verifyDeletedButPresentBeforeScavenge(head, 83);
- assertTrue("Failed to delete QueueEntry", remove(entriesMap,84));
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap, 84));
verifyDeletedButPresentBeforeScavenge(head, 84);
//Delete message 99 - this is the 10th message deleted that is after the queue head
//and so will invoke the scavenge() which is set to go after 9 previous deletions
- assertTrue("Failed to delete QueueEntry", remove(entriesMap,99));
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap, 99));
verifyAllDeletedMessagedNotPresent(head, entriesMap);
}
@@ -190,7 +192,10 @@ public class StandardQueueEntryListTest extends QueueEntryListTestBase
for(long i = 1; i < messageId ; i++)
{
- assertEquals("Expected QueueEntry was not found in the list", i, (long) entry.getMessage().getMessageNumber());
+ assertEquals("Expected QueueEntry was not found in the list",
+ i,
+ (long) entry.getMessage().getMessageNumber());
+
entry = entry.getNextNode();
}
@@ -208,17 +213,20 @@ public class StandardQueueEntryListTest extends QueueEntryListTestBase
while (entry != null)
{
- assertFalse("Entry " + entry.getMessage().getMessageNumber() + " should not have been deleted", entry.isDeleted());
- assertNotNull("QueueEntry "+entry.getMessage().getMessageNumber()+" was not found in the list of remaining entries " + remainingMessages,
- remainingMessages.get((int)(entry.getMessage().getMessageNumber())));
+ assertFalse("Entry " + entry.getMessage().getMessageNumber() + " should not have been deleted",
+ entry.isDeleted());
+
+ assertNotNull("QueueEntry " + entry.getMessage().getMessageNumber() + " was not found in the list of remaining entries " + remainingMessages,
+ remainingMessages.get((int)(entry.getMessage().getMessageNumber())));
count++;
entry = entry.getNextNode();
}
- assertEquals("Count should have been equal",count,remainingMessages.size());
+ assertEquals("Count should have been equal", (long) count, (long) remainingMessages.size());
}
+ @Test
public void testGettingNextElement() throws Exception
{
final int numberOfEntries = 5;
@@ -262,6 +270,7 @@ public class StandardQueueEntryListTest extends QueueEntryListTestBase
assertNull("The next entry after the last should be null", next);
}
+ @Test
public void testGetLesserOldestEntry()
{
StandardQueueEntryList queueEntryList = new StandardQueueEntryList(_testQueue, _testQueue.getQueueStatistics());
@@ -270,10 +279,10 @@ public class StandardQueueEntryListTest extends QueueEntryListTestBase
assertEquals("Unexpected last message", entry1, queueEntryList.getLeastSignificantOldestEntry());
queueEntryList.add(createServerMessage(2), null);
- assertEquals("Unexpected last message", entry1, queueEntryList.getLeastSignificantOldestEntry());
+ assertEquals("Unexpected last message", entry1, queueEntryList.getLeastSignificantOldestEntry());
queueEntryList.add(createServerMessage(3), null);
- assertEquals("Unexpected last message", entry1, queueEntryList.getLeastSignificantOldestEntry());
+ assertEquals("Unexpected last message", entry1, queueEntryList.getLeastSignificantOldestEntry());
}
private ServerMessage createServerMessage(final long id)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
index 625bc50..89444ed 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
@@ -20,6 +20,10 @@
*/
package org.apache.qpid.server.queue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashMap;
@@ -28,6 +32,8 @@ import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.junit.Test;
+
import org.apache.qpid.server.consumer.ConsumerOption;
import org.apache.qpid.server.consumer.TestConsumerTarget;
import org.apache.qpid.server.message.MessageInstance;
@@ -38,10 +44,10 @@ import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.store.MessageDurability;
import org.apache.qpid.server.store.MessageEnqueueRecord;
import org.apache.qpid.server.virtualhost.QueueManagingVirtualHost;
-
public class StandardQueueTest extends AbstractQueueTestBase
{
+ @Test
public void testAutoDeleteQueue() throws Exception
{
getQueue().close();
@@ -61,8 +67,7 @@ public class StandardQueueTest extends AbstractQueueTestBase
getQueue().enqueue(message, null, null);
consumer.close();
- assertTrue("Queue was not deleted when consumer was removed",
- getQueue().isDeleted());
+ assertTrue("Queue was not deleted when consumer was removed", getQueue().isDeleted());
}
@@ -91,11 +96,9 @@ public class StandardQueueTest extends AbstractQueueTestBase
// assert received messages
List<MessageInstance> messages = consumer.getMessages();
- assertEquals("Only 2 messages should be returned", 2, messages.size());
- assertEquals("ID of first message should be 1", 1l,
- (messages.get(0).getMessage()).getMessageNumber());
- assertEquals("ID of second message should be 3", 3l,
- (messages.get(1).getMessage()).getMessageNumber());
+ assertEquals("Only 2 messages should be returned", (long) 2, (long) messages.size());
+ assertEquals("ID of first message should be 1", 1l, (messages.get(0).getMessage()).getMessageNumber());
+ assertEquals("ID of second message should be 3", 3l, (messages.get(1).getMessage()).getMessageNumber());
}
/**
@@ -169,6 +172,7 @@ public class StandardQueueTest extends AbstractQueueTestBase
verifyReceivedMessages(expected, consumer.getMessages());
}
+ @Test
public void testNonDurableImpliesMessageDurabilityNever() throws Exception
{
getQueue().close();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
index 441d000..2d94b82 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
@@ -21,6 +21,11 @@ package org.apache.qpid.server.security;
import static org.apache.qpid.server.security.FileTrustStoreTest.SYMMETRIC_KEY_KEYSTORE_RESOURCE;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -30,6 +35,9 @@ import java.util.Map;
import javax.net.ssl.KeyManager;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
@@ -41,10 +49,10 @@ import org.apache.qpid.server.model.KeyStore;
import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.util.DataUrlUtils;
import org.apache.qpid.server.util.FileUtils;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestSSLConstants;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class FileKeyStoreTest extends QpidTestCase
+public class FileKeyStoreTest extends UnitTestBase
{
static final String EMPTY_KEYSTORE_RESOURCE = "/ssl/test_empty_keystore.jks";
static final String KEYSTORE_CERTIFICATE_ONLY_RESOURCE = "/ssl/test_cert_only_keystore.pkcs12";
@@ -55,10 +63,9 @@ public class FileKeyStoreTest extends QpidTestCase
private final ConfiguredObjectFactory _factory = _model.getObjectFactory();
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
when(_broker.getTaskExecutor()).thenReturn(_taskExecutor);
when(_broker.getChildExecutor()).thenReturn(_taskExecutor);
@@ -68,6 +75,7 @@ public class FileKeyStoreTest extends QpidTestCase
when(_broker.getTypeClass()).thenReturn(Broker.class);
}
+ @Test
public void testCreateKeyStoreFromFile_Success() throws Exception
{
Map<String,Object> attributes = new HashMap<>();
@@ -79,10 +87,11 @@ public class FileKeyStoreTest extends QpidTestCase
KeyManager[] keyManager = fileKeyStore.getKeyManagers();
assertNotNull(keyManager);
- assertEquals("Unexpected number of key managers", 1, keyManager.length);
+ assertEquals("Unexpected number of key managers", (long) 1, (long) keyManager.length);
assertNotNull("Key manager unexpected null", keyManager[0]);
}
+ @Test
public void testCreateKeyStoreWithAliasFromFile_Success() throws Exception
{
Map<String,Object> attributes = new HashMap<>();
@@ -95,10 +104,11 @@ public class FileKeyStoreTest extends QpidTestCase
KeyManager[] keyManager = fileKeyStore.getKeyManagers();
assertNotNull(keyManager);
- assertEquals("Unexpected number of key managers", 1, keyManager.length);
+ assertEquals("Unexpected number of key managers", (long) 1, (long) keyManager.length);
assertNotNull("Key manager unexpected null", keyManager[0]);
}
+ @Test
public void testCreateKeyStoreFromFile_WrongPassword() throws Exception
{
Map<String,Object> attributes = new HashMap<>();
@@ -114,10 +124,13 @@ public class FileKeyStoreTest extends QpidTestCase
catch (IllegalConfigurationException ice)
{
String message = ice.getMessage();
- assertTrue("Exception text not as unexpected:" + message, message.contains("Check key store password"));
+ assertTrue("Exception text not as unexpected:" + message,
+ message.contains("Check key store password"));
+
}
}
+ @Test
public void testCreateKeyStoreFromFile_UnknownAlias() throws Exception
{
Map<String,Object> attributes = new HashMap<>();
@@ -134,10 +147,12 @@ public class FileKeyStoreTest extends QpidTestCase
catch (IllegalConfigurationException ice)
{
String message = ice.getMessage();
- assertTrue("Exception text not as unexpected:" + message, message.contains("Cannot find a certificate with alias 'notknown' in key store"));
+ assertTrue("Exception text not as unexpected:" + message,
+ message.contains("Cannot find a certificate with alias 'notknown' in key store"));
}
}
+ @Test
public void testCreateKeyStoreFromFile_NonKeyAlias() throws Exception
{
Map<String,Object> attributes = new HashMap<>();
@@ -154,10 +169,12 @@ public class FileKeyStoreTest extends QpidTestCase
catch (IllegalConfigurationException ice)
{
String message = ice.getMessage();
- assertTrue("Exception text not as unexpected:" + message, message.contains("does not identify a private key"));
+ assertTrue("Exception text not as unexpected:" + message,
+ message.contains("does not identify a private key"));
}
}
+ @Test
public void testCreateKeyStoreFromDataUrl_Success() throws Exception
{
String trustStoreAsDataUrl = createDataUrlForFile(TestSSLConstants.BROKER_KEYSTORE);
@@ -171,10 +188,11 @@ public class FileKeyStoreTest extends QpidTestCase
KeyManager[] keyManagers = fileKeyStore.getKeyManagers();
assertNotNull(keyManagers);
- assertEquals("Unexpected number of key managers", 1, keyManagers.length);
+ assertEquals("Unexpected number of key managers", (long) 1, (long) keyManagers.length);
assertNotNull("Key manager unexpected null", keyManagers[0]);
}
+ @Test
public void testCreateKeyStoreWithAliasFromDataUrl_Success() throws Exception
{
String trustStoreAsDataUrl = createDataUrlForFile(TestSSLConstants.BROKER_KEYSTORE);
@@ -189,10 +207,11 @@ public class FileKeyStoreTest extends QpidTestCase
KeyManager[] keyManagers = fileKeyStore.getKeyManagers();
assertNotNull(keyManagers);
- assertEquals("Unexpected number of key managers", 1, keyManagers.length);
+ assertEquals("Unexpected number of key managers", (long) 1, (long) keyManagers.length);
assertNotNull("Key manager unexpected null", keyManagers[0]);
}
+ @Test
public void testCreateKeyStoreFromDataUrl_WrongPassword() throws Exception
{
String keyStoreAsDataUrl = createDataUrlForFile(TestSSLConstants.BROKER_KEYSTORE);
@@ -210,10 +229,12 @@ public class FileKeyStoreTest extends QpidTestCase
catch (IllegalConfigurationException ice)
{
String message = ice.getMessage();
- assertTrue("Exception text not as unexpected:" + message, message.contains("Check key store password"));
+ assertTrue("Exception text not as unexpected:" + message,
+ message.contains("Check key store password"));
}
}
+ @Test
public void testCreateKeyStoreFromDataUrl_BadKeystoreBytes() throws Exception
{
String keyStoreAsDataUrl = DataUrlUtils.getDataUrlForBytes("notatruststore".getBytes());
@@ -231,11 +252,12 @@ public class FileKeyStoreTest extends QpidTestCase
catch (IllegalConfigurationException ice)
{
String message = ice.getMessage();
- assertTrue("Exception text not as unexpected:" + message, message.contains("Cannot instantiate key store"));
-
+ assertTrue("Exception text not as unexpected:" + message,
+ message.contains("Cannot instantiate key store"));
}
}
+ @Test
public void testCreateKeyStoreFromDataUrl_UnknownAlias() throws Exception
{
String keyStoreAsDataUrl = createDataUrlForFile(TestSSLConstants.BROKER_KEYSTORE);
@@ -254,10 +276,12 @@ public class FileKeyStoreTest extends QpidTestCase
catch (IllegalConfigurationException ice)
{
String message = ice.getMessage();
- assertTrue("Exception text not as unexpected:" + message, message.contains("Cannot find a certificate with alias 'notknown' in key store"));
+ assertTrue("Exception text not as unexpected:" + message,
+ message.contains("Cannot find a certificate with alias 'notknown' in key store"));
}
}
+ @Test
public void testEmptyKeystoreRejected() throws Exception
{
final URL emptyKeystore = getClass().getResource(EMPTY_KEYSTORE_RESOURCE);
@@ -279,6 +303,7 @@ public class FileKeyStoreTest extends QpidTestCase
}
}
+ @Test
public void testKeystoreWithNoPrivateKeyRejected()
{
final URL keystoreUrl = getClass().getResource(KEYSTORE_CERTIFICATE_ONLY_RESOURCE);
@@ -298,10 +323,12 @@ public class FileKeyStoreTest extends QpidTestCase
catch (IllegalConfigurationException ice)
{
String message = ice.getMessage();
- assertTrue("Exception text not as unexpected:" + message, message.contains("must contain at least one private key"));
+ assertTrue("Exception text not as unexpected:" + message,
+ message.contains("must contain at least one private key"));
}
}
+ @Test
public void testSymmetricKeysIgnored()
{
final URL keystoreUrl = getClass().getResource(SYMMETRIC_KEY_KEYSTORE_RESOURCE);
@@ -317,6 +344,7 @@ public class FileKeyStoreTest extends QpidTestCase
assertNotNull(keyStore);
}
+ @Test
public void testUpdateKeyStore_Success() throws Exception
{
Map<String,Object> attributes = new HashMap<>();
@@ -339,7 +367,8 @@ public class FileKeyStoreTest extends QpidTestCase
catch (IllegalConfigurationException ice)
{
String message = ice.getMessage();
- assertTrue("Exception text not as unexpected:" + message, message.contains("Cannot find a certificate with alias 'notknown' in key store"));
+ assertTrue("Exception text not as unexpected:" + message,
+ message.contains("Cannot find a certificate with alias 'notknown' in key store"));
}
assertNull("Unexpected alias value after failed change", fileKeyStore.getCertificateAlias());
@@ -350,8 +379,8 @@ public class FileKeyStoreTest extends QpidTestCase
fileKeyStore.setAttributes(changedAttributes);
assertEquals("Unexpected alias value after change that is expected to be successful",
- TestSSLConstants.BROKER_KEYSTORE_ALIAS,
- fileKeyStore.getCertificateAlias());
+ TestSSLConstants.BROKER_KEYSTORE_ALIAS,
+ fileKeyStore.getCertificateAlias());
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
index 06be7a0..f4243e2 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
@@ -22,6 +22,15 @@ package org.apache.qpid.server.security;
import static org.apache.qpid.server.security.FileKeyStoreTest.EMPTY_KEYSTORE_RESOURCE;
import static org.apache.qpid.server.transport.network.security.ssl.SSLUtil.getInitializedKeyStore;
+import static org.apache.qpid.test.utils.JvmVendor.IBM;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -39,6 +48,9 @@ import java.util.Map;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
@@ -51,10 +63,10 @@ import org.apache.qpid.server.model.TrustStore;
import org.apache.qpid.server.transport.network.security.ssl.QpidPeersOnlyTrustManager;
import org.apache.qpid.server.util.DataUrlUtils;
import org.apache.qpid.server.util.FileUtils;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestSSLConstants;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class FileTrustStoreTest extends QpidTestCase
+public class FileTrustStoreTest extends UnitTestBase
{
static final String KEYSTORE_PK_ONLY_RESOURCE = "/ssl/test_pk_only_keystore.pkcs12";
static final String SYMMETRIC_KEY_KEYSTORE_RESOURCE = "/ssl/test_symmetric_key_keystore.pkcs12";
@@ -65,10 +77,9 @@ public class FileTrustStoreTest extends QpidTestCase
private final Model _model = BrokerModel.getInstance();
private final ConfiguredObjectFactory _factory = _model.getObjectFactory();
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
when(_broker.getTaskExecutor()).thenReturn(_taskExecutor);
when(_broker.getChildExecutor()).thenReturn(_taskExecutor);
@@ -79,6 +90,7 @@ public class FileTrustStoreTest extends QpidTestCase
when(_broker.getTypeClass()).thenReturn(Broker.class);
}
+ @Test
public void testCreateTrustStoreFromFile_Success() throws Exception
{
Map<String,Object> attributes = new HashMap<>();
@@ -90,10 +102,11 @@ public class FileTrustStoreTest extends QpidTestCase
TrustManager[] trustManagers = fileTrustStore.getTrustManagers();
assertNotNull(trustManagers);
- assertEquals("Unexpected number of trust managers", 1, trustManagers.length);
+ assertEquals("Unexpected number of trust managers", (long) 1, (long) trustManagers.length);
assertNotNull("Trust manager unexpected null", trustManagers[0]);
}
+ @Test
public void testCreateTrustStoreFromFile_WrongPassword() throws Exception
{
Map<String,Object> attributes = new HashMap<>();
@@ -109,10 +122,13 @@ public class FileTrustStoreTest extends QpidTestCase
catch (IllegalConfigurationException ice)
{
String message = ice.getMessage();
- assertTrue("Exception text not as unexpected:" + message, message.contains("Check trust store password"));
+ assertTrue("Exception text not as unexpected:" + message,
+ message.contains("Check trust store password"));
+
}
}
+ @Test
public void testCreatePeersOnlyTrustStoreFromFile_Success() throws Exception
{
Map<String,Object> attributes = new HashMap<>();
@@ -125,13 +141,20 @@ public class FileTrustStoreTest extends QpidTestCase
TrustManager[] trustManagers = fileTrustStore.getTrustManagers();
assertNotNull(trustManagers);
- assertEquals("Unexpected number of trust managers", 1, trustManagers.length);
+ assertEquals("Unexpected number of trust managers", (long) 1, (long) trustManagers.length);
assertNotNull("Trust manager unexpected null", trustManagers[0]);
- assertTrue("Trust manager unexpected null", trustManagers[0] instanceof QpidPeersOnlyTrustManager);
+ final boolean condition = trustManagers[0] instanceof QpidPeersOnlyTrustManager;
+ assertTrue("Trust manager unexpected null", condition);
}
+ @Test
public void testUseOfExpiredTrustAnchorAllowed() throws Exception
{
+ // https://www.ibm.com/support/knowledgecenter/en/SSYKE2_8.0.0/com.ibm.java.security.component.80.doc/security-
+ assumeThat("IBMJSSE2 trust factory (IbmX509) validates the entire chain, including trusted certificates.",
+ getJvmVendor(),
+ is(not(equalTo(IBM))));
+
Map<String,Object> attributes = new HashMap<>();
attributes.put(FileTrustStore.NAME, "myFileTrustStore");
attributes.put(FileTrustStore.STORE_URL, TestSSLConstants.BROKER_EXPIRED_TRUSTSTORE);
@@ -141,8 +164,9 @@ public class FileTrustStoreTest extends QpidTestCase
TrustManager[] trustManagers = trustStore.getTrustManagers();
assertNotNull(trustManagers);
- assertEquals("Unexpected number of trust managers", 1, trustManagers.length);
- assertTrue("Unexpected trust manager type",trustManagers[0] instanceof X509TrustManager);
+ assertEquals("Unexpected number of trust managers", (long) 1, (long) trustManagers.length);
+ final boolean condition = trustManagers[0] instanceof X509TrustManager;
+ assertTrue("Unexpected trust manager type", condition);
X509TrustManager trustManager = (X509TrustManager) trustManagers[0];
KeyStore clientStore = getInitializedKeyStore(TestSSLConstants.EXPIRED_KEYSTORE,
@@ -154,6 +178,7 @@ public class FileTrustStoreTest extends QpidTestCase
trustManager.checkClientTrusted(new X509Certificate[] {certificate}, "NULL");
}
+ @Test
public void testUseOfExpiredTrustAnchorDenied() throws Exception
{
Map<String,Object> attributes = new HashMap<>();
@@ -166,8 +191,9 @@ public class FileTrustStoreTest extends QpidTestCase
TrustManager[] trustManagers = trustStore.getTrustManagers();
assertNotNull(trustManagers);
- assertEquals("Unexpected number of trust managers", 1, trustManagers.length);
- assertTrue("Unexpected trust manager type",trustManagers[0] instanceof X509TrustManager);
+ assertEquals("Unexpected number of trust managers", (long) 1, (long) trustManagers.length);
+ final boolean condition = trustManagers[0] instanceof X509TrustManager;
+ assertTrue("Unexpected trust manager type", condition);
X509TrustManager trustManager = (X509TrustManager) trustManagers[0];
KeyStore clientStore = getInitializedKeyStore(TestSSLConstants.EXPIRED_KEYSTORE,
@@ -196,6 +222,7 @@ public class FileTrustStoreTest extends QpidTestCase
}
}
+ @Test
public void testCreateTrustStoreFromDataUrl_Success() throws Exception
{
String trustStoreAsDataUrl = createDataUrlForFile(TestSSLConstants.TRUSTSTORE);
@@ -209,10 +236,11 @@ public class FileTrustStoreTest extends QpidTestCase
TrustManager[] trustManagers = fileTrustStore.getTrustManagers();
assertNotNull(trustManagers);
- assertEquals("Unexpected number of trust managers", 1, trustManagers.length);
+ assertEquals("Unexpected number of trust managers", (long) 1, (long) trustManagers.length);
assertNotNull("Trust manager unexpected null", trustManagers[0]);
}
+ @Test
public void testCreateTrustStoreFromDataUrl_WrongPassword() throws Exception
{
String trustStoreAsDataUrl = createDataUrlForFile(TestSSLConstants.TRUSTSTORE);
@@ -230,10 +258,12 @@ public class FileTrustStoreTest extends QpidTestCase
catch (IllegalConfigurationException ice)
{
String message = ice.getMessage();
- assertTrue("Exception text not as unexpected:" + message, message.contains("Check trust store password"));
+ assertTrue("Exception text not as unexpected:" + message,
+ message.contains("Check trust store password"));
}
}
+ @Test
public void testCreateTrustStoreFromDataUrl_BadTruststoreBytes() throws Exception
{
String trustStoreAsDataUrl = DataUrlUtils.getDataUrlForBytes("notatruststore".getBytes());
@@ -251,11 +281,12 @@ public class FileTrustStoreTest extends QpidTestCase
catch (IllegalConfigurationException ice)
{
String message = ice.getMessage();
- assertTrue("Exception text not as unexpected:" + message, message.contains("Cannot instantiate trust store"));
-
+ assertTrue("Exception text not as unexpected:" + message,
+ message.contains("Cannot instantiate trust store"));
}
}
+ @Test
public void testUpdateTrustStore_Success() throws Exception
{
Map<String,Object> attributes = new HashMap<>();
@@ -265,7 +296,10 @@ public class FileTrustStoreTest extends QpidTestCase
FileTrustStore<?> fileTrustStore = (FileTrustStore<?>) _factory.create(TrustStore.class, attributes, _broker);
- assertEquals("Unexpected path value before change", TestSSLConstants.TRUSTSTORE, fileTrustStore.getStoreUrl());
+ assertEquals("Unexpected path value before change",
+ TestSSLConstants.TRUSTSTORE,
+ fileTrustStore.getStoreUrl());
+
try
{
@@ -278,10 +312,13 @@ public class FileTrustStoreTest extends QpidTestCase
catch (IllegalConfigurationException ice)
{
String message = ice.getMessage();
- assertTrue("Exception text not as unexpected:" + message, message.contains("Cannot instantiate trust store"));
+ assertTrue("Exception text not as unexpected:" + message,
+ message.contains("Cannot instantiate trust store"));
}
- assertEquals("Unexpected path value after failed change", TestSSLConstants.TRUSTSTORE, fileTrustStore.getStoreUrl());
+ assertEquals("Unexpected path value after failed change",
+ TestSSLConstants.TRUSTSTORE,
+ fileTrustStore.getStoreUrl());
Map<String,Object> changedAttributes = new HashMap<>();
changedAttributes.put(FileTrustStore.STORE_URL, TestSSLConstants.BROKER_TRUSTSTORE);
@@ -290,10 +327,11 @@ public class FileTrustStoreTest extends QpidTestCase
fileTrustStore.setAttributes(changedAttributes);
assertEquals("Unexpected path value after change that is expected to be successful",
- TestSSLConstants.BROKER_TRUSTSTORE,
- fileTrustStore.getStoreUrl());
+ TestSSLConstants.BROKER_TRUSTSTORE,
+ fileTrustStore.getStoreUrl());
}
+ @Test
public void testEmptyTrustStoreRejected()
{
final URL emptyKeystore = getClass().getResource(EMPTY_KEYSTORE_RESOURCE);
@@ -315,6 +353,7 @@ public class FileTrustStoreTest extends QpidTestCase
}
}
+ @Test
public void testTrustStoreWithNoCertificateRejected()
{
final URL keystoreUrl = getClass().getResource(KEYSTORE_PK_ONLY_RESOURCE);
@@ -334,10 +373,12 @@ public class FileTrustStoreTest extends QpidTestCase
catch (IllegalConfigurationException ice)
{
String message = ice.getMessage();
- assertTrue("Exception text not as unexpected:" + message, message.contains("must contain at least one certificate"));
+ assertTrue("Exception text not as unexpected:" + message,
+ message.contains("must contain at least one certificate"));
}
}
+ @Test
public void testSymmetricKeyEntryIgnored() throws Exception
{
final URL keystoreUrl = getClass().getResource(SYMMETRIC_KEY_KEYSTORE_RESOURCE);
@@ -353,10 +394,11 @@ public class FileTrustStoreTest extends QpidTestCase
Certificate[] certificates = trustStore.getCertificates();
assertEquals("Unexpected number of certificates",
- getNumberOfCertificates(keystoreUrl, "PKCS12"),
- certificates.length);
+ (long) getNumberOfCertificates(keystoreUrl, "PKCS12"),
+ (long) certificates.length);
}
+ @Test
public void testPrivateKeyEntryIgnored() throws Exception
{
final URL keystoreUrl = getClass().getResource(KEYSTORE_RESOURCE);
@@ -371,8 +413,8 @@ public class FileTrustStoreTest extends QpidTestCase
Certificate[] certificates = trustStore.getCertificates();
assertEquals("Unexpected number of certificates",
- getNumberOfCertificates(keystoreUrl, "jks"),
- certificates.length);
+ (long) getNumberOfCertificates(keystoreUrl, "jks"),
+ (long) certificates.length);
}
private int getNumberOfCertificates(URL url, String type) throws Exception
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
index 4cd7e6f..e88bcc6 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
@@ -21,19 +21,18 @@ package org.apache.qpid.server.security;
import static org.apache.qpid.test.utils.TestSSLConstants.KEYSTORE_PASSWORD;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.argThat;
-import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.internal.verification.VerificationModeFactory.times;
-import javax.net.ssl.KeyManager;
-import javax.xml.bind.DatatypeConverter;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
@@ -49,6 +48,12 @@ import java.util.Map;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
+import javax.net.ssl.KeyManager;
+import javax.xml.bind.DatatypeConverter;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.ArgumentMatcher;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
@@ -63,10 +68,10 @@ import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.KeyStore;
import org.apache.qpid.server.model.Model;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestFileUtils;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class NonJavaKeyStoreTest extends QpidTestCase
+public class NonJavaKeyStoreTest extends UnitTestBase
{
private final Broker<?> _broker = mock(Broker.class);
private final TaskExecutor _taskExecutor = CurrentThreadTaskExecutor.newStartedInstance();
@@ -75,10 +80,9 @@ public class NonJavaKeyStoreTest extends QpidTestCase
private List<File> _testResources;
private MessageLogger _messageLogger;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_messageLogger = mock(MessageLogger.class);
when(_broker.getTaskExecutor()).thenReturn(_taskExecutor);
when(_broker.getChildExecutor()).thenReturn(_taskExecutor);
@@ -88,12 +92,11 @@ public class NonJavaKeyStoreTest extends QpidTestCase
_testResources = new ArrayList<>();
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
{
- super.tearDown();
}
finally
{
@@ -174,11 +177,13 @@ public class NonJavaKeyStoreTest extends QpidTestCase
return new File[]{privateKeyFile,certificateFile};
}
+ @Test
public void testCreationOfTrustStoreFromValidPrivateKeyAndCertificateInDERFormat() throws Exception
{
runTestCreationOfTrustStoreFromValidPrivateKeyAndCertificateInDerFormat(false);
}
+ @Test
public void testCreationOfTrustStoreFromValidPrivateKeyAndCertificateInPEMFormat() throws Exception
{
runTestCreationOfTrustStoreFromValidPrivateKeyAndCertificateInDerFormat(true);
@@ -200,10 +205,11 @@ public class NonJavaKeyStoreTest extends QpidTestCase
KeyManager[] keyManagers = fileTrustStore.getKeyManagers();
assertNotNull(keyManagers);
- assertEquals("Unexpected number of key managers", 1, keyManagers.length);
+ assertEquals("Unexpected number of key managers", (long) 1, (long) keyManagers.length);
assertNotNull("Key manager is null", keyManagers[0]);
}
+ @Test
public void testCreationOfTrustStoreFromValidPrivateKeyAndInvalidCertificate()throws Exception
{
File[] resources = extractResourcesFromTestKeyStore(true);
@@ -229,6 +235,7 @@ public class NonJavaKeyStoreTest extends QpidTestCase
}
}
+ @Test
public void testCreationOfTrustStoreFromInvalidPrivateKeyAndValidCertificate()throws Exception
{
File[] resources = extractResourcesFromTestKeyStore(true);
@@ -254,6 +261,7 @@ public class NonJavaKeyStoreTest extends QpidTestCase
}
}
+ @Test
public void testExpiryCheckingFindsExpired() throws Exception
{
doCertExpiryChecking(1);
@@ -262,6 +270,7 @@ public class NonJavaKeyStoreTest extends QpidTestCase
}
+ @Test
public void testExpiryCheckingIgnoresValid() throws Exception
{
doCertExpiryChecking(-1);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaTrustStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaTrustStoreTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaTrustStoreTest.java
index e6276a7..3630932 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaTrustStoreTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaTrustStoreTest.java
@@ -19,6 +19,10 @@
package org.apache.qpid.server.security;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -32,6 +36,9 @@ import java.util.Map;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
@@ -42,21 +49,19 @@ import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.TrustStore;
import org.apache.qpid.server.transport.network.security.ssl.SSLUtil;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestSSLConstants;
+import org.apache.qpid.test.utils.UnitTestBase;
-
-public class NonJavaTrustStoreTest extends QpidTestCase
+public class NonJavaTrustStoreTest extends UnitTestBase
{
private final Broker<?> _broker = mock(Broker.class);
private final TaskExecutor _taskExecutor = CurrentThreadTaskExecutor.newStartedInstance();
private final Model _model = BrokerModel.getInstance();
private final ConfiguredObjectFactory _factory = _model.getObjectFactory();
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
when(_broker.getTaskExecutor()).thenReturn(_taskExecutor);
when(_broker.getChildExecutor()).thenReturn(_taskExecutor);
@@ -65,6 +70,7 @@ public class NonJavaTrustStoreTest extends QpidTestCase
when(((Broker) _broker).getCategoryClass()).thenReturn(Broker.class);
}
+ @Test
public void testCreationOfTrustStoreFromValidCertificate() throws Exception
{
Map<String,Object> attributes = new HashMap<>();
@@ -76,10 +82,11 @@ public class NonJavaTrustStoreTest extends QpidTestCase
TrustManager[] trustManagers = trustStore.getTrustManagers();
assertNotNull(trustManagers);
- assertEquals("Unexpected number of trust managers", 1, trustManagers.length);
+ assertEquals("Unexpected number of trust managers", (long) 1, (long) trustManagers.length);
assertNotNull("Trust manager unexpected null", trustManagers[0]);
}
+ @Test
public void testUseOfExpiredTrustAnchorDenied() throws Exception
{
Map<String,Object> attributes = new HashMap<>();
@@ -92,8 +99,9 @@ public class NonJavaTrustStoreTest extends QpidTestCase
TrustManager[] trustManagers = trustStore.getTrustManagers();
assertNotNull(trustManagers);
- assertEquals("Unexpected number of trust managers", 1, trustManagers.length);
- assertTrue("Unexpected trust manager type",trustManagers[0] instanceof X509TrustManager);
+ assertEquals("Unexpected number of trust managers", (long) 1, (long) trustManagers.length);
+ final boolean condition = trustManagers[0] instanceof X509TrustManager;
+ assertTrue("Unexpected trust manager type", condition);
X509TrustManager trustManager = (X509TrustManager) trustManagers[0];
KeyStore clientStore = SSLUtil.getInitializedKeyStore(TestSSLConstants.EXPIRED_KEYSTORE,
@@ -122,6 +130,7 @@ public class NonJavaTrustStoreTest extends QpidTestCase
}
}
+ @Test
public void testCreationOfTrustStoreFromNonCertificate() throws Exception
{
Map<String,Object> attributes = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/SiteSpecificTrustStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/SiteSpecificTrustStoreTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/SiteSpecificTrustStoreTest.java
index 2ac12f6..0bea734 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/SiteSpecificTrustStoreTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/SiteSpecificTrustStoreTest.java
@@ -21,6 +21,8 @@
package org.apache.qpid.server.security;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -43,6 +45,10 @@ import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLServerSocketFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
@@ -52,10 +58,10 @@ import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.TrustStore;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestSSLConstants;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class SiteSpecificTrustStoreTest extends QpidTestCase
+public class SiteSpecificTrustStoreTest extends UnitTestBase
{
private static final String EXPECTED_SUBJECT = "CN=localhost,OU=Unknown,O=Unknown,L=Unknown,ST=Unknown,C=Unknown";
private static final String EXPECTED_ISSUER = "CN=MyRootCA,O=ACME,ST=Ontario,C=CA";
@@ -65,10 +71,9 @@ public class SiteSpecificTrustStoreTest extends QpidTestCase
private final ConfiguredObjectFactory _factory = _model.getObjectFactory();
private TestPeer _testPeer;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
int connectTimeout = Integer.getInteger("SiteSpecificTrustStoreTest.connectTimeout", 1000);
int readTimeout = Integer.getInteger("SiteSpecificTrustStoreTest.readTimeout", 1000);
setTestSystemProperty(SiteSpecificTrustStore.TRUST_STORE_SITE_SPECIFIC_CONNECT_TIMEOUT, String.valueOf(connectTimeout));
@@ -81,12 +86,11 @@ public class SiteSpecificTrustStoreTest extends QpidTestCase
when(((Broker) _broker).getCategoryClass()).thenReturn(Broker.class);
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
{
- super.tearDown();
}
finally
{
@@ -97,6 +101,7 @@ public class SiteSpecificTrustStoreTest extends QpidTestCase
}
}
+ @Test
public void testMalformedSiteUrl() throws Exception
{
Map<String,Object> attributes = new HashMap<>();
@@ -115,6 +120,7 @@ public class SiteSpecificTrustStoreTest extends QpidTestCase
}
}
+ @Test
public void testSiteUrlDoesNotSupplyHostPort() throws Exception
{
Map<String,Object> attributes = new HashMap<>();
@@ -133,6 +139,7 @@ public class SiteSpecificTrustStoreTest extends QpidTestCase
}
}
+ @Test
public void testUnresponsiveSite() throws Exception
{
_testPeer = new TestPeer();
@@ -152,6 +159,7 @@ public class SiteSpecificTrustStoreTest extends QpidTestCase
}
}
+ @Test
public void testValidSiteUrl() throws Exception
{
_testPeer = new TestPeer();
@@ -163,13 +171,14 @@ public class SiteSpecificTrustStoreTest extends QpidTestCase
(SiteSpecificTrustStore) _factory.create(TrustStore.class, attributes, _broker);
List<CertificateDetails> certDetails = trustStore.getCertificateDetails();
- assertEquals("Unexpected number of certificates", 1, certDetails.size());
+ assertEquals("Unexpected number of certificates", (long) 1, (long) certDetails.size());
CertificateDetails certificateDetails = certDetails.get(0);
assertEquals("Unexpected certificate subject", EXPECTED_SUBJECT, certificateDetails.getSubjectName());
assertEquals("Unexpected certificate issuer", EXPECTED_ISSUER, certificateDetails.getIssuerName());
}
+ @Test
public void testRefreshCertificate() throws Exception
{
_testPeer = new TestPeer();
@@ -181,7 +190,7 @@ public class SiteSpecificTrustStoreTest extends QpidTestCase
(SiteSpecificTrustStore) _factory.create(TrustStore.class, attributes, _broker);
List<CertificateDetails> certDetails = trustStore.getCertificateDetails();
- assertEquals("Unexpected number of certificates",1, certDetails.size());
+ assertEquals("Unexpected number of certificates", (long) 1, (long) certDetails.size());
CertificateDetails certificateDetails = certDetails.get(0);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/SubjectCreatorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/SubjectCreatorTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/SubjectCreatorTest.java
index 7065b72..fb02d1d 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/SubjectCreatorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/SubjectCreatorTest.java
@@ -18,6 +18,10 @@
*/
package org.apache.qpid.server.security;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -30,6 +34,8 @@ import java.util.Set;
import javax.security.auth.Subject;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.apache.qpid.server.logging.EventLogger;
@@ -42,9 +48,9 @@ import org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationS
import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.server.security.auth.sasl.SaslNegotiator;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class SubjectCreatorTest extends QpidTestCase
+public class SubjectCreatorTest extends UnitTestBase
{
private static final UsernamePrincipal USERNAME_PRINCIPAL = new UsernamePrincipal("username", null);
private static final String PASSWORD = "password";
@@ -63,7 +69,7 @@ public class SubjectCreatorTest extends QpidTestCase
private byte[] _saslResponseBytes = PASSWORD.getBytes();
private EventLogger _eventLogger;
- @Override
+ @Before
public void setUp()
{
when(_groupManager1.getGroupPrincipalsForUser(USERNAME_PRINCIPAL)).thenReturn(Collections.singleton(_group1));
@@ -77,6 +83,7 @@ public class SubjectCreatorTest extends QpidTestCase
_authenticationResult = new AuthenticationResult(USERNAME_PRINCIPAL);
}
+ @Test
public void testSaslAuthenticationSuccessReturnsSubjectWithUserAndGroupPrincipals() throws Exception
{
when(_testSaslNegotiator.handleResponse(_saslResponseBytes)).thenReturn(_authenticationResult);
@@ -84,7 +91,10 @@ public class SubjectCreatorTest extends QpidTestCase
SubjectAuthenticationResult result = _subjectCreator.authenticate(_testSaslNegotiator, _saslResponseBytes);
final Subject actualSubject = result.getSubject();
- assertEquals("Should contain one user principal and two groups ", 3, actualSubject.getPrincipals().size());
+ assertEquals("Should contain one user principal and two groups ",
+ (long) 3,
+ (long) actualSubject.getPrincipals().size());
+
assertTrue(actualSubject.getPrincipals().contains(new AuthenticatedPrincipal(USERNAME_PRINCIPAL)));
assertTrue(actualSubject.getPrincipals().contains(_group1));
@@ -93,6 +103,7 @@ public class SubjectCreatorTest extends QpidTestCase
assertTrue(actualSubject.isReadOnly());
}
+ @Test
public void testAuthenticateUnsuccessfulReturnsNullSubjectAndCorrectStatus()
{
testUnsuccessfulAuthentication(AuthenticationResult.AuthenticationStatus.CONTINUE);
@@ -115,15 +126,19 @@ public class SubjectCreatorTest extends QpidTestCase
{
ArgumentCaptor<LogMessage> argument = ArgumentCaptor.forClass(LogMessage.class);
verify(_eventLogger).message(argument.capture());
- assertTrue("Unexpected operational log message", argument.getValue().toString().startsWith("ATH-1010"));
+ assertTrue("Unexpected operational log message",
+ argument.getValue().toString().startsWith("ATH-1010"));
+
}
}
+ @Test
public void testGetGroupPrincipals()
{
getAndAssertGroupPrincipals(_group1, _group2);
}
+ @Test
public void testGetGroupPrincipalsWhenAGroupManagerReturnsNull()
{
when(_groupManager1.getGroupPrincipalsForUser(USERNAME_PRINCIPAL)).thenReturn(null);
@@ -131,6 +146,7 @@ public class SubjectCreatorTest extends QpidTestCase
getAndAssertGroupPrincipals(_group2);
}
+ @Test
public void testGetGroupPrincipalsWhenAGroupManagerReturnsEmptySet()
{
when(_groupManager2.getGroupPrincipalsForUser(USERNAME_PRINCIPAL)).thenReturn(new HashSet<Principal>());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java
index 978008e..027730d 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/TrustStoreMessageSourceTest.java
@@ -19,6 +19,9 @@
package org.apache.qpid.server.security;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -32,6 +35,9 @@ import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.server.consumer.ConsumerOption;
import org.apache.qpid.server.consumer.ConsumerTarget;
@@ -43,18 +49,16 @@ import org.apache.qpid.server.model.TrustStore;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.TestMemoryMessageStore;
-import org.apache.qpid.test.utils.QpidTestCase;
-
+import org.apache.qpid.test.utils.UnitTestBase;
-public class TrustStoreMessageSourceTest extends QpidTestCase
+public class TrustStoreMessageSourceTest extends UnitTestBase
{
private TrustStoreMessageSource _trustStoreMessageSource;
private Certificate[] _certificates;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
VirtualHost vhost = mock(VirtualHost.class);
MessageStore messageStore = new TestMemoryMessageStore();
TrustStore trustStore = mock(TrustStore.class);
@@ -68,6 +72,7 @@ public class TrustStoreMessageSourceTest extends QpidTestCase
_trustStoreMessageSource= new TrustStoreMessageSource(trustStore, vhost);
}
+ @Test
public void testAddConsumer() throws Exception
{
final EnumSet<ConsumerOption> options = EnumSet.noneOf(ConsumerOption.class);
@@ -97,7 +102,7 @@ public class TrustStoreMessageSourceTest extends QpidTestCase
final ByteArrayInputStream bytesIn;
try (QpidByteBuffer allData = message.getStoredMessage().getContent(0, bodySize))
{
- assertEquals("Unexpected message size was retrieved", bodySize, allData.remaining());
+ assertEquals("Unexpected message size was retrieved", (long) bodySize, (long) allData.remaining());
allData.get(msgContent);
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
index a0731f0..5586abd 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
@@ -18,18 +18,28 @@
*/
package org.apache.qpid.server.security.auth;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.security.Principal;
import javax.security.auth.Subject;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
-public class AuthenticatedPrincipalTest extends QpidTestCase
+public class AuthenticatedPrincipalTest extends UnitTestBase
{
private AuthenticatedPrincipal _authenticatedPrincipal = new AuthenticatedPrincipal(new UsernamePrincipal("name",
null));
+ @Test
public void testGetAuthenticatedPrincipalFromSubject()
{
final Subject subject = createSubjectContainingAuthenticatedPrincipal();
@@ -37,6 +47,7 @@ public class AuthenticatedPrincipalTest extends QpidTestCase
assertSame(_authenticatedPrincipal, actual);
}
+ @Test
public void testAuthenticatedPrincipalNotInSubject()
{
try
@@ -50,13 +61,16 @@ public class AuthenticatedPrincipalTest extends QpidTestCase
}
}
+ @Test
public void testGetOptionalAuthenticatedPrincipalFromSubject()
{
final Subject subject = createSubjectContainingAuthenticatedPrincipal();
final AuthenticatedPrincipal actual = AuthenticatedPrincipal.getOptionalAuthenticatedPrincipalFromSubject(subject);
+
assertSame(_authenticatedPrincipal, actual);
}
+ @Test
public void testGetOptionalAuthenticatedPrincipalFromSubjectReturnsNullIfMissing()
{
Subject subjectWithNoPrincipals = new Subject();
@@ -65,9 +79,12 @@ public class AuthenticatedPrincipalTest extends QpidTestCase
Subject subjectWithoutAuthenticatedPrincipal = new Subject();
subjectWithoutAuthenticatedPrincipal.getPrincipals().add(new UsernamePrincipal("name1", null));
assertNull("Should return null for a subject containing a principal that isn't an AuthenticatedPrincipal",
- AuthenticatedPrincipal.getOptionalAuthenticatedPrincipalFromSubject(subjectWithoutAuthenticatedPrincipal));
+
+ AuthenticatedPrincipal.getOptionalAuthenticatedPrincipalFromSubject(subjectWithoutAuthenticatedPrincipal));
+
}
+ @Test
public void testTooManyAuthenticatedPrincipalsInSubject()
{
final Subject subject = new Subject();
@@ -102,6 +119,7 @@ public class AuthenticatedPrincipalTest extends QpidTestCase
return subject;
}
+ @Test
public void testEqualsAndHashcode()
{
AuthenticatedPrincipal user1principal1 = new AuthenticatedPrincipal(new UsernamePrincipal("user1", null));
@@ -111,9 +129,10 @@ public class AuthenticatedPrincipalTest extends QpidTestCase
assertTrue(user1principal1.equals(user1principal2));
assertTrue(user1principal2.equals(user1principal1));
- assertEquals(user1principal1.hashCode(), user1principal2.hashCode());
+ assertEquals((long) user1principal1.hashCode(), (long) user1principal2.hashCode());
}
+ @Test
public void testEqualsAndHashcodeWithSameWrappedObject()
{
UsernamePrincipal wrappedPrincipal = new UsernamePrincipal("user1", null);
@@ -124,9 +143,10 @@ public class AuthenticatedPrincipalTest extends QpidTestCase
assertTrue(user1principal1.equals(user1principal2));
assertTrue(user1principal2.equals(user1principal1));
- assertEquals(user1principal1.hashCode(), user1principal2.hashCode());
+ assertEquals((long) user1principal1.hashCode(), (long) user1principal2.hashCode());
}
+ @Test
public void testEqualsWithDifferentUsernames()
{
AuthenticatedPrincipal user1principal1 = new AuthenticatedPrincipal(new UsernamePrincipal("user1", null));
@@ -136,6 +156,7 @@ public class AuthenticatedPrincipalTest extends QpidTestCase
assertFalse(user1principal2.equals(user1principal1));
}
+ @Test
public void testEqualsWithDissimilarObjects()
{
UsernamePrincipal wrappedPrincipal = new UsernamePrincipal("user1", null);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticationResultTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticationResultTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticationResultTest.java
index b366eb4..3918171 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticationResultTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticationResultTest.java
@@ -19,7 +19,11 @@
package org.apache.qpid.server.security.auth;
import static org.apache.qpid.server.security.auth.AuthenticatedPrincipalTestHelper.assertOnlyContainsWrapped;
-import static org.apache.qpid.server.security.auth.AuthenticatedPrincipalTestHelper.assertOnlyContainsWrappedAndSecondaryPrincipals;
+import static org.apache.qpid.server.security.auth.AuthenticatedPrincipalTestHelper
+ .assertOnlyContainsWrappedAndSecondaryPrincipals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import java.security.Principal;
@@ -28,17 +32,22 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.junit.Test;
-public class AuthenticationResultTest extends QpidTestCase
+import org.apache.qpid.test.utils.UnitTestBase;
+
+public class AuthenticationResultTest extends UnitTestBase
{
+ @Test
public void testConstructWithAuthenticationStatusContinue()
{
AuthenticationResult authenticationResult = new AuthenticationResult(AuthenticationResult.AuthenticationStatus.CONTINUE);
+
assertSame(AuthenticationResult.AuthenticationStatus.CONTINUE, authenticationResult.getStatus());
assertTrue(authenticationResult.getPrincipals().isEmpty());
}
+ @Test
public void testConstructWithAuthenticationStatusError()
{
AuthenticationResult authenticationResult = new AuthenticationResult(AuthenticationResult.AuthenticationStatus.ERROR);
@@ -46,6 +55,7 @@ public class AuthenticationResultTest extends QpidTestCase
assertTrue(authenticationResult.getPrincipals().isEmpty());
}
+ @Test
public void testConstructWithAuthenticationStatusSuccessThrowsException()
{
try
@@ -59,6 +69,7 @@ public class AuthenticationResultTest extends QpidTestCase
}
}
+ @Test
public void testConstructWithPrincipal()
{
Principal mainPrincipal = mock(Principal.class);
@@ -68,6 +79,7 @@ public class AuthenticationResultTest extends QpidTestCase
assertSame(AuthenticationResult.AuthenticationStatus.SUCCESS, authenticationResult.getStatus());
}
+ @Test
public void testConstructWithNullPrincipalThrowsException()
{
try
@@ -81,6 +93,7 @@ public class AuthenticationResultTest extends QpidTestCase
}
}
+ @Test
public void testConstructWithSetOfPrincipals()
{
Principal mainPrincipal = mock(Principal.class);
@@ -93,6 +106,7 @@ public class AuthenticationResultTest extends QpidTestCase
assertSame(AuthenticationResult.AuthenticationStatus.SUCCESS, authenticationResult.getStatus());
}
+ @Test
public void testConstructWithSetOfPrincipalsDeDuplicatesMainPrincipal()
{
Principal mainPrincipal = mock(Principal.class);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/UsernamePrincipalTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/UsernamePrincipalTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/UsernamePrincipalTest.java
index 092a2d6..d845cbe 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/UsernamePrincipalTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/UsernamePrincipalTest.java
@@ -20,20 +20,27 @@
*/
package org.apache.qpid.server.security.auth;
-import org.apache.qpid.test.utils.QpidTestCase;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+
/**
* Tests the UsernamePrincipal.
- *
*/
-public class UsernamePrincipalTest extends QpidTestCase
+public class UsernamePrincipalTest extends UnitTestBase
{
+ @Test
public void testEqualitySameObject()
{
final UsernamePrincipal principal = new UsernamePrincipal("string", null);
assertTrue(principal.equals(principal));
}
+ @Test
public void testEqualitySameName()
{
final String string = "string";
@@ -42,6 +49,7 @@ public class UsernamePrincipalTest extends QpidTestCase
assertTrue(principal1.equals(principal2));
}
+ @Test
public void testEqualityEqualName()
{
final UsernamePrincipal principal1 = new UsernamePrincipal(new String("string"), null);
@@ -49,6 +57,7 @@ public class UsernamePrincipalTest extends QpidTestCase
assertTrue(principal1.equals(principal2));
}
+ @Test
public void testInequalityDifferentUserPrincipals()
{
UsernamePrincipal principal1 = new UsernamePrincipal("string1", null);
@@ -56,12 +65,14 @@ public class UsernamePrincipalTest extends QpidTestCase
assertFalse(principal1.equals(principal2));
}
+ @Test
public void testInequalityNonUserPrincipal()
{
UsernamePrincipal principal = new UsernamePrincipal("string", null);
assertFalse(principal.equals(new String("string")));
}
+ @Test
public void testInequalityNull()
{
UsernamePrincipal principal = new UsernamePrincipal("string", null);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabaseTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabaseTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabaseTest.java
index 2bb7a4b..8c59b7c 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabaseTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabaseTest.java
@@ -19,6 +19,8 @@
package org.apache.qpid.server.security.auth.database;
+import static org.junit.Assert.fail;
+
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
@@ -27,10 +29,14 @@ import java.security.Principal;
import java.util.ArrayList;
import java.util.List;
+import org.junit.After;
+import org.junit.Test;
+
import org.apache.qpid.server.security.auth.UsernamePrincipal;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
+
-public abstract class AbstractPasswordFilePrincipalDatabaseTest extends QpidTestCase
+public abstract class AbstractPasswordFilePrincipalDatabaseTest extends UnitTestBase
{
protected static final String TEST_COMMENT = "# Test Comment";
protected static final String TEST_USERNAME = "testUser";
@@ -42,7 +48,7 @@ public abstract class AbstractPasswordFilePrincipalDatabaseTest extends QpidTest
protected abstract AbstractPasswordFilePrincipalDatabase getDatabase();
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -61,7 +67,6 @@ public abstract class AbstractPasswordFilePrincipalDatabaseTest extends QpidTest
}
finally
{
- super.tearDown();
}
}
@@ -116,6 +121,7 @@ public abstract class AbstractPasswordFilePrincipalDatabaseTest extends QpidTest
}
+ @Test
public void testRejectUsernameWithColon() throws Exception
{
String usernameWithColon = "user:name";
@@ -135,6 +141,7 @@ public abstract class AbstractPasswordFilePrincipalDatabaseTest extends QpidTest
}
}
+ @Test
public void testRejectPasswordWithColon() throws Exception
{
String username = "username";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
index 8c93162..6e9925c 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
@@ -20,6 +20,13 @@
*/
package org.apache.qpid.server.security.auth.database;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
@@ -34,8 +41,11 @@ import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.login.AccountNotFoundException;
import javax.xml.bind.DatatypeConverter;
-import org.apache.qpid.server.security.auth.UsernamePrincipal;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.apache.qpid.server.security.auth.UsernamePrincipal;
public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPasswordFilePrincipalDatabaseTest
{
@@ -59,17 +69,16 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
}
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_database = new Base64MD5PasswordFilePrincipalDatabase(null);
_pwdFile = File.createTempFile(this.getClass().getName(), "pwd");
_pwdFile.deleteOnExit();
_database.open(_pwdFile);
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -97,6 +106,7 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
/** **** Test Methods ************** */
+ @Test
public void testCreatePrincipal()
{
File testFile = createPasswordFile(1, 0);
@@ -114,7 +124,7 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
};
assertTrue("New user not created.", _database.createPrincipal(principal, PASSWORD.toCharArray()));
-
+
PasswordCallback callback = new PasswordCallback("prompt",false);
try
{
@@ -138,12 +148,14 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
fail("user account did not exist");
}
assertTrue("Password returned was incorrect.", Arrays.equals(PASSWORD_MD5_CHARS, callback.getPassword()));
-
+
+
assertNotNull("Created User was not saved", _database.getUser(TEST_USERNAME));
assertFalse("Duplicate user created.", _database.createPrincipal(principal, PASSWORD.toCharArray()));
}
+ @Test
public void testCreatePrincipalIsSavedToFile()
{
@@ -180,13 +192,12 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
String[] result = Pattern.compile(":").split(userLine);
- assertEquals("User line not complete '" + userLine + "'", 2, result.length);
+ assertEquals("User line not complete '" + userLine + "'", (long) 2, (long) result.length);
assertEquals("Username not correct,", CREATED_USERNAME, result[0]);
assertEquals("Password not correct,", CREATED_B64MD5HASHED_PASSWORD, result[1]);
assertFalse("File has more content", reader.ready());
-
}
catch (IOException e)
{
@@ -195,6 +206,7 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
}
+ @Test
public void testDeletePrincipal()
{
File testFile = createPasswordFile(1, 1);
@@ -238,6 +250,7 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
assertNull("Deleted user still present.", _database.getUser(TEST_USERNAME + "0"));
}
+ @Test
public void testGetUsers()
{
int USER_COUNT = 10;
@@ -252,7 +265,7 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
assertNotNull("Users list is null.", users);
- assertEquals(USER_COUNT, users.size());
+ assertEquals((long) USER_COUNT, (long) users.size());
boolean[] verify = new boolean[USER_COUNT];
for (int i = 0; i < USER_COUNT; i++)
@@ -275,6 +288,7 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
}
}
+ @Test
public void testUpdatePasswordIsSavedToFile()
{
@@ -311,13 +325,12 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
String[] result = Pattern.compile(":").split(userLine);
- assertEquals("User line not complete '" + userLine + "'", 2, result.length);
+ assertEquals("User line not complete '" + userLine + "'", (long) 2, (long) result.length);
assertEquals("Username not correct,", TEST_USERNAME + "0", result[0]);
assertEquals("New Password not correct,", NEW_PASSWORD_HASH, result[1]);
assertFalse("File has more content", reader.ready());
-
}
catch (IOException e)
{
@@ -325,6 +338,7 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
}
}
+ @Test
public void testSetPasswordFileWithMissingFile()
{
try
@@ -342,6 +356,7 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
}
+ @Test
public void testSetPasswordFileWithReadOnlyFile()
{
@@ -363,6 +378,7 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
}
}
+ @Test
public void testCreateUserPrincipal() throws IOException
{
_database.createPrincipal(PRINCIPAL, PASSWORD.toCharArray());
@@ -371,14 +387,15 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
assertEquals(PRINCIPAL.getName(), newPrincipal.getName());
}
+ @Test
public void testVerifyPassword() throws IOException, AccountNotFoundException
{
testCreateUserPrincipal();
//assertFalse(_pwdDB.verifyPassword(_username, null));
assertFalse(_database.verifyPassword(PRINCIPAL_USERNAME, new char[]{}));
- assertFalse(_database.verifyPassword(PRINCIPAL_USERNAME, (PASSWORD+"z").toCharArray()));
+ assertFalse(_database.verifyPassword(PRINCIPAL_USERNAME, (PASSWORD + "z").toCharArray()));
assertTrue(_database.verifyPassword(PRINCIPAL_USERNAME, PASSWORD.toCharArray()));
-
+
try
{
_database.verifyPassword("made.up.username", PASSWORD.toCharArray());
@@ -390,7 +407,8 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
}
}
- public void testUpdatePassword() throws IOException, AccountNotFoundException
+ @Test
+ public void testUpdatePassword() throws IOException, AccountNotFoundException
{
testCreateUserPrincipal();
char[] newPwd = "newpassword".toCharArray();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
index dcad1f4..0d912fb 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/HashedUserTest.java
@@ -20,18 +20,25 @@
*/
package org.apache.qpid.server.security.auth.database;
-import org.apache.qpid.test.utils.QpidTestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+
/*
Note User is mainly tested by Base64MD5PFPDTest this is just to catch the extra methods
*/
-public class HashedUserTest extends QpidTestCase
+public class HashedUserTest extends UnitTestBase
{
private String USERNAME = "username";
private String PASSWORD = "password";
private String B64_ENCODED_PASSWORD = "cGFzc3dvcmQ=";
+ @Test
public void testToLongArrayConstructor()
{
try
@@ -46,6 +53,7 @@ public class HashedUserTest extends QpidTestCase
}
+ @Test
public void testArrayConstructor()
{
HashedUser user = new HashedUser(new String[]{USERNAME, B64_ENCODED_PASSWORD}, null);
@@ -58,7 +66,7 @@ public class HashedUserTest extends QpidTestCase
{
for (byte c : user.getEncodedPassword())
{
- assertEquals("Password incorrect", hash[index], (char) c);
+ assertEquals("Password incorrect", (long) hash[index], (long) (char) c);
index++;
}
}
@@ -72,7 +80,7 @@ public class HashedUserTest extends QpidTestCase
index=0;
for (char c : user.getPassword())
{
- assertEquals("Password incorrect", hash[index], c);
+ assertEquals("Password incorrect", (long) hash[index], (long) c);
index++;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org