You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/01/24 00:37:51 UTC
svn commit: r1560853 [2/3] - in /qpid/trunk/qpid/java:
broker-core/src/main/java/org/apache/log4j/
broker-core/src/main/java/org/apache/qpid/server/
broker-core/src/main/java/org/apache/qpid/server/configuration/
broker-core/src/main/java/org/apache/qp...
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/DefaultRecovererProviderTest.java Thu Jan 23 23:37:48 2014
@@ -61,8 +61,8 @@ public class DefaultRecovererProviderTes
mock(StoreConfigurationChangeListener.class));
for (String configuredObjectType : supportedTypes)
{
- ConfiguredObjectRecoverer<?> recovever = provider.getRecoverer(configuredObjectType);
- assertNotNull("Null recoverer for type: " + configuredObjectType, recovever);
+ ConfiguredObjectRecoverer<?> recoverer = provider.getRecoverer(configuredObjectType);
+ assertNotNull("Null recoverer for type: " + configuredObjectType, recoverer);
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/KeyStoreRecovererTest.java Thu Jan 23 23:37:48 2014
@@ -51,9 +51,9 @@ public class KeyStoreRecovererTest exten
when(entry.getAttributes()).thenReturn(attributes);
when(entry.getId()).thenReturn(id);
- KeyStoreRecoverer recovever = new KeyStoreRecoverer();
+ KeyStoreRecoverer recoverer = new KeyStoreRecoverer();
- KeyStore keyStore = recovever.create(null, entry, broker);
+ KeyStore keyStore = recoverer.create(null, entry, broker);
assertNotNull("Key store configured object is not created", keyStore);
assertEquals(id, keyStore.getId());
@@ -61,7 +61,7 @@ public class KeyStoreRecovererTest exten
assertEquals(TestSSLConstants.BROKER_TRUSTSTORE_PASSWORD, keyStore.getPassword());
assertNotNull(keyStore.getPassword());
- //verify that we havent configured the key store with the actual dummy password value
+ //verify that we haven't configured the key store with the actual dummy password value
assertFalse(AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK.equals(keyStore.getPassword()));
// Verify the remaining attributes, including that the password value returned
@@ -83,7 +83,7 @@ public class KeyStoreRecovererTest exten
ConfigurationEntry entry = mock(ConfigurationEntry.class);
when(entry.getId()).thenReturn(id);
- KeyStoreRecoverer recovever = new KeyStoreRecoverer();
+ KeyStoreRecoverer recoverer = new KeyStoreRecoverer();
String[] mandatoryProperties = {KeyStore.NAME, KeyStore.PATH, KeyStore.PASSWORD};
for (int i = 0; i < mandatoryProperties.length; i++)
@@ -93,7 +93,7 @@ public class KeyStoreRecovererTest exten
when(entry.getAttributes()).thenReturn(properties);
try
{
- recovever.create(null, entry, broker);
+ recoverer.create(null, entry, broker);
fail("Cannot create key store without a " + mandatoryProperties[i]);
}
catch(IllegalArgumentException e)
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/TrustStoreRecovererTest.java Thu Jan 23 23:37:48 2014
@@ -59,7 +59,7 @@ public class TrustStoreRecovererTest ext
assertEquals(TestSSLConstants.BROKER_TRUSTSTORE_PASSWORD, trustStore.getPassword());
assertNotNull(trustStore.getPassword());
- //verify that we havent configured the trust store with the actual dummy password value
+ //verify that we haven't configured the trust store with the actual dummy password value
assertFalse(AbstractKeyStoreAdapter.DUMMY_PASSWORD_MASK.equals(trustStore.getPassword()));
// Verify the remaining attributes, including that the password value returned
@@ -82,7 +82,7 @@ public class TrustStoreRecovererTest ext
when(entry.getAttributes()).thenReturn(attributes);
when(entry.getId()).thenReturn(id);
- TrustStoreRecoverer recovever = new TrustStoreRecoverer();
+ TrustStoreRecoverer recoverer = new TrustStoreRecoverer();
String[] mandatoryProperties = {TrustStore.NAME, TrustStore.PATH, TrustStore.PASSWORD};
for (int i = 0; i < mandatoryProperties.length; i++)
@@ -92,7 +92,7 @@ public class TrustStoreRecovererTest ext
when(entry.getAttributes()).thenReturn(properties);
try
{
- recovever.create(null, entry, broker);
+ recoverer.create(null, entry, broker);
fail("Cannot create key store without a " + mandatoryProperties[i]);
}
catch(IllegalArgumentException e)
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/startup/VirtualHostRecovererTest.java Thu Jan 23 23:37:48 2014
@@ -64,7 +64,7 @@ public class VirtualHostRecovererTest ex
assertEquals("Unexpected name", getName(), host.getName());
}
- public void testCreateVirtualHostFromStoreConfigAtrributes()
+ public void testCreateVirtualHostFromStoreConfigAttributes()
{
StatisticsGatherer statisticsGatherer = mock(StatisticsGatherer.class);
SecurityManager securityManager = mock(SecurityManager.class);
@@ -121,7 +121,7 @@ public class VirtualHostRecovererTest ex
try
{
recoverer.create(null, entry, parent);
- fail("Cannot create a virtual host without a manadatory attribute " + name);
+ fail("Cannot create a virtual host without a mandatory attribute " + name);
}
catch(IllegalConfigurationException e)
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ConfigurationEntryStoreTestCase.java Thu Jan 23 23:37:48 2014
@@ -199,9 +199,9 @@ public abstract class ConfigurationEntry
assertNotNull("Root entry does not exist", newBrokerConfigEntry);
assertEquals("Unexpected id", _brokerId, newBrokerConfigEntry.getId());
assertEquals("Unexpected type ", Broker.class.getSimpleName(), newBrokerConfigEntry.getType());
- Map<String, Object> newBrokerattributes = newBrokerConfigEntry.getAttributes();
- assertNotNull("Attributes cannot be null", newBrokerattributes);
- assertEquals("Unexpected attributes", attributes, newBrokerattributes);
+ Map<String, Object> newBrokerAttributes = newBrokerConfigEntry.getAttributes();
+ assertNotNull("Attributes cannot be null", newBrokerAttributes);
+ assertEquals("Unexpected attributes", attributes, newBrokerAttributes);
}
public void testSaveNewVirtualHost()
@@ -407,8 +407,8 @@ public abstract class ConfigurationEntry
assertEquals("Unexpected preference provider ID in authentication provider children set", preferencesProviderId, _store
.getEntry(_authenticationProviderId).getChildrenIds().iterator().next());
ConfigurationEntry preferencesProviderEntry = _store.getEntry(preferencesProviderId);
- assertNotNull("Preferences providert is not found", preferencesProviderEntry);
- assertEquals("Unexpected preferences providert id", preferencesProviderId, preferencesProviderEntry.getId());
+ assertNotNull("Preferences provider is not found", preferencesProviderEntry);
+ assertEquals("Unexpected preferences provider id", preferencesProviderId, preferencesProviderEntry.getId());
Map<String, Object> attributes = preferencesProviderEntry.getAttributes();
assertEquals("Unexpected preferences provider name", name, attributes.get(PreferencesProvider.NAME));
assertEquals("Unexpected preferences provider path", path, attributes.get(FileSystemPreferencesProvider.PATH));
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStoreTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStoreTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/JsonConfigurationEntryStoreTest.java Thu Jan 23 23:37:48 2014
@@ -153,7 +153,7 @@ public class JsonConfigurationEntryStore
assertEquals("Unexpected root entry", brokerId, root.getId());
Map<String, Object> attributes = root.getAttributes();
assertNotNull("Attributes not found", attributes);
- assertEquals("Unexpected number of attriburtes", 2, attributes.size());
+ assertEquals("Unexpected number of attributes", 2, attributes.size());
assertEquals("Unexpected name attribute", getTestName(), attributes.get(Broker.NAME));
assertEquals("Unexpected version attribute", 1, attributes.get(Broker.STORE_VERSION));
}
@@ -174,7 +174,7 @@ public class JsonConfigurationEntryStore
assertEquals("Unexpected root entry", brokerId, root.getId());
Map<String, Object> attributes = root.getAttributes();
assertNotNull("Attributes not found", attributes);
- assertEquals("Unexpected number of attriburtes", 2, attributes.size());
+ assertEquals("Unexpected number of attributes", 2, attributes.size());
assertEquals("Unexpected name attribute", getTestName(), attributes.get(Broker.NAME));
assertEquals("Unexpected version attribute", 1, attributes.get(Broker.STORE_VERSION));
}
@@ -257,8 +257,8 @@ public class JsonConfigurationEntryStore
ConfigurationEntry authenticationProviderEntry = newStore.getEntry(_authenticationProviderId);
assertEquals("Unexpected preference provider ID in authentication provider children set", preferencesProviderId, authenticationProviderEntry.getChildrenIds().iterator().next());
ConfigurationEntry preferencesProviderEntry = newStore.getEntry(preferencesProviderId);
- assertNotNull("Preferences providert is not found", preferencesProviderEntry);
- assertEquals("Unexpected preferences providert id", preferencesProviderId, preferencesProviderEntry.getId());
+ assertNotNull("Preferences provider is not found", preferencesProviderEntry);
+ assertEquals("Unexpected preferences provider id", preferencesProviderId, preferencesProviderEntry.getId());
Map<String, Object> attributes = preferencesProviderEntry.getAttributes();
assertEquals("Unexpected preferences provider name", name, attributes.get(PreferencesProvider.NAME));
assertEquals("Unexpected preferences provider path", path, attributes.get(FileSystemPreferencesProvider.PATH));
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStoreTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStoreTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/store/MemoryConfigurationEntryStoreTest.java Thu Jan 23 23:37:48 2014
@@ -94,7 +94,7 @@ public class MemoryConfigurationEntrySto
assertEquals("Unexpected root entry", brokerId, root.getId());
Map<String, Object> attributes = root.getAttributes();
assertNotNull("Attributes not found", attributes);
- assertEquals("Unexpected number of attriburtes", 1, attributes.size());
+ assertEquals("Unexpected number of attributes", 1, attributes.size());
assertEquals("Unexpected name attribute", getTestName(), attributes.get(Broker.NAME));
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/configuration/updater/TaskExecutorTest.java Thu Jan 23 23:37:48 2014
@@ -67,13 +67,13 @@ public class TaskExecutorTest extends Te
public void testGetState()
{
- assertEquals("Unxpected initial state", State.INITIALISING, _executor.getState());
+ assertEquals("Unexpected initial state", State.INITIALISING, _executor.getState());
}
public void testStart()
{
_executor.start();
- assertEquals("Unxpected started state", State.ACTIVE, _executor.getState());
+ assertEquals("Unexpected started state", State.ACTIVE, _executor.getState());
}
public void testStopImmediately() throws Exception
@@ -110,7 +110,7 @@ public class TaskExecutorTest extends Te
assertTrue("The first task has not been triggered", waitForCallLatch.await(1000, TimeUnit.MILLISECONDS));
_executor.stopImmediately();
- assertEquals("Unxpected stopped state", State.STOPPED, _executor.getState());
+ assertEquals("Unexpected stopped state", State.STOPPED, _executor.getState());
Exception e = submitExceptions.poll(1000l, TimeUnit.MILLISECONDS);
assertNotNull("The task execution was not interrupted or cancelled", e);
@@ -127,7 +127,7 @@ public class TaskExecutorTest extends Te
{
_executor.start();
_executor.stop();
- assertEquals("Unxpected stopped state", State.STOPPED, _executor.getState());
+ assertEquals("Unexpected stopped state", State.STOPPED, _executor.getState());
}
public void testSubmitAndWait() throws Exception
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/DefaultExchangeFactoryTest.java Thu Jan 23 23:37:48 2014
@@ -81,7 +81,7 @@ public class DefaultExchangeFactoryTest
}
}
- public void testCreateDefaultExchangeFactoryWithoutDireactExchangeType()
+ public void testCreateDefaultExchangeFactoryWithoutDirectExchangeType()
{
_stubbedExchangeTypes.add(_topicExchangeType);
_stubbedExchangeTypes.add(_fanoutExchangeType);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java Thu Jan 23 23:37:48 2014
@@ -214,7 +214,7 @@ public class TopicExchangeTest extends Q
}
- public void testMatchafterHash() throws AMQException
+ public void testMatchAfterHash() throws AMQException
{
AMQQueue queue = _vhost.createQueue(UUIDGenerator.generateRandomUUID(), "a#", false, null, false, false,
false, null);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java Thu Jan 23 23:37:48 2014
@@ -31,20 +31,20 @@ public class JMSSelectorFilterTest exten
assertEquals(filter1 + " should equal itself", filter1, filter1);
assertFalse(filter1 + " should not equal null", filter1.equals(null));
- assertEqualsAndHashcodeMatch(filter1, filter2);
+ assertEqualsAndHashCodeMatch(filter1, filter2);
JMSSelectorFilter differentFilter = new JMSSelectorFilter("2 = 2");
assertNotEqual(filter1, differentFilter);
}
- private void assertEqualsAndHashcodeMatch(JMSSelectorFilter filter1, JMSSelectorFilter filter2)
+ private void assertEqualsAndHashCodeMatch(JMSSelectorFilter filter1, JMSSelectorFilter filter2)
{
String message = filter1 + " and " + filter2 + " should be equal";
assertEquals(message, filter1, filter2);
assertEquals(message, filter2, filter1);
- assertEquals("Hashcodes of " + filter1 + " and " + filter2 + " should be equal",
+ assertEquals("HashCodes of " + filter1 + " and " + filter2 + " should be equal",
filter1.hashCode(), filter2.hashCode());
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/Log4jMessageLoggerTest.java Thu Jan 23 23:37:48 2014
@@ -255,7 +255,7 @@ public class Log4jMessageLoggerTest exte
}
/**
- * @return the list of LoggingEvents that have occured in this Appender
+ * @return the list of LoggingEvents that have occurred in this Appender
*/
public List<LoggingEvent> getLog()
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLoggerTest.java Thu Jan 23 23:37:48 2014
@@ -96,7 +96,7 @@ public class UnitTestMessageLoggerTest e
logger.clearLogMessages();
- assertEquals("Expected to have no messagse after a clear",
+ assertEquals("Expected to have no messages after a clear",
0, logger.getLogMessages().size());
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java Thu Jan 23 23:37:48 2014
@@ -55,7 +55,7 @@ public class AMQPChannelActorTest extend
* Test that when logging on behalf of the channel
* The test sends a message then verifies that it entered the logs.
*
- * The log message should be fully repalaced (no '{n}' values) and should
+ * The log message should be fully replaced (no '{n}' values) and should
* contain the channel id ('/ch:1') identification.
*/
public void testChannel() throws Exception
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java Thu Jan 23 23:37:48 2014
@@ -48,7 +48,7 @@ public class AMQPConnectionActorTest ext
*
* The test sends a message then verifies that it entered the logs.
*
- * The log message should be fully repalaced (no '{n}' values) and should
+ * The log message should be fully replaced (no '{n}' values) and should
* not contain any channel identification.
*/
public void testConnection() throws Exception
@@ -113,7 +113,7 @@ public class AMQPConnectionActorTest ext
public String getLogHierarchy()
{
- return "test.hieracrchy";
+ return "test.hierarchy";
}
});
return message;
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java Thu Jan 23 23:37:48 2014
@@ -45,7 +45,7 @@ import org.apache.qpid.server.util.Broke
* successfully removed.
*
* By having a higher number of threads than would normally be used in the
- * Poolling filter we aim to catch the race condition where a ThreadLocal remove
+ * Pooling filter we aim to catch the race condition where a ThreadLocal remove
* is called before one or more threads call get(). This way we can ensure that
* the remove does not affect more than the Thread it was called in.
*/
@@ -188,7 +188,7 @@ public class CurrentActorTest extends Ba
if (threads[count].getException() != null)
{
threads[count].getException().printStackTrace();
- fail("Error occured in thread:" + count + "("+threads[count].getException()+")");
+ fail("Error occurred in thread:" + count + "("+threads[count].getException()+")");
}
}
}
@@ -210,7 +210,7 @@ public class CurrentActorTest extends Ba
// Create a new actor using retrieving the rootMessageLogger from
// the default ApplicationRegistry.
- //fixme reminder that we need a better approach for broker testing.
+ //TODO reminder that we need a better approach for broker testing.
try
{
LogActor defaultActor = CurrentActor.get();
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/QueueActorTest.java Thu Jan 23 23:37:48 2014
@@ -39,7 +39,7 @@ public class QueueActorTest extends Base
*
* The test logs a message then verifies that it entered the logs correctly
*
- * The log message should be fully repalaced (no '{n}' values) and should
+ * The log message should be fully replaced (no '{n}' values) and should
* contain the correct queue identification.
*/
public void testQueueActor()
@@ -67,7 +67,7 @@ public class QueueActorTest extends Base
// Verify that the logged message contains the 'qu(' marker
String expected = "qu(" + getName() + ")";
- assertTrue("Message was not logged with a queue identifer '"+expected+"' actual:" + log,
+ assertTrue("Message was not logged with a queue identifier '"+expected+"' actual:" + log,
log.contains(expected));
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java Thu Jan 23 23:37:48 2014
@@ -54,7 +54,7 @@ public class SubscriptionActorTest exten
*
* The test sends a message then verifies that it entered the logs.
*
- * The log message should be fully repalaced (no '{n}' values) and should
+ * The log message should be fully replaced (no '{n}' values) and should
* contain subscription identification.
*/
public void testSubscription()
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java Thu Jan 23 23:37:48 2014
@@ -115,7 +115,7 @@ public abstract class AbstractTestLogSub
assertNotNull("Unable to find connection 'con:" + connectionID + "' in '"+message+"'",
connectionSlice);
- // Exract the userName
+ // Extract the userName
String[] userNameParts = connectionSlice.split("@");
assertEquals("Unable to split Username from rest of Connection:"
@@ -180,11 +180,11 @@ public abstract class AbstractTestLogSub
*/
protected void verifyExchange(String message, Exchange exchange)
{
- String exchangeSilce = getSlice("ex", message);
+ String exchangeSlice = getSlice("ex", message);
- assertNotNull("Exchange not found:" + message, exchangeSilce);
+ assertNotNull("Exchange not found:" + message, exchangeSlice);
- String[] exchangeParts = exchangeSilce.split("/");
+ String[] exchangeParts = exchangeSlice.split("/");
assertEquals("Exchange should be in two parts ex(type/name)", 2,
exchangeParts.length);
@@ -265,10 +265,10 @@ public abstract class AbstractTestLogSub
}
/**
- * Call to the individiual tests to validate the message is formatted as
+ * Call to the individual tests to validate the message is formatted as
* expected
*
- * @param message the message whos format needs validation
+ * @param message the message whose format needs validation
*/
protected abstract void validateLogStatement(String message);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/BindingLogSubjectTest.java Thu Jan 23 23:37:48 2014
@@ -64,7 +64,7 @@ public class BindingLogSubjectTest exten
/**
* Validate that the logged Subject message is as expected:
* MESSAGE [Blank][vh(/test)/ex(direct/<<default>>)/qu(BindingLogSubjectTest)/rk(RoutingKey)] <Log Message>
- * @param message the message whos format needs validation
+ * @param message the message whose format needs validation
*/
@Override
protected void validateLogStatement(String message)
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java Thu Jan 23 23:37:48 2014
@@ -46,11 +46,11 @@ public class ChannelLogSubjectTest exten
/**
* MESSAGE [Blank][con:0(MockProtocolSessionUser@null/test)/ch:1] <Log Message>
*
- * @param message the message whos format needs validation
+ * @param message the message whose format needs validation
*/
protected void validateLogStatement(String message)
{
- // Use the ConnectionLogSubjectTest to vaildate that the connection
+ // Use the ConnectionLogSubjectTest to validate that the connection
// section is ok
super.validateLogStatement(message);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java Thu Jan 23 23:37:48 2014
@@ -54,7 +54,7 @@ public class ConnectionLogSubjectTest ex
/**
* MESSAGE [Blank][con:0(MockProtocolSessionUser@null/test)] <Log Message>
*
- * @param message the message whos format needs validation
+ * @param message the message whose format needs validation
*/
protected void validateLogStatement(String message)
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubjectTest.java Thu Jan 23 23:37:48 2014
@@ -57,7 +57,7 @@ public class ExchangeLogSubjectTest exte
/**
* Validate that the logged Subject message is as expected:
* MESSAGE [Blank][vh(/test)/ex(direct/<<default>>)] <Log Message>
- * @param message the message whos format needs validation
+ * @param message the message whose format needs validation
*/
@Override
protected void validateLogStatement(String message)
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/QueueLogSubjectTest.java Thu Jan 23 23:37:48 2014
@@ -61,7 +61,7 @@ public class QueueLogSubjectTest extends
* Validate that the logged Subject message is as expected:
* MESSAGE [Blank][vh(/test)/qu(QueueLogSubjectTest)] <Log Message>
*
- * @param message the message whos format needs validation
+ * @param message the message whose format needs validation
*/
@Override
protected void validateLogStatement(String message)
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubjectTest.java Thu Jan 23 23:37:48 2014
@@ -71,7 +71,7 @@ public class SubscriptionLogSubjectTest
* Validate that the logged Subject message is as expected:
* MESSAGE [Blank][sub:0(vh(/test)/qu(SubscriptionLogSubjectTest))] <Log Message>
*
- * @param message the message whos format needs validation
+ * @param message the message whose format needs validation
*/
@Override
protected void validateLogStatement(String message)
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/ConfiguredObjectStateTransitionTest.java Thu Jan 23 23:37:48 2014
@@ -180,7 +180,7 @@ public class ConfiguredObjectStateTransi
private void assertInvalidStateTransition(ConfiguredObject object, State initialState, State... invalidStates)
{
- assertEquals("Unepxceted state", initialState, object.getActualState());
+ assertEquals("Unexpected state", initialState, object.getActualState());
for (State state : invalidStates)
{
try
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/VirtualHostTest.java Thu Jan 23 23:37:48 2014
@@ -57,9 +57,9 @@ public class VirtualHostTest extends Qpi
CurrentActor.set(new TestLogActor(new SystemOutMessageLogger()));
_broker = BrokerTestHelper.createBrokerMock();
- TaskExecutor taslExecutor = mock(TaskExecutor.class);
- when(taslExecutor.isTaskExecutorThread()).thenReturn(true);
- when(_broker.getTaskExecutor()).thenReturn(taslExecutor);
+ TaskExecutor taskExecutor = mock(TaskExecutor.class);
+ when(taskExecutor.isTaskExecutorThread()).thenReturn(true);
+ when(_broker.getTaskExecutor()).thenReturn(taskExecutor);
_recovererProvider = mock(RecovererProvider.class);
_statisticsGatherer = mock(StatisticsGatherer.class);
@@ -126,7 +126,7 @@ public class VirtualHostTest extends Qpi
assertEquals("Unexpected state", State.DELETED, host.getAttribute(VirtualHost.STATE));
}
- public void testCreateQueueChildHavingMessageGrouppingAttributes()
+ public void testCreateQueueChildHavingMessageGroupingAttributes()
{
VirtualHost host = createHost();
host.setDesiredState(State.INITIALISING, State.ACTIVE);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java Thu Jan 23 23:37:48 2014
@@ -59,9 +59,9 @@ public class FileSystemPreferencesProvid
_preferencesFile = TestFileUtils.createTempFile(this, ".prefs.json", TEST_PREFERENCES);
_broker = BrokerTestHelper.createBrokerMock();
- TaskExecutor taslExecutor = mock(TaskExecutor.class);
- when(taslExecutor.isTaskExecutorThread()).thenReturn(true);
- when(_broker.getTaskExecutor()).thenReturn(taslExecutor);
+ TaskExecutor taskExecutor = mock(TaskExecutor.class);
+ when(taskExecutor.isTaskExecutorThread()).thenReturn(true);
+ when(_broker.getTaskExecutor()).thenReturn(taskExecutor);
when(_authenticationProvider.getParent(Broker.class)).thenReturn(_broker);
}
@@ -111,7 +111,7 @@ public class FileSystemPreferencesProvid
{
File emptyPrefsFile = new File(TMP_FOLDER, "preferences-" + getTestName() + ".json");
emptyPrefsFile.createNewFile();
- assertTrue("Preferences file does notexists", emptyPrefsFile.exists());
+ assertTrue("Preferences file does not exist", emptyPrefsFile.exists());
try
{
Map<String, Object> attributes = new HashMap<String, Object>();
@@ -130,7 +130,7 @@ public class FileSystemPreferencesProvid
_preferencesProvider = createPreferencesProvider();
_preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE);
- assertEquals("Unexpexpected state", State.ACTIVE, _preferencesProvider.getActualState());
+ assertEquals("Unexpected state", State.ACTIVE, _preferencesProvider.getActualState());
}
public void testChangeAttributes()
@@ -178,7 +178,7 @@ public class FileSystemPreferencesProvid
assertTrue("No preference found for user3", preferences3.isEmpty());
}
- public void testSetPrefernces()
+ public void testSetPreferences()
{
_preferencesProvider = createPreferencesProvider();
_preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE);
@@ -213,7 +213,7 @@ public class FileSystemPreferencesProvid
assertTrue("Unexpected preferences found for user3", preferences3.isEmpty());
}
- public void testDeletePrefernces()
+ public void testDeletePreferences()
{
_preferencesProvider = createPreferencesProvider();
_preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE);
@@ -237,7 +237,7 @@ public class FileSystemPreferencesProvid
assertTrue("Unexpected preferences found for user3", preferences3.isEmpty());
}
- public void testDeleteMultipleUsersPrefernces()
+ public void testDeleteMultipleUsersPreferences()
{
_preferencesProvider = createPreferencesProvider();
_preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java Thu Jan 23 23:37:48 2014
@@ -354,7 +354,7 @@ public class PortFactoryTest extends Qpi
try
{
_portFactory.createPort(_portId, _broker, attributes);
- fail("RMI port creation should fail as another one olready exist");
+ fail("RMI port creation should fail as another one already exist");
}
catch(IllegalConfigurationException e)
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/configuration/ConfigurationEntryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/configuration/ConfigurationEntryTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/configuration/ConfigurationEntryTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/configuration/ConfigurationEntryTest.java Thu Jan 23 23:37:48 2014
@@ -112,18 +112,18 @@ public class ConfigurationEntryTest exte
VirtualHost.class.getSimpleName(), attributes1, childrenIds, store);
assertTrue(entry1.equals(entry2));
- assertFalse("Entries should be diferrent because of diferrent IDs", entry1.equals(entryWithDifferentId));
+ assertFalse("Entries should be different because of different IDs", entry1.equals(entryWithDifferentId));
ConfigurationEntry entryWithDifferentChildId = new ConfigurationEntry(id,
VirtualHost.class.getSimpleName(), attributes1, Collections.singleton(UUID.randomUUID()), store);
- assertFalse("Entries should be diferrent because of diferrent children", entry1.equals(entryWithDifferentChildId));
+ assertFalse("Entries should be different because of different children", entry1.equals(entryWithDifferentChildId));
ConfigurationEntry entryWithDifferentName = new ConfigurationEntry(id,
VirtualHost.class.getSimpleName(), attributes2, childrenIds, store);
- assertFalse("Entries should be diferrent because of diferrent attributes", entry1.equals(entryWithDifferentName));
+ assertFalse("Entries should be different because of different attributes", entry1.equals(entryWithDifferentName));
ConfigurationEntry entryWithDifferentType = new ConfigurationEntry(id,
Broker.class.getSimpleName(), attributes1, childrenIds, store);
- assertFalse("Entries should be diferrent because of diferrent types", entry1.equals(entryWithDifferentType));
+ assertFalse("Entries should be different because of different types", entry1.equals(entryWithDifferentType));
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java Thu Jan 23 23:37:48 2014
@@ -231,7 +231,7 @@ public class AMQQueueFactoryTest extends
false,
attributes);
- assertEquals("Queue not a priorty queue", AMQPriorityQueue.class, queue.getClass());
+ assertEquals("Queue not a priority queue", AMQPriorityQueue.class, queue.getClass());
verifyQueueRegistered("testPriorityQueue");
verifyRegisteredQueueCount(1);
}
@@ -251,7 +251,7 @@ public class AMQQueueFactoryTest extends
//verify that no alternate exchange or DLQ were produced
- assertNull("Queue should not have an alternate exchange as DLQ wasnt enabled", queue.getAlternateExchange());
+ assertNull("Queue should not have an alternate exchange as DLQ wasn't enabled", queue.getAlternateExchange());
assertNull("The DLQ should not exist", _virtualHost.getQueue(dlQueueName));
verifyRegisteredQueueCount(1);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java Thu Jan 23 23:37:48 2014
@@ -346,7 +346,7 @@ public class MockAMQQueue implements AMQ
return null;
}
- public List<Long> getMessagesOnTheQueue(int num, int offest)
+ public List<Long> getMessagesOnTheQueue(int num, int offset)
{
return null;
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java Thu Jan 23 23:37:48 2014
@@ -85,7 +85,7 @@ public class NotificationCheckTest exten
verifyZeroInteractions(_listener);
MESSAGE_AGE_ALERT.notifyIfNecessary(_message, _queue, _listener);
- // Uses contains as first part of message is nondeterministic
+ // Uses contains as first part of message is non-deterministic
verify(_listener).notifyClients(eq(MESSAGE_AGE_ALERT), eq(_queue), contains("s : Maximum age on queue threshold (1s) breached."));
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java Thu Jan 23 23:37:48 2014
@@ -42,7 +42,7 @@ public abstract class QueueEntryImplTest
protected QueueEntryImpl _queueEntry2;
protected QueueEntryImpl _queueEntry3;
- public abstract QueueEntryImpl getQueueEntryImpl(int msgid) throws AMQException;
+ public abstract QueueEntryImpl getQueueEntryImpl(int msgId) throws AMQException;
public abstract void testCompareTo();
@@ -57,7 +57,7 @@ public abstract class QueueEntryImplTest
_queueEntry3 = getQueueEntryImpl(3);
}
- public void testAquire()
+ public void testAcquire()
{
assertTrue("Queue entry should be in AVAILABLE state before invoking of acquire method",
_queueEntry.isAvailable());
@@ -173,7 +173,7 @@ public abstract class QueueEntryImplTest
}
/**
- * Tests if entries in DEQUQUED or DELETED state are not returned by getNext method.
+ * Tests if entries in DEQUEUED or DELETED state are not returned by getNext method.
*/
public void testGetNext()
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java Thu Jan 23 23:37:48 2014
@@ -117,7 +117,7 @@ public abstract class QueueEntryListTest
entry = entryList.next(entry);
count++;
}
- assertEquals("Get next didnt get all the list entries", getExpectedListLength(), count);
+ assertEquals("Get next didn't get all the list entries", getExpectedListLength(), count);
}
/**
@@ -142,7 +142,7 @@ public abstract class QueueEntryListTest
* @see QueueEntryListTestBase#getTestList()
* @see QueueEntryListTestBase#getExpectedListLength()
*/
- public void testDequedMessagedNotPresentInIterator() throws Exception
+ public void testDequeuedMessagedNotPresentInIterator() throws Exception
{
final int numberOfMessages = getExpectedListLength();
final QueueEntryList<QueueEntry> entryList = getTestList();
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java Thu Jan 23 23:37:48 2014
@@ -674,15 +674,15 @@ public class SimpleAMQQueueTest extends
@Override
public void run()
{
- // we dont actually want/need this runner to do any work
+ // we don't actually want/need this runner to do any work
// because we we are already doing it!
}
});
// check expected messages delivered to correct consumers
- verifyRecievedMessages(msgListSub1, sub1.getMessages());
- verifyRecievedMessages(msgListSub2, sub2.getMessages());
- verifyRecievedMessages(msgListSub3, sub3.getMessages());
+ verifyReceivedMessages(msgListSub1, sub1.getMessages());
+ verifyReceivedMessages(msgListSub2, sub2.getMessages());
+ verifyReceivedMessages(msgListSub3, sub3.getMessages());
}
/**
@@ -791,7 +791,7 @@ public class SimpleAMQQueueTest extends
//delete message from top
_queue.deleteMessageFromTop();
- //get queue netries
+ //get queue entries
List<QueueEntry> entries = _queue.getMessagesOnTheQueue();
// assert queue entries
@@ -908,7 +908,7 @@ public class SimpleAMQQueueTest extends
Thread.currentThread().interrupt();
}
List<QueueEntry> expected = createEntriesList(entries.get(0), entries.get(2), entries.get(3));
- verifyRecievedMessages(expected, subscription.getMessages());
+ verifyReceivedMessages(expected, subscription.getMessages());
}
/**
@@ -1177,15 +1177,15 @@ public class SimpleAMQQueueTest extends
return entriesList;
}
- private void verifyRecievedMessages(List<QueueEntry> expected,
- List<QueueEntry> delivered)
+ private void verifyReceivedMessages(List<QueueEntry> expected,
+ List<QueueEntry> delivered)
{
assertEquals("Consumer did not receive the expected number of messages",
expected.size(), delivered.size());
for (QueueEntry msg : expected)
{
- assertTrue("Consumer did not recieve msg: "
+ assertTrue("Consumer did not receive msg: "
+ msg.getMessage().getMessageNumber(), delivered.contains(msg));
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java Thu Jan 23 23:37:48 2014
@@ -136,7 +136,7 @@ public class AuthenticatedPrincipalTest
assertFalse(user1principal2.equals(user1principal1));
}
- public void testEqualsWithDisimilarObjects()
+ public void testEqualsWithDissimilarObjects()
{
UsernamePrincipal wrappedPrincipal = new UsernamePrincipal("user1");
AuthenticatedPrincipal authenticatedPrincipal = new AuthenticatedPrincipal(wrappedPrincipal);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java Thu Jan 23 23:37:48 2014
@@ -253,7 +253,7 @@ public class Base64MD5PasswordFilePrinci
}
catch (IOException e)
{
- fail("Unable to valdate file contents due to:" + e.getMessage());
+ fail("Unable to validate file contents due to:" + e.getMessage());
}
}
@@ -384,7 +384,7 @@ public class Base64MD5PasswordFilePrinci
}
catch (IOException e)
{
- fail("Unable to valdate file contents due to:" + e.getMessage());
+ fail("Unable to validate file contents due to:" + e.getMessage());
}
}
@@ -445,7 +445,7 @@ public class Base64MD5PasswordFilePrinci
try
{
_database.verifyPassword("made.up.username", PASSWORD.toCharArray());
- fail("Should not have been able to verify this non-existant users password.");
+ fail("Should not have been able to verify this nonexistent users password.");
}
catch (AccountNotFoundException e)
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java Thu Jan 23 23:37:48 2014
@@ -141,7 +141,7 @@ public class PlainPasswordFilePrincipalD
}
catch (IOException e)
{
- fail("Unable to valdate file contents due to:" + e.getMessage());
+ fail("Unable to validate file contents due to:" + e.getMessage());
}
testFile.delete();
}
@@ -275,7 +275,7 @@ public class PlainPasswordFilePrincipalD
}
catch (IOException e)
{
- fail("Unable to valdate file contents due to:" + e.getMessage());
+ fail("Unable to validate file contents due to:" + e.getMessage());
}
testFile.delete();
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java Thu Jan 23 23:37:48 2014
@@ -38,7 +38,6 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.security.SubjectCreator;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus;
-import org.apache.qpid.server.security.auth.jmx.JMXPasswordAuthenticator;
import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
import org.apache.qpid.server.security.SecurityManager;
@@ -58,7 +57,7 @@ public class JMXPasswordAuthenticatorTes
private JMXPasswordAuthenticator _rmipa;
- private SubjectCreator _usernamePasswordOkaySuvjectCreator = createMockSubjectCreator(true, null);
+ private SubjectCreator _usernamePasswordOkaySubjectCreator = createMockSubjectCreator(true, null);
private SubjectCreator _badPasswordSubjectCreator = createMockSubjectCreator(false, null);
protected void setUp() throws Exception
@@ -72,7 +71,7 @@ public class JMXPasswordAuthenticatorTes
*/
public void testAuthenticationSuccess()
{
- when(_broker.getSubjectCreator(any(SocketAddress.class))).thenReturn(_usernamePasswordOkaySuvjectCreator);
+ when(_broker.getSubjectCreator(any(SocketAddress.class))).thenReturn(_usernamePasswordOkaySubjectCreator);
when(_securityManager.accessManagement()).thenReturn(true);
Subject newSubject = _rmipa.authenticate(_credentials);
@@ -100,7 +99,7 @@ public class JMXPasswordAuthenticatorTes
public void testAuthorisationFailure()
{
- when(_broker.getSubjectCreator(any(SocketAddress.class))).thenReturn(_usernamePasswordOkaySuvjectCreator);
+ when(_broker.getSubjectCreator(any(SocketAddress.class))).thenReturn(_usernamePasswordOkaySubjectCreator);
when(_securityManager.accessManagement()).thenReturn(false);
try
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java Thu Jan 23 23:37:48 2014
@@ -96,7 +96,7 @@ public class ExternalAuthenticationManag
assertEquals("person", saslServer.getAuthorizationID());
}
- public void testAuthenticatePrinicpalCnAndDc() throws Exception
+ public void testAuthenticatePrincipalCnAndDc() throws Exception
{
X500Principal principal = new X500Principal("CN=person, DC=example, DC=com");
UsernamePrincipal expectedPrincipal = new UsernamePrincipal("person@example.com");
@@ -111,7 +111,7 @@ public class ExternalAuthenticationManag
assertEquals("person@example.com", saslServer.getAuthorizationID());
}
- public void testAuthenticatePrinicpalCnDc_OtherComponentsIgnored() throws Exception
+ public void testAuthenticatePrincipalCnDc_OtherComponentsIgnored() throws Exception
{
X500Principal principal = new X500Principal("CN=person, DC=example, DC=com, O=My Company Ltd, L=Newbury, ST=Berkshire, C=GB");
UsernamePrincipal expectedPrincipal = new UsernamePrincipal("person@example.com");
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java Thu Jan 23 23:37:48 2014
@@ -33,15 +33,15 @@ public abstract class SaslServerTestCase
protected SaslServer server;
protected String username = "u";
protected String password = "p";
- protected String notpassword = "a";
+ protected String notPassword = "a";
protected PrincipalDatabase db = new TestPrincipalDatabase();
- protected byte[] correctresponse;
- protected byte[] wrongresponse;
+ protected byte[] correctResponse;
+ protected byte[] wrongResponse;
- public void testSucessfulAuth() throws SaslException
+ public void testSuccessfulAuth() throws SaslException
{
- byte[] resp = this.server.evaluateResponse(correctresponse);
+ byte[] resp = this.server.evaluateResponse(correctResponse);
assertNull(resp);
}
@@ -50,7 +50,7 @@ public abstract class SaslServerTestCase
boolean exceptionCaught = false;
try
{
- byte[] resp = this.server.evaluateResponse(wrongresponse);
+ byte[] resp = this.server.evaluateResponse(wrongResponse);
}
catch (SaslException e)
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java Thu Jan 23 23:37:48 2014
@@ -36,8 +36,8 @@ public class AMQPlainSaslServerTest exte
FieldTable table = FieldTableFactory.newFieldTable();
table.setString("LOGIN", username);
table.setString("PASSWORD", password);
- correctresponse = table.getDataAsBytes();
- table.setString("PASSWORD", notpassword);
- wrongresponse = table.getDataAsBytes();
+ correctResponse = table.getDataAsBytes();
+ table.setString("PASSWORD", notPassword);
+ wrongResponse = table.getDataAsBytes();
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java Thu Jan 23 23:37:48 2014
@@ -32,8 +32,8 @@ public class PlainSaslServerTest extends
UsernamePasswordInitialiser handler = new PlainInitialiser();
handler.initialise(db);
this.server = new PlainSaslServer(handler.getCallbackHandler());
- correctresponse = new byte[]{0x0, (byte) username.charAt(0), 0x0, (byte) password.charAt(0)};
- wrongresponse = new byte[]{0x0,(byte) username.charAt(0), 0x0, (byte) notpassword.charAt(0)};
+ correctResponse = new byte[]{0x0, (byte) username.charAt(0), 0x0, (byte) password.charAt(0)};
+ wrongResponse = new byte[]{0x0,(byte) username.charAt(0), 0x0, (byte) notPassword.charAt(0)};
}
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java Thu Jan 23 23:37:48 2014
@@ -187,7 +187,7 @@ public class FileGroupDatabaseTest exten
assertTrue(groups.contains(MY_GROUP1));
}
- public void testGetGroupPrincipalsForUserWhenUserAdddedToGroupTheyAreAlreadyIn() throws Exception
+ public void testGetGroupPrincipalsForUserWhenUserAddedToGroupTheyAreAlreadyIn() throws Exception
{
writeAndSetGroupFile("myGroup.users", USER1);
_groupDatabase.addUserToGroup(USER1, MY_GROUP);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java Thu Jan 23 23:37:48 2014
@@ -45,7 +45,7 @@ public class EventManagerTest extends Te
verifyZeroInteractions(_mockListener);
}
- public void testEventListenerFiresMulitpleTimes()
+ public void testEventListenerFiresMultipleTimes()
{
_eventManager.addEventListener(_mockListener, BEFORE_ACTIVATE);
_eventManager.addEventListener(_mockListener, AFTER_ACTIVATE);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/StateManagerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/StateManagerTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/StateManagerTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/StateManagerTest.java Thu Jan 23 23:37:48 2014
@@ -99,7 +99,7 @@ public class StateManagerTest extends Te
{
assertEquals(State.INITIAL, _manager.getState());
performValidTransition(StateManager.INITIALISE);
- performValidTransition(StateManager.INITALISE_COMPLETE);
+ performValidTransition(StateManager.INITIALISE_COMPLETE);
performValidTransition(StateManager.ACTIVATE);
performValidTransition(StateManager.ACTIVATE_COMPLETE);
performValidTransition(StateManager.QUIESCE);
@@ -112,13 +112,13 @@ public class StateManagerTest extends Te
_manager = new StateManager(this);
assertEquals(State.INITIAL, _manager.getState());
performValidTransition(StateManager.INITIALISE);
- performValidTransition(StateManager.INITALISE_COMPLETE);
+ performValidTransition(StateManager.INITIALISE_COMPLETE);
performValidTransition(StateManager.CLOSE_INITIALISED);
performValidTransition(StateManager.CLOSE_COMPLETE);
_manager = new StateManager(this);
performValidTransition(StateManager.INITIALISE);
- performValidTransition(StateManager.INITALISE_COMPLETE);
+ performValidTransition(StateManager.INITIALISE_COMPLETE);
performValidTransition(StateManager.ACTIVATE);
performValidTransition(StateManager.ACTIVATE_COMPLETE);
performValidTransition(StateManager.QUIESCE);
@@ -140,7 +140,7 @@ public class StateManagerTest extends Te
assertEquals(State.INITIAL, _manager.getState());
performInvalidTransitions(StateManager.INITIALISE, State.INITIALISED);
- performInvalidTransitions(StateManager.INITALISE_COMPLETE, State.ACTIVATING, State.CLOSING);
+ performInvalidTransitions(StateManager.INITIALISE_COMPLETE, State.ACTIVATING, State.CLOSING);
performInvalidTransitions(StateManager.ACTIVATE, State.ACTIVE);
performInvalidTransitions(StateManager.ACTIVATE_COMPLETE, State.QUIESCING, State.CLOSING, State.INITIALISED);
performInvalidTransitions(StateManager.QUIESCE, State.QUIESCED);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/subscription/SubscriptionListTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/subscription/SubscriptionListTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/subscription/SubscriptionListTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/subscription/SubscriptionListTest.java Thu Jan 23 23:37:48 2014
@@ -251,7 +251,7 @@ public class SubscriptionListTest extend
* Test that if the subscription not contained in the list is requested to be removed
* that the removal fails
*/
- public void testRemoveNonExistantNode()
+ public void testRemoveNonexistentNode()
{
Subscription sub4 = new MockSubscription();
assertNull("Should not have been a node present for the subscription", getNodeForSubscription(_subList, sub4));
@@ -360,7 +360,7 @@ public class SubscriptionListTest extend
*/
public void testIteratorSkipsFirstDeletedNode()
{
- //'delete' but dont remove the node for the 1st subscription
+ //'delete' but don't remove the node for the 1st subscription
assertTrue("Deleting subscription node should have succeeded",
getNodeForSubscription(_subList, _sub1).delete());
assertNotNull("Should still have been a node present for the deleted subscription",
@@ -383,7 +383,7 @@ public class SubscriptionListTest extend
*/
public void testIteratorSkipsCentralDeletedNode()
{
- //'delete' but dont remove the node for the 2nd subscription
+ //'delete' but don't remove the node for the 2nd subscription
assertTrue("Deleting subscription node should have succeeded",
getNodeForSubscription(_subList, _sub2).delete());
assertNotNull("Should still have been a node present for the deleted subscription",
@@ -406,7 +406,7 @@ public class SubscriptionListTest extend
*/
public void testIteratorSkipsDeletedFinalNode()
{
- //'delete' but dont remove the node for the 3rd subscription
+ //'delete' but don't remove the node for the 3rd subscription
assertTrue("Deleting subscription node should have succeeded",
getNodeForSubscription(_subList, _sub3).delete());
assertNotNull("Should still have been a node present for the deleted 3rd subscription",
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java Thu Jan 23 23:37:48 2014
@@ -72,7 +72,7 @@ public class AsyncAutoCommitTransactionT
verifyZeroInteractions(_postTransactionAction);
}
- public void testEnqueuePersistentMessageOnMultiplQueuesPostCommitNotCalled() throws Exception
+ public void testEnqueuePersistentMessageOnMultipleQueuesPostCommitNotCalled() throws Exception
{
setTestSystemProperty(STRICT_ORDER_SYSTEM_PROPERTY, "false");
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java Thu Jan 23 23:37:48 2014
@@ -361,7 +361,7 @@ public class AutoCommitTransactionTest e
}
/**
- * Tests the add of a post-commit action. Since AutoCommitTranctions
+ * Tests the add of a post-commit action. Since AutoCommitTransactions
* have no long lived transactions, the post commit action is fired immediately.
*/
public void testPostCommitActionFiredImmediately() throws Exception
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java Thu Jan 23 23:37:48 2014
@@ -347,7 +347,7 @@ public class LocalTransactionTest extend
}
/**
- * Tests the add of a post-commit action. Unlike AutoCommitTranctions, the post transaction actions
+ * Tests the add of a post-commit action. Unlike AutoCommitTransactions, the post transaction actions
* is added to a list to be fired on commit or rollback.
*/
public void testAddingPostCommitActionNotFiredImmediately() throws Exception
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java Thu Jan 23 23:37:48 2014
@@ -23,7 +23,7 @@ package org.apache.qpid.server.txn;
import org.apache.qpid.server.txn.ServerTransaction.Action;
/**
- * Mock implementation of a ServerTranaction Action
+ * Mock implementation of a ServerTransaction Action
* allowing its state to be observed.
*
*/
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java Thu Jan 23 23:37:48 2014
@@ -369,7 +369,7 @@ public class DurableConfigurationRecover
}
catch(IllegalConfigurationException e)
{
- assertEquals("Unkown type for configured object: Wibble", e.getMessage());
+ assertEquals("Unknown type for configured object: Wibble", e.getMessage());
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java Thu Jan 23 23:37:48 2014
@@ -279,7 +279,7 @@ public class StandardVirtualHostTest ext
* @param vhostName name of the virtualhost
* @param queueName name of the queue
* @param exchangeName name of a direct exchange to declare (unless dontDeclare = true) and bind the queue to (null = none)
- * @param dontDeclare if true then dont declare the exchange, even if its name is non-null
+ * @param dontDeclare if true then don't declare the exchange, even if its name is non-null
* @param routingKeys routingKeys to bind the queue with (empty array = none)
* @return
*/
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java Thu Jan 23 23:37:48 2014
@@ -182,7 +182,7 @@ public class PlainConfiguration extends
break; // continue reading next line
}
- // invalid location for continuation character (add one to line beacuse we ate the EOL)
+ // invalid location for continuation character (add one to line because we ate the EOL)
throw new IllegalConfigurationException(String.format(PREMATURE_CONTINUATION_MSG, getLine() + 1));
}
else if (_st.ttype == '\'' || _st.ttype == '"')
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java Thu Jan 23 23:37:48 2014
@@ -35,7 +35,7 @@ import org.apache.qpid.server.security.a
*/
public class Rule implements Comparable<Rule>
{
- /** String indicating all identitied. */
+ /** String indicating all identified. */
public static final String ALL = "all";
private Integer _number;
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java Thu Jan 23 23:37:48 2014
@@ -242,7 +242,7 @@ public class RuleSet
/** Returns true if a username has the name[@domain][/realm] format */
protected boolean isvalidUserName(String name)
{
- // check for '@' and '/' in namne
+ // check for '@' and '/' in name
int atPos = name.indexOf(AT);
int slashPos = name.indexOf(SLASH);
boolean atFound = atPos != StringUtils.INDEX_NOT_FOUND && atPos == name.lastIndexOf(AT);
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java?rev=1560853&r1=1560852&r2=1560853&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java Thu Jan 23 23:37:48 2014
@@ -323,7 +323,7 @@ public class PlainConfigurationTest exte
* be introduced anywhere in the ACL, whereas the C++ supports only whitespace at the beginning of
* of line.
*/
- public void testCommentsSuppported() throws Exception
+ public void testCommentsSupported() throws Exception
{
final PlainConfiguration config = writeACLConfig("#Comment",
"ACL DENY-LOG user1 ACCESS VIRTUALHOST # another comment",
@@ -362,7 +362,7 @@ public class PlainConfigurationTest exte
/**
* Tests interpretation of an acl utilising line continuation.
*/
- public void testLineContination() throws Exception
+ public void testLineContinuation() throws Exception
{
final PlainConfiguration config = writeACLConfig("ACL DENY-LOG user1 \\",
"ACCESS VIRTUALHOST");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org