Merge pull request #119 from EMCECS/bugfix-sdk-656

simply change test suites to enforce the order of shutDownClient()

Author: dunedodo

src/test/java/com/emc/object/AbstractClientTest.java

@@ -50,6 +50,12 @@ public abstract class AbstractClientTest {
      */
     protected abstract void initClient() throws Exception;
 
+    /**
+     * Implement to clean up the object client used for each test. Each subclass must keep a reference to the
+     * client.
+     */
+    protected abstract void shutdownClient() throws Exception;
+
     /**
      * Implement to create an arbitrary bucket or directory. Do not do anything if the
      * bucket/directory already exists.
@@ -91,6 +97,11 @@ public final void initTestBucket() throws Exception {
     }
 
     @After
+    public final void tearDown() throws Exception {
+        destroyTestBucket();
+        shutdownClient();
+    }
+
     public final void destroyTestBucket() throws Exception {
         log.info("cleaning up bucket " + getTestBucket());
         cleanUpBucket(getTestBucket());

src/test/java/com/emc/object/s3/AbstractS3ClientTest.java

@@ -82,8 +82,9 @@ public void dumpLBStats() {
         }
     }
 
-    @After
+    @Override
     public void shutdownClient() {
+        log.debug("shutting down client");
         if (client != null) client.destroy();
     }
 
@@ -168,4 +169,4 @@ static S3Config s3ConfigFromProperties() throws Exception {
 
         return s3Config;
     }
-}
+}