NO-JIRA: Encapsulate fields, use private members and accesors (keep checkstyle happy)

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236867 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 14 insertions, 14 deletions

diff --git a/qpid/java/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java
index d862acf28d..bc48ee8895 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java
@@ -26,11 +26,11 @@ import org.apache.qpid.framing.AMQShortString;
 
 public class AMQQueueTest extends TestCase
 {
-    AMQShortString exchange = new AMQShortString("test.exchange");
-    AMQShortString routingkey = new AMQShortString("test-route");
-    AMQShortString qname = new AMQShortString("test-queue");
-    AMQShortString[] oneBinding = new AMQShortString[]{new AMQShortString("bindingA")};
-    AMQShortString[] bindings = new AMQShortString[]{new AMQShortString("bindingB"), 
+    private AMQShortString exchange = new AMQShortString("test.exchange");
+    private AMQShortString routingkey = new AMQShortString("test-route");
+    private AMQShortString qname = new AMQShortString("test-queue");
+    private AMQShortString[] oneBinding = new AMQShortString[]{new AMQShortString("bindingA")};
+    private AMQShortString[] bindings = new AMQShortString[]{new AMQShortString("bindingB"),
                                                      new AMQShortString("bindingC")};
 
     public void testToURLNoBindings()
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java b/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
index 919809edc3..009598d8a4 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
@@ -51,13 +51,13 @@ public class MockAMQConnection extends AMQConnection
     @Override
     public ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail) throws IOException
     {
-        _connected = true;
-        _protocolHandler.getStateManager().changeState(AMQState.CONNECTION_OPEN);
+        setConnected(true);
+        getProtocolHandler().getStateManager().changeState(AMQState.CONNECTION_OPEN);
         return null;
     }
 
     public AMQConnectionDelegate getDelegate()
     {
-        return _delegate;
+        return super.getDelegate();
     }
 }
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
index 6b5fc81be6..9a5ca33174 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
@@ -59,15 +59,15 @@ public class AMQProtocolHandlerTest extends TestCase
     private static final Logger _logger = LoggerFactory.getLogger(AMQProtocolHandlerTest.class);
 
     // The handler to test
-    AMQProtocolHandler _handler;
+    private AMQProtocolHandler _handler;
 
     // A frame to block upon whilst waiting the exception
-    AMQFrame _blockFrame;
+    private AMQFrame _blockFrame;
 
     // Latch to know when the listener receives an exception
     private CountDownLatch _handleCountDown;
     // The listener that will receive an exception
-    BlockToAccessFrameListener _listener;
+    private BlockToAccessFrameListener _listener;
 
     @Override
     public void setUp() throws Exception
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStreamTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStreamTest.java
index 8cd320b06e..91460ab4e7 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStreamTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/util/ClassLoadingAwareObjectInputStreamTest.java
@@ -31,8 +31,8 @@ import java.util.List;
 
 public class ClassLoadingAwareObjectInputStreamTest extends QpidTestCase
 {
-    InputStream _in;
-    ClassLoadingAwareObjectInputStream _claOIS;
+    private InputStream _in;
+    private ClassLoadingAwareObjectInputStream _claOIS;
 
     protected void setUp() throws Exception
     {
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDIPropertyFileTest.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDIPropertyFileTest.java
index 5690a05254..576ab4fa05 100644
--- a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDIPropertyFileTest.java
+++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/JNDIPropertyFileTest.java
@@ -34,7 +34,7 @@ import java.util.Properties;
 
 public class JNDIPropertyFileTest extends TestCase
 {
-    Context ctx;
+    private Context ctx;
     
     public JNDIPropertyFileTest() throws Exception
     {