1 files changed, 4 insertions, 9 deletions
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java
index 889097f850..74fe371b2f 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java
@@ -22,17 +22,13 @@ package org.apache.qpid.server.virtualhost;
 
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.doThrow;
 
-import java.io.File;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
@@ -50,7 +46,6 @@ import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.server.store.DurableConfigurationStore;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.test.utils.QpidTestCase;
-import org.mockito.verification.VerificationMode;
 
 public class AbstractVirtualHostTest extends QpidTestCase
 {
@@ -90,7 +85,7 @@ public class AbstractVirtualHostTest extends QpidTestCase
         {
             if (_taskExecutor != null)
             {
-                _taskExecutor.stopImmediately();
+                _taskExecutor.stop();
             }
         }
         finally
@@ -179,7 +174,7 @@ public class AbstractVirtualHostTest extends QpidTestCase
         verify(store, times(0)).closeMessageStore();
     }
 
-    public void testDeleteInErrorStateAfterOpen()
+    public void testDeleteInErrorStateAfterOpen() throws Exception
     {
         Map<String,Object> attributes = Collections.<String, Object>singletonMap(AbstractVirtualHost.NAME, getTestName());
         AbstractVirtualHost host = new AbstractVirtualHost(attributes, _node)