Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java?rev=1236867&r1=1236866&r2=1236867&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java Fri Jan 27 20:15:31 2012 @@ -52,7 +52,7 @@ public class ChannelCloseTest extends Qp { private static final Logger _logger = LoggerFactory.getLogger(ChannelCloseTest.class); - Connection _connection; + private Connection _connection; private Session _session; private static final long SYNC_TIMEOUT = 500; private int TEST = 0;
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java?rev=1236867&r1=1236866&r2=1236867&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java Fri Jan 27 20:15:31 2012 @@ -38,9 +38,9 @@ import java.util.concurrent.TimeUnit; public class ConnectionStartTest extends QpidBrokerTestCase { - String _broker = "vm://:1"; + private String _broker = "vm://:1"; - AMQConnection _connection; + private AMQConnection _connection; private Session _consumerSess; private MessageConsumer _consumer; 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=1236867&r1=1236866&r2=1236867&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 Fri Jan 27 20:15:31 2012 @@ -43,9 +43,9 @@ import javax.jms.TopicSession; public class ConnectionTest extends QpidBrokerTestCase { - String _broker_NotRunning = "tcp://localhost:" + findFreePort(); + private String _broker_NotRunning = "tcp://localhost:" + findFreePort(); - String _broker_BadDNS = "tcp://hg3sgaaw4lgihjs"; + private String _broker_BadDNS = "tcp://hg3sgaaw4lgihjs"; public void testSimpleConnection() throws Exception { Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java?rev=1236867&r1=1236866&r2=1236867&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java Fri Jan 27 20:15:31 2012 @@ -44,7 +44,7 @@ public class AMQProtocolSessionTest exte public TestNetworkConnection getNetworkConnection() { - return (TestNetworkConnection) _protocolHandler.getNetworkConnection(); + return (TestNetworkConnection) getProtocolHandler().getNetworkConnection(); } public AMQShortString genQueueName() Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java?rev=1236867&r1=1236866&r2=1236867&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java Fri Jan 27 20:15:31 2012 @@ -45,8 +45,8 @@ public class CloseBeforeAckTest extends { private static final Logger log = LoggerFactory.getLogger(CloseBeforeAckTest.class); - Connection connection; - Session session; + private Connection connection; + private Session session; public static final String TEST_QUEUE_NAME = "TestQueue"; private int TEST_COUNT = 25; @@ -68,9 +68,9 @@ public class CloseBeforeAckTest extends } } - TestThread1 testThread1 = new TestThread1(); + private TestThread1 testThread1 = new TestThread1(); - TestRunnable testThread2 = + private TestRunnable testThread2 = new TestRunnable() { public void runWithExceptions() throws Exception Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java?rev=1236867&r1=1236866&r2=1236867&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java Fri Jan 27 20:15:31 2012 @@ -54,7 +54,7 @@ public class MessageRequeueTest extends private long[] receieved = new long[numTestMessages + 1]; private boolean passed = false; - QpidClientConnection conn; + private QpidClientConnection conn; protected void setUp() throws Exception 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=1236867&r1=1236866&r2=1236867&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 Fri Jan 27 20:15:31 2012 @@ -121,19 +121,19 @@ public class ConversationFactory private Session session; /** The message consumer for incoming messages. */ - MessageConsumer consumer; + private MessageConsumer consumer; /** The message producer for outgoing messages. */ - MessageProducer producer; + private MessageProducer producer; /** The well-known or temporary destination to receive replies on. */ - Destination receiveDestination; + private Destination receiveDestination; /** Holds the queue implementation class for the reply queue. */ - Class<? extends BlockingQueue> queueClass; + private Class<? extends BlockingQueue> queueClass; /** Used to hold any replies that are received outside of the context of a conversation. */ - BlockingQueue<Message> deadLetterBox = new LinkedBlockingQueue<Message>(); + private BlockingQueue<Message> deadLetterBox = new LinkedBlockingQueue<Message>(); /* Used to hold conversation state on a per thread basis. */ /* @@ -151,7 +151,7 @@ public class ConversationFactory */ /** Generates new coversation id's as needed. */ - AtomicLong conversationIdGenerator = new AtomicLong(); + private AtomicLong conversationIdGenerator = new AtomicLong(); /** * Creates a conversation helper on the specified connection with the default sending destination, and listening @@ -246,13 +246,13 @@ public class ConversationFactory public class Conversation { /** Holds the correlation id for the context. */ - long conversationId; + private long conversationId; /** * Holds the send destination for the context. This will automatically be updated to the most recently received * reply-to destination. */ - Destination sendDestination; + private Destination sendDestination; /** * Sends a message to the default sending location. The correlation id of the message will be assigned by this Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1236867&r1=1236866&r2=1236867&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Fri Jan 27 20:15:31 2012 @@ -331,7 +331,7 @@ public class QpidBrokerTestCase extends this.stopped = stopped; this.seenReady = false; - if (this.ready != null && !this.ready.equals("")) + if (this.getReady() != null && !this.getReady().equals("")) { this.latch = new CountDownLatch(1); } @@ -372,7 +372,7 @@ public class QpidBrokerTestCase extends } out.println(line); - if (latch != null && line.contains(ready)) + if (latch != null && line.contains(getReady())) { seenReady = true; latch.countDown(); @@ -402,6 +402,11 @@ public class QpidBrokerTestCase extends { return stopLine; } + + public String getReady() + { + return ready; + } } /** @@ -574,7 +579,7 @@ public class QpidBrokerTestCase extends if (!p.await(30, TimeUnit.SECONDS)) { - _logger.info("broker failed to become ready (" + p.ready + "):" + p.getStopLine()); + _logger.info("broker failed to become ready (" + p.getReady() + "):" + p.getStopLine()); //Ensure broker has stopped process.destroy(); cleanBrokerWork(qpidWork); Modified: qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java?rev=1236867&r1=1236866&r2=1236867&view=diff ============================================================================== --- qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java (original) +++ qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/testkit/Receiver.java Fri Jan 27 20:15:31 2012 @@ -70,13 +70,13 @@ import org.apache.qpid.client.AMQConnect */ public class Receiver extends Client implements MessageListener { - long msg_count = 0; - int sequence = 0; - boolean syncRcv = Boolean.getBoolean("sync_rcv"); - boolean jmsDurableSub = Boolean.getBoolean("jms_durable_sub"); - boolean checkForDups = Boolean.getBoolean("check_for_dups"); - MessageConsumer consumer; - List<Integer> duplicateMessages = new ArrayList<Integer>(); + private long msg_count = 0; + private int sequence = 0; + private boolean syncRcv = Boolean.getBoolean("sync_rcv"); + private boolean jmsDurableSub = Boolean.getBoolean("jms_durable_sub"); + private boolean checkForDups = Boolean.getBoolean("check_for_dups"); + private MessageConsumer consumer; + private List<Integer> duplicateMessages = new ArrayList<Integer>(); public Receiver(Connection con,String addr) throws Exception { Modified: qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java?rev=1236867&r1=1236866&r2=1236867&view=diff ============================================================================== --- qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java (original) +++ qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/JNDICheck.java Fri Jan 27 20:15:31 2012 @@ -70,8 +70,8 @@ public class JNDICheck private static String JAVA_NAMING = "java.naming.factory.initial"; - Context _context = null; - Hashtable _environment = null; + private Context _context = null; + private Hashtable _environment = null; public JNDICheck(String propertyFile) { Modified: qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/LatencyTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/LatencyTest.java?rev=1236867&r1=1236866&r2=1236867&view=diff ============================================================================== --- qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/LatencyTest.java (original) +++ qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/tools/LatencyTest.java Fri Jan 27 20:15:31 2012 @@ -56,24 +56,24 @@ import org.apache.qpid.thread.Threading; public class LatencyTest extends PerfBase implements MessageListener { - MessageProducer producer; - MessageConsumer consumer; - Message msg; - byte[] payload; - long maxLatency = 0; - long minLatency = Long.MAX_VALUE; - long totalLatency = 0; // to calculate avg latency. - int rcvdMsgCount = 0; - double stdDev = 0; - double avgLatency = 0; - boolean warmup_mode = true; - boolean transacted = false; - int transSize = 0; - - final List<Long> latencies; - final Lock lock = new ReentrantLock(); - final Condition warmedUp; - final Condition testCompleted; + private MessageProducer producer; + private MessageConsumer consumer; + private Message msg; + private byte[] payload; + private long maxLatency = 0; + private long minLatency = Long.MAX_VALUE; + private long totalLatency = 0; // to calculate avg latency. + private int rcvdMsgCount = 0; + private double stdDev = 0; + private double avgLatency = 0; + private boolean warmup_mode = true; + private boolean transacted = false; + private int transSize = 0; + + private final List<Long> latencies; + private final Lock lock = new ReentrantLock(); + private final Condition warmedUp; + private final Condition testCompleted; public LatencyTest() { --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:[email protected]
