You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2007/04/23 17:58:05 UTC
svn commit: r531515 - in /incubator/qpid/branches/M2/java:
broker/src/main/java/org/apache/qpid/server/queue/ systests/
systests/src/main/java/org/apache/qpid/server/ack/
systests/src/main/java/org/apache/qpid/server/queue/
systests/src/main/java/org/a...
Author: ritchiem
Date: Mon Apr 23 08:58:04 2007
New Revision: 531515
URL: http://svn.apache.org/viewvc?view=rev&rev=531515
Log:
Update to system test so that the run as part of the build process as they were not running.
Change to AMQMessage to ensure that the TxAckTest passes. Was failing as the reference count was being changed out of the increment/decrementReference methods
Added:
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTestDisabled.java (contents, props changed)
- copied, changed from r530795, incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTest.java
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java (contents, props changed)
- copied, changed from r530795, incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTest.java
Removed:
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTest.java
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTest.java
Modified:
incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
incubator/qpid/branches/M2/java/systests/pom.xml
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTest.java
Modified: incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java?view=diff&rev=531515&r1=531514&r2=531515
==============================================================================
--- incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java (original)
+++ incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java Mon Apr 23 08:58:04 2007
@@ -366,7 +366,7 @@
*/
public AMQMessage takeReference()
{
- _referenceCount.incrementAndGet();
+ incrementReference();// _referenceCount.incrementAndGet();
return this;
}
Modified: incubator/qpid/branches/M2/java/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/systests/pom.xml?view=diff&rev=531515&r1=531514&r2=531515
==============================================================================
--- incubator/qpid/branches/M2/java/systests/pom.xml (original)
+++ incubator/qpid/branches/M2/java/systests/pom.xml Mon Apr 23 08:58:04 2007
@@ -62,7 +62,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <skip>true</skip>
+ <testSourceDirectory>${basedir}/src/main</testSourceDirectory>
+ <testClassesDirectory>target/classes</testClassesDirectory>
</configuration>
</plugin>
@@ -89,3 +90,4 @@
</resources>
</build>
</project>
+
Modified: incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java?view=diff&rev=531515&r1=531514&r2=531515
==============================================================================
--- incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java (original)
+++ incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/ack/TxAckTest.java Mon Apr 23 08:58:04 2007
@@ -24,6 +24,8 @@
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.BasicPublishBody;
import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.ContentHeaderBody;
+import org.apache.qpid.framing.AMQFrameDecodingException;
import org.apache.qpid.framing.abstraction.MessagePublishInfo;
import org.apache.qpid.server.RequiredDeliveryException;
import org.apache.qpid.server.queue.AMQMessage;
@@ -102,7 +104,7 @@
_storeContext, null,
new LinkedList<RequiredDeliveryException>(),
new HashSet<Long>());
- for(int i = 0; i < messageCount; i++)
+ for (int i = 0; i < messageCount; i++)
{
long deliveryTag = i + 1;
@@ -144,7 +146,7 @@
private void assertCount(List<Long> tags, int expected)
{
- for(long tag : tags)
+ for (long tag : tags)
{
UnacknowledgedMessage u = _map.get(tag);
assertTrue("Message not found for tag " + tag, u != null);
@@ -161,6 +163,7 @@
assertCount(_unacked, 0);
}
+
void undoPrepare()
{
_op.consolidate();
@@ -175,7 +178,6 @@
_op.consolidate();
_op.commit(_storeContext);
-
//check acked messages are removed from map
Set<Long> keys = new HashSet<Long>(_map.getDeliveryTags());
keys.retainAll(_acked);
@@ -195,6 +197,20 @@
TestMessage(long tag, long messageId, MessagePublishInfo publishBody, TransactionalContext txnContext)
{
super(messageId, publishBody, txnContext);
+ try
+ {
+ setContentHeaderBody(new ContentHeaderBody()
+ {
+ public int getSize()
+ {
+ return 1;
+ }
+ });
+ }
+ catch (AMQException e)
+ {
+ // won't happen
+ }
_tag = tag;
}
Copied: incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTestDisabled.java (from r530795, incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTest.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTestDisabled.java?view=diff&rev=531515&p1=incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTest.java&r1=530795&p2=incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTestDisabled.java&r2=531515
==============================================================================
--- incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTest.java (original)
+++ incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTestDisabled.java Mon Apr 23 08:58:04 2007
@@ -34,7 +34,7 @@
* Tests delivery in the face of concurrent incoming _messages, subscription alterations
* and attempts to asynchronously process queued _messages.
*/
-public class ConcurrencyTest extends MessageTestHelper
+public class ConcurrencyTestDisabled extends MessageTestHelper
{
private final Random random = new Random();
@@ -55,7 +55,7 @@
private boolean failed;
private VirtualHost _virtualHost;
- public ConcurrencyTest() throws Exception
+ public ConcurrencyTestDisabled() throws Exception
{
IApplicationRegistry applicationRegistry = ApplicationRegistry.getInstance();
@@ -259,7 +259,7 @@
public static junit.framework.Test suite()
{
- return new junit.framework.TestSuite(ConcurrencyTest.class);
+ return new junit.framework.TestSuite(ConcurrencyTestDisabled.class);
}
}
Propchange: incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTestDisabled.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTestDisabled.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java?view=diff&rev=531515&r1=531514&r2=531515
==============================================================================
--- incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java (original)
+++ incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/MessageTestHelper.java Mon Apr 23 08:58:04 2007
@@ -29,6 +29,7 @@
import org.apache.qpid.server.store.StoreContext;
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.util.TestApplicationRegistry;
+import org.apache.qpid.server.util.NullApplicationRegistry;
import org.apache.qpid.server.txn.TransactionalContext;
import org.apache.qpid.server.txn.NonTransactionalContext;
import org.apache.qpid.server.RequiredDeliveryException;
@@ -51,7 +52,7 @@
MessageTestHelper() throws Exception
{
- ApplicationRegistry.initialise(new TestApplicationRegistry());
+ ApplicationRegistry.initialise(new NullApplicationRegistry());
}
AMQMessage message() throws AMQException
Copied: incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java (from r530795, incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTest.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java?view=diff&rev=531515&p1=incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTest.java&r1=530795&p2=incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java&r2=531515
==============================================================================
--- incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTest.java (original)
+++ incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java Mon Apr 23 08:58:04 2007
@@ -37,9 +37,9 @@
import java.io.IOException;
import java.util.Properties;
-public class PersistentTest
+public class PersistentTestManual
{
- private static final Logger _logger = Logger.getLogger(PersistentTest.class);
+ private static final Logger _logger = Logger.getLogger(PersistentTestManual.class);
private static final String QUEUE = "direct://amq.direct//PersistentTest-Queue2?durable='true',exclusive='true'";
@@ -56,7 +56,7 @@
private String _password;
private String _virtualpath;
- public PersistentTest(Properties overrides)
+ public PersistentTestManual(Properties overrides)
{
properties = new Properties(defaults);
properties.putAll(overrides);
@@ -257,12 +257,12 @@
public static void main(String[] args)
{
- PersistentTest test;
+ PersistentTestManual test;
Properties options = CommandLineParser.processCommandLine(args, new CommandLineParser(new String[][]{}));
- test = new PersistentTest(options);
+ test = new PersistentTestManual(options);
try
{
test.test();
Propchange: incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java?view=diff&rev=531515&r1=531514&r2=531515
==============================================================================
--- incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java (original)
+++ incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java Mon Apr 23 08:58:04 2007
@@ -114,4 +114,9 @@
TransportConnection.killVMBroker(1);
super.tearDown();
}
+
+ public void testDummyinVMTestCase()
+ {
+ // keep maven happy
+ }
}
Modified: incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTest.java?view=diff&rev=531515&r1=531514&r2=531515
==============================================================================
--- incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTest.java (original)
+++ incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTest.java Mon Apr 23 08:58:04 2007
@@ -20,8 +20,8 @@
*/
package org.apache.qpid.test.client;
-import org.apache.qpid.test.VMTestCase;
import org.apache.log4j.Logger;
+import org.apache.qpid.test.VMTestCase;
import javax.jms.Queue;
import javax.jms.ConnectionFactory;
@@ -36,6 +36,8 @@
import javax.jms.Message;
import java.util.Enumeration;
+import junit.framework.TestCase;
+
public class QueueBrowserTest extends VMTestCase
{
private static final Logger _logger = Logger.getLogger(QueueBrowserTest.class);
@@ -87,7 +89,7 @@
*
*/
- public void queueBrowserMsgsRemainOnQueueTest() throws JMSException
+ public void testQueueBrowserMsgsRemainOnQueue() throws JMSException
{
// create QueueBrowser