[jboss-cvs] JBoss Messaging SVN: r4583 - in trunk/tests/src/org/jboss/messaging/tests: util and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 25 16:04:13 EDT 2008
Author: timfox
Date: 2008-06-25 16:04:13 -0400 (Wed, 25 Jun 2008)
New Revision: 4583
Modified:
trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java
trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java
Log:
Minor tidy
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java 2008-06-25 20:02:13 UTC (rev 4582)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/server/impl/MessageReferenceImplTest.java 2008-06-25 20:04:13 UTC (rev 4583)
@@ -256,43 +256,43 @@
}
public void testExpireToQDoesntExist() throws Exception
- {
- QueueSettings queueSettings = new QueueSettings();
- queueSettings.setMaxDeliveryAttempts(1);
- SimpleString expQName = new SimpleString("testexpQ");
- Binding expQBinding = EasyMock.createStrictMock(Binding.class);
- queueSettings.setExpiryQueue(expQName);
- StorageManager sm = EasyMock.createNiceMock(StorageManager.class);
- PostOffice po = EasyMock.createStrictMock(PostOffice.class);
- HierarchicalRepository<QueueSettings> repos = EasyMock.createStrictMock(HierarchicalRepository.class);
- ServerMessage serverMessage = EasyMock.createStrictMock(ServerMessage.class);
- Queue queue = EasyMock.createStrictMock(Queue.class);
- MessageReferenceImpl messageReference = new DummyMessageReference(serverMessage, queue);
- messageReference.setDeliveryCount(1);
- SimpleString queueName = new SimpleString("queueName");
- queue.referenceAcknowledged(messageReference);
- EasyMock.expect(queue.getName()).andStubReturn(queueName);
- EasyMock.expect(repos.getMatch(queueName.toString())).andStubReturn(queueSettings);
- EasyMock.expect(serverMessage.isDurable()).andStubReturn(true);
- EasyMock.expect(serverMessage.getMessageID()).andStubReturn(999l);
- EasyMock.expect(queue.isDurable()).andStubReturn(true);
- EasyMock.expect(sm.generateMessageID()).andReturn(2l);
- EasyMock.expect(sm.generateTransactionID()).andReturn(1l);
- EasyMock.expect(po.getBinding(expQName)).andReturn(null);
- EasyMock.expect(po.addBinding(expQName, expQName, null, true, false)).andReturn(expQBinding);
- EasyMock.expect(serverMessage.copy()).andReturn(serverMessage);
- serverMessage.setMessageID(2);
- serverMessage.setExpiration(0);
- serverMessage.putLongProperty(EasyMock.eq(MessageImpl.HDR_ACTUAL_EXPIRY_TIME), EasyMock.anyLong());
- EasyMock.expect(expQBinding.getAddress()).andStubReturn(expQName);
- serverMessage.setDestination(expQName);
- EasyMock.expect(po.route(serverMessage)).andReturn(new ArrayList<MessageReference>());
- EasyMock.expect(serverMessage.getDurableRefCount()).andReturn(0);
- EasyMock.expect(serverMessage.decrementDurableRefCount()).andReturn(0);
- EasyMock.replay(sm, po, repos, serverMessage, queue, expQBinding);
- messageReference.expire(sm, po, repos);
- EasyMock.verify(sm, po, repos, serverMessage, queue, expQBinding);
- }
+ {
+ QueueSettings queueSettings = new QueueSettings();
+ queueSettings.setMaxDeliveryAttempts(1);
+ SimpleString expQName = new SimpleString("testexpQ");
+ Binding expQBinding = EasyMock.createStrictMock(Binding.class);
+ queueSettings.setExpiryQueue(expQName);
+ StorageManager sm = EasyMock.createNiceMock(StorageManager.class);
+ PostOffice po = EasyMock.createStrictMock(PostOffice.class);
+ HierarchicalRepository<QueueSettings> repos = EasyMock.createStrictMock(HierarchicalRepository.class);
+ ServerMessage serverMessage = EasyMock.createStrictMock(ServerMessage.class);
+ Queue queue = EasyMock.createStrictMock(Queue.class);
+ MessageReferenceImpl messageReference = new DummyMessageReference(serverMessage, queue);
+ messageReference.setDeliveryCount(1);
+ SimpleString queueName = new SimpleString("queueName");
+ queue.referenceAcknowledged(messageReference);
+ EasyMock.expect(queue.getName()).andStubReturn(queueName);
+ EasyMock.expect(repos.getMatch(queueName.toString())).andStubReturn(queueSettings);
+ EasyMock.expect(serverMessage.isDurable()).andStubReturn(true);
+ EasyMock.expect(serverMessage.getMessageID()).andStubReturn(999l);
+ EasyMock.expect(queue.isDurable()).andStubReturn(true);
+ EasyMock.expect(sm.generateMessageID()).andReturn(2l);
+ EasyMock.expect(sm.generateTransactionID()).andReturn(1l);
+ EasyMock.expect(po.getBinding(expQName)).andReturn(null);
+ EasyMock.expect(po.addBinding(expQName, expQName, null, true, false)).andReturn(expQBinding);
+ EasyMock.expect(serverMessage.copy()).andReturn(serverMessage);
+ serverMessage.setMessageID(2);
+ serverMessage.setExpiration(0);
+ serverMessage.putLongProperty(EasyMock.eq(MessageImpl.HDR_ACTUAL_EXPIRY_TIME), EasyMock.anyLong());
+ EasyMock.expect(expQBinding.getAddress()).andStubReturn(expQName);
+ serverMessage.setDestination(expQName);
+ EasyMock.expect(po.route(serverMessage)).andReturn(new ArrayList<MessageReference>());
+ EasyMock.expect(serverMessage.getDurableRefCount()).andReturn(0);
+ EasyMock.expect(serverMessage.decrementDurableRefCount()).andReturn(0);
+ EasyMock.replay(sm, po, repos, serverMessage, queue, expQBinding);
+ messageReference.expire(sm, po, repos);
+ EasyMock.verify(sm, po, repos, serverMessage, queue, expQBinding);
+ }
//we need to override the constructor for creation
class DummyMessageReference extends MessageReferenceImpl
Modified: trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java 2008-06-25 20:02:13 UTC (rev 4582)
+++ trunk/tests/src/org/jboss/messaging/tests/util/UnitTestCase.java 2008-06-25 20:04:13 UTC (rev 4583)
@@ -53,22 +53,6 @@
*/
public class UnitTestCase extends TestCase
{
-// protected void assertByteArraysEquivalent(byte[] bytes1, byte[] bytes2)
-// {
-// if (bytes1.length != bytes2.length)
-// {
-// fail("Byte arrays different sizes bytes1: " + dumpBytes(bytes1) + " bytes2: " + dumpBytes(bytes2));
-// }
-//
-// for (int i = 0; i < bytes1.length; i++)
-// {
-// if (bytes1[i] != bytes2[i])
-// {
-// fail("Byte arrays not equivalent: " + dumpBytes(bytes1) + " bytes2: " + dumpBytes(bytes2));
-// }
-// }
-// }
-
protected String dumpBytes(byte[] bytes)
{
StringBuffer buff = new StringBuffer();
@@ -177,30 +161,7 @@
assertTrue(o1 == o2);
}
}
-
-// protected void assertRefListsEquivalent(List<MessageReference> l1, List<MessageReference> l2)
-// {
-// if (l1.size() != l2.size())
-// {
-// fail("Lists different sizes: " + l1.size() + ", " + l2.size());
-// }
-//
-// Iterator<MessageReference> iter1 = l1.iterator();
-// Iterator<MessageReference> iter2 = l2.iterator();
-//
-// while (iter1.hasNext())
-// {
-// MessageReference o1 = iter1.next();
-// MessageReference o2 = iter2.next();
-//
-// assertEquals(o1.getMessage().getMessageID(), o2.getMessage().getMessageID());
-//
-// assertEquals(o1.getScheduledDeliveryTime(), o2.getScheduledDeliveryTime());
-//
-// assertEquals(o1.getDeliveryCount(), o2.getDeliveryCount());
-// }
-// }
-
+
protected ServerMessage generateMessage(long id)
{
ServerMessage message = new ServerMessageImpl((byte)0, true, 0, System.currentTimeMillis(), (byte)4, new ByteBufferWrapper(ByteBuffer.allocateDirect(1024)));
@@ -228,42 +189,6 @@
return message.createReference(queue);
}
-// protected void assertEquivalent(ServerMessage msg1, ServerMessage msg2)
-// {
-// assertEquivalent(msg1, msg2, true);
-// }
-//
-// protected void assertEquivalent(ServerMessage msg1, ServerMessage msg2, boolean exactQueue)
-// {
-// assertEquals(msg1.getMessageID(), msg2.getMessageID());
-//
-// assertEquals(msg1.isDurable(), msg2.isDurable());
-//
-// assertEquals(msg1.getExpiration(), msg2.getExpiration());
-//
-// assertEquals(msg1.getTimestamp(), msg2.getTimestamp());
-//
-// assertEquals(msg1.getPriority(), msg2.getPriority());
-//
-// assertEquals(msg1.getType(), msg2.getType());
-//
-// assertEqualsByteArrays(msg1.getBody().array(), msg2.getBody().array());
-//
-// assertEquals(msg1.getDurableRefCount(), msg2.getDurableRefCount());
-//
-// assertEquals(msg1.getDestination(), msg2.getDestination());
-// }
-//
-// protected void assertMapsEquivalent(Map<String, Object> headers1, Map<String, Object> headers2)
-// {
-// assertEquals(headers1.size(), headers2.size());
-//
-// for (Map.Entry<String, Object> entry : headers1.entrySet())
-// {
-// assertEquals(entry.getValue(), headers2.get(entry.getKey()));
-// }
-// }
-
protected int calculateRecordSize(int size, int alignment)
{
return ((size / alignment) + (size % alignment != 0 ? 1 : 0)) * alignment;
More information about the jboss-cvs-commits
mailing list