diff options
Diffstat (limited to 'qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors')
5 files changed, 16 insertions, 12 deletions
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java index 6346fff85f..f739d3fcb9 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/AMQPChannelActorTest.java @@ -20,11 +20,12 @@ */ package org.apache.qpid.server.logging.actors; -import java.util.List; - import org.apache.commons.configuration.ConfigurationException; + import org.apache.qpid.AMQException; +import java.util.List; + /** * Test : AMQPChannelActorTest * Validate the AMQPChannelActor class. diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java index 60ecbef438..ec2cdd5585 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java @@ -21,12 +21,11 @@ package org.apache.qpid.server.logging.actors; import org.apache.qpid.server.configuration.ServerConfiguration; +import org.apache.qpid.server.logging.LogActor; import org.apache.qpid.server.logging.LogMessage; import org.apache.qpid.server.logging.LogSubject; import org.apache.qpid.server.logging.RootMessageLogger; -import org.apache.qpid.server.logging.LogActor; import org.apache.qpid.server.logging.UnitTestMessageLogger; - import org.apache.qpid.server.util.InternalBrokerBaseCase; public class BaseActorTestCase extends InternalBrokerBaseCase diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java index 9a065ea2db..f73765f5aa 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java @@ -21,6 +21,7 @@ package org.apache.qpid.server.logging.actors; import org.apache.commons.configuration.ConfigurationException; + import org.apache.qpid.AMQException; import org.apache.qpid.server.AMQChannel; import org.apache.qpid.server.logging.LogActor; @@ -202,7 +203,7 @@ public class CurrentActorTest extends BaseConnectionActorTestCase */ public class LogMessagesWithAConnectionActor extends Thread { - Throwable _exception; + private Throwable _exception; public LogMessagesWithAConnectionActor() { @@ -228,13 +229,17 @@ public class CurrentActorTest extends BaseConnectionActorTestCase // Verify it was the same actor as we set earlier if(!actor.equals(CurrentActor.get())) - throw new IllegalArgumentException("Retrieved actor is not as expected "); + { + throw new IllegalArgumentException("Retrieved actor is not as expected "); + } // Verify that removing the actor works for this thread CurrentActor.remove(); if(CurrentActor.get() != defaultActor) - throw new IllegalArgumentException("CurrentActor ("+CurrentActor.get()+") should be default actor" + defaultActor); + { + throw new IllegalArgumentException("CurrentActor ("+CurrentActor.get()+") should be default actor" + defaultActor); + } } catch (Throwable e) { diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java index d6b790db01..b431047d66 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java @@ -20,13 +20,12 @@ */ package org.apache.qpid.server.logging.actors; +import javax.management.remote.JMXPrincipal; +import javax.security.auth.Subject; import java.security.PrivilegedAction; import java.util.Collections; import java.util.List; -import javax.management.remote.JMXPrincipal; -import javax.security.auth.Subject; - /** * Test : AMQPManagementActorTest * Validate the AMQPManagementActor class. diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java index a2272cc395..8eaa165853 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/SubscriptionActorTest.java @@ -20,10 +20,10 @@ */ package org.apache.qpid.server.logging.actors; -import java.util.List; - import org.apache.qpid.server.subscription.MockSubscription; +import java.util.List; + /** * Test : AMQPConnectionActorTest * Validate the AMQPConnectionActor class. |