Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java?rev=996393&r1=996392&r2=996393&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/RollbackTest.java Sun Sep 12 22:40:40 2010 @@ -42,7 +42,7 @@ import org.apache.qpid.junit.extensions. public class RollbackTest extends FrameworkBaseCase { /** Used to read the tests configurable properties through. */ - ParsedProperties testProps; + private ParsedProperties testProps; /** * Creates a new test case with the specified name.
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/TTLTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/TTLTest.java?rev=996393&r1=996392&r2=996393&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/TTLTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/testcases/TTLTest.java Sun Sep 12 22:40:40 2010 @@ -87,12 +87,12 @@ public class TTLTest extends FrameworkBa List<Message> receivedMessages = new LinkedList<Message>(); // Set up the test properties to match the test case requirements. - testProps.setProperty(ACK_MODE_PROPNAME, Session.AUTO_ACKNOWLEDGE); - testProps.setProperty(PUBSUB_PROPNAME, false); + getTestProps().setProperty(ACK_MODE_PROPNAME, Session.AUTO_ACKNOWLEDGE); + getTestProps().setProperty(PUBSUB_PROPNAME, false); // Create the test circuit from the test configuration parameters. CircuitFactory circuitFactory = getCircuitFactory(); - Circuit testCircuit = circuitFactory.createCircuit(getConnection(), testProps); + Circuit testCircuit = circuitFactory.createCircuit(getConnection(), getTestProps()); // This test case assumes it is using a local circuit. LocalCircuitImpl localCircuit = (LocalCircuitImpl) testCircuit; @@ -122,9 +122,12 @@ public class TTLTest extends FrameworkBa // those received should have avoided being purged by the TTL. boolean timedOut = false; - while (!timedOut) + + Message testMessage = null; + + do { - Message testMessage = consumer.receive(1000); + testMessage = consumer.receive(1000); long ttl = testMessage.getLongProperty("testTTL"); long timeStamp = testMessage.getJMSTimestamp(); @@ -140,7 +143,7 @@ public class TTLTest extends FrameworkBa { receivedMessages.add(testMessage); }*/ - } + } while (!timedOut && testMessage != null); // Check that the queue and message store on the broker are empty. // assertTrue("Message store is not empty.", messageStoreEmpty.apply()); Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java?rev=996393&r1=996392&r2=996393&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java Sun Sep 12 22:40:40 2010 @@ -61,7 +61,10 @@ public class ConnectionTest extends Qpid } finally { - conn.close(); + if(conn != null) + { + conn.close(); + } } } Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java?rev=996393&r1=996392&r2=996393&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java Sun Sep 12 22:40:40 2010 @@ -278,10 +278,6 @@ public class ConversationFactory { sendTo = sendDestination; } - else if (sendDestination != null) - { - sendTo = sendDestination; - } else { throw new JMSException("The send destination was specified, and no most recent reply-to available to use."); Modified: qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Client.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Client.java?rev=996393&r1=996392&r2=996393&view=diff ============================================================================== --- qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Client.java (original) +++ qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Client.java Sun Sep 12 22:40:40 2010 @@ -32,21 +32,21 @@ import javax.jms.Session; public abstract class Client { - protected Connection con; - protected Session ssn; - protected boolean durable = false; - protected boolean transacted = false; - protected int txSize = 10; - protected int ack_mode = Session.AUTO_ACKNOWLEDGE; - protected String contentType = "application/octet-stream"; - protected Destination dest = null; - - protected long reportFrequency = 60000; // every min - protected DateFormat df = new SimpleDateFormat("yyyy.MM.dd 'at' HH:mm:ss"); - protected NumberFormat nf = new DecimalFormat("##.00"); + private Connection con; + private Session ssn; + private boolean durable = false; + private boolean transacted = false; + private int txSize = 10; + private int ack_mode = Session.AUTO_ACKNOWLEDGE; + private String contentType = "application/octet-stream"; - protected long startTime = System.currentTimeMillis(); - protected ErrorHandler errorHandler = null; + private long reportFrequency = 60000; // every min + + private DateFormat df = new SimpleDateFormat("yyyy.MM.dd 'at' HH:mm:ss"); + private NumberFormat nf = new DecimalFormat("##.00"); + + private long startTime = System.currentTimeMillis(); + private ErrorHandler errorHandler = null; public Client(Connection con) throws Exception { @@ -87,4 +87,60 @@ public abstract class Client e.printStackTrace(); } } + + protected Session getSsn() + { + return ssn; + } + + protected void setSsn(Session ssn) + { + this.ssn = ssn; + } + + protected boolean isDurable() + { + return durable; + } + + protected boolean isTransacted() + { + return transacted; + } + + protected int getTxSize() + { + return txSize; + } + + protected int getAck_mode() + { + return ack_mode; + } + + protected String getContentType() + { + return contentType; + } + + protected long getReportFrequency() + { + return reportFrequency; + } + + protected long getStartTime() + { + return startTime; + } + + protected void setStartTime(long startTime) + { + this.startTime = startTime; + } + + public DateFormat getDf() + { + return df; + } + } Modified: qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Receiver.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Receiver.java?rev=996393&r1=996392&r2=996393&view=diff ============================================================================== --- qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Receiver.java (original) +++ qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Receiver.java Sun Sep 12 22:40:40 2010 @@ -26,7 +26,6 @@ import java.util.List; import javax.jms.Connection; import javax.jms.Destination; -import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.MessageListener; @@ -101,8 +100,8 @@ public class Receiver extends Client imp { super(con); reliability = reliability.getReliability(System.getProperty("reliability","exactly_once")); - ssn = con.createSession(transacted,ack_mode); - consumer = ssn.createConsumer(dest); + setSsn(con.createSession(isTransacted(), getAck_mode())); + consumer = getSsn().createConsumer(dest); if (!sync_rcv) { consumer.setMessageListener(this); @@ -126,8 +125,8 @@ public class Receiver extends Client imp Message msg = consumer.receive(); handleMessage(msg); } - Thread.sleep(reportFrequency); - System.out.println(df.format(System.currentTimeMillis()) + Thread.sleep(getReportFrequency()); + System.out.println(getDf().format(System.currentTimeMillis()) + " - messages received : " + msg_count); } } @@ -138,12 +137,12 @@ public class Receiver extends Client imp { if (m instanceof TextMessage && ((TextMessage) m).getText().equals("End")) { - MessageProducer temp = ssn.createProducer(m.getJMSReplyTo()); - Message controlMsg = ssn.createTextMessage(); + MessageProducer temp = getSsn().createProducer(m.getJMSReplyTo()); + Message controlMsg = getSsn().createTextMessage(); temp.send(controlMsg); - if (transacted) + if (isTransacted()) { - ssn.commit(); + getSsn().commit(); } temp.close(); } @@ -182,9 +181,9 @@ public class Receiver extends Client imp } // Please note that this test case doesn't expect duplicates // When testing for transactions. - if (transacted && msg_count % txSize == 0) + if (isTransacted() && msg_count % getTxSize() == 0) { - ssn.commit(); + getSsn().commit(); } } } Modified: qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Sender.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Sender.java?rev=996393&r1=996392&r2=996393&view=diff ============================================================================== --- qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Sender.java (original) +++ qpid/trunk/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Sender.java Sun Sep 12 22:40:40 2010 @@ -93,10 +93,10 @@ public class Sender extends Client this.msg_count = Integer.getInteger("msg_count", 10); this.iterations = Integer.getInteger("iterations", -1); this.sleep_time = Long.getLong("sleep_time", 1000); - this.ssn = con.createSession(transacted,Session.AUTO_ACKNOWLEDGE); + this.setSsn(con.createSession(isTransacted(),Session.AUTO_ACKNOWLEDGE)); this.dest = dest; - this.producer = ssn.createProducer(dest); - this.replyTo = ssn.createTemporaryQueue(); + this.producer = getSsn().createProducer(dest); + this.replyTo = getSsn().createTemporaryQueue(); System.out.println("Sending messages to : " + dest); } @@ -108,11 +108,11 @@ public class Sender extends Client protected Message getNextMessage() throws Exception { int s = msg_size == -1 ? 500 + gen.nextInt(1000) : msg_size; - Message msg = (contentType.equals("text/plain")) ? - MessageFactory.createTextMessage(ssn, s): - MessageFactory.createBytesMessage(ssn, s); + Message msg = (getContentType().equals("text/plain")) ? + MessageFactory.createTextMessage(getSsn(), s): + MessageFactory.createBytesMessage(getSsn(), s); - msg.setJMSDeliveryMode((durable) ? DeliveryMode.PERSISTENT + msg.setJMSDeliveryMode((isDurable()) ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT); return msg; } @@ -125,10 +125,10 @@ public class Sender extends Client for (int x=0; infinite || x < iterations; x++) { long now = System.currentTimeMillis(); - if (now - startTime >= reportFrequency) + if (now - getStartTime() >= getReportFrequency()) { System.out.println(df.format(now) + " - iterations : " + x); - startTime = now; + setStartTime(now); } for (int i = 0; i < msg_count; i++) @@ -136,26 +136,26 @@ public class Sender extends Client Message msg = getNextMessage(); msg.setIntProperty("sequence",i); producer.send(msg); - if (transacted && msg_count % txSize == 0) + if (isTransacted() && msg_count % getTxSize() == 0) { - ssn.commit(); + getSsn().commit(); } } - TextMessage m = ssn.createTextMessage("End"); + TextMessage m = getSsn().createTextMessage("End"); m.setJMSReplyTo(replyTo); producer.send(m); - if (transacted) + if (isTransacted()) { - ssn.commit(); + getSsn().commit(); } - MessageConsumer feedbackConsumer = ssn.createConsumer(replyTo); + MessageConsumer feedbackConsumer = getSsn().createConsumer(replyTo); feedbackConsumer.receive(); feedbackConsumer.close(); - if (transacted) + if (isTransacted()) { - ssn.commit(); + getSsn().commit(); } Thread.sleep(sleep_time); } --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
