Merge pull request #58 from EMCECS/bugfix-no-vhost-no-smartclient

fixed some test cases

Author: xiaoxin-ren

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

@@ -38,8 +38,6 @@
 import com.emc.rest.smart.LoadBalancer;
 import com.emc.rest.smart.ecs.Vdc;
 import com.emc.rest.smart.ecs.VdcHost;
-import com.sun.jersey.api.client.ClientHandler;
-import com.sun.jersey.api.client.ClientHandlerException;
 import com.sun.jersey.api.client.ClientRequest;
 import com.sun.jersey.api.client.ClientResponse;
 import com.sun.jersey.api.client.filter.Filterable;
@@ -65,7 +63,10 @@ public class GeoPinningTest extends AbstractS3ClientTest {
     @Override
     protected S3Config createS3Config() throws Exception {
         S3Config s3Config = super.createS3Config();
+
+        // won't work with VHost or if smart-client is disabled
         Assume.assumeFalse(s3Config.isUseVHost());
+        Assume.assumeTrue(s3Config.isSmartClient());
 
         // just going to use the same VDC thrice for lack of a geo env.
         List<? extends Host> hosts = s3Config.getVdcs().get(0).getHosts();
@@ -94,7 +95,7 @@ protected S3Client createS3Client() throws Exception {
     }
 
     @Test
-    public void testGuidExtraction() throws Exception {
+    public void testGuidExtraction() {
         Assert.assertEquals("my/object/key", GeoPinningUtil.getGeoId(getTestBucket(), "my/object/key"));
         Assert.assertEquals("/my/object/key", GeoPinningUtil.getGeoId(getTestBucket(), "/my/object/key"));
 
@@ -123,7 +124,7 @@ public void testGeoPinningAlgorithm() {
     public void testVetoRule() {
         Vdc good = new Vdc("good1", "good2", "good3");
         Vdc bad = new Vdc("bad1", "bad2", "bad3");
-        Map<String, Object> properties = new HashMap<String, Object>();
+        Map<String, Object> properties = new HashMap<>();
         properties.put(GeoPinningRule.PROP_GEO_PINNED_VDC, good);
 
         HostVetoRule geoPinningRule = new GeoPinningRule();
@@ -255,22 +256,17 @@ protected void testBucketDistribution(String bucket, int vdcIndex) {
         }
     }
 
-    private class DummyClient extends Filterable {
+    private static class DummyClient extends Filterable {
         public DummyClient() {
-            super(new ClientHandler() {
-                @Override
-                public ClientResponse handle(ClientRequest cr) throws ClientHandlerException {
-                    return new ClientResponse(200, new InBoundHeaders(), new ByteArrayInputStream(new byte[0]), new DummyWorkers());
-                }
-            });
+            super(cr -> new ClientResponse(200, new InBoundHeaders(), new ByteArrayInputStream(new byte[0]), new DummyWorkers()));
         }
 
         public ClientResponse handle(ClientRequest request) {
             return getHeadHandler().handle(request);
         }
     }
 
-    private class DummyWorkers implements MessageBodyWorkers {
+    private static class DummyWorkers implements MessageBodyWorkers {
         @Override
         public Map<MediaType, List<MessageBodyReader>> getReaders(MediaType mediaType) {
             return null;

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

@@ -43,24 +43,29 @@
 public class Sdk238Test {
     @Test
     public void testTrailingSlash() throws Exception {
-        TestClient client = new TestClient(new S3JerseyClientTest().s3ConfigFromProperties());
+        S3Config s3Config = AbstractS3ClientTest.s3ConfigFromProperties();
+        TestClient client = new TestClient(s3Config);
 
         String bucket = "test-trailing-slash";
         client.createBucket(bucket);
         try {
-            Assert.assertEquals("/" + bucket, client.getLastUri().getPath());
+            if (s3Config.isUseVHost()) {
+                Assert.assertEquals("/", client.getLastUri().getPath());
+            } else {
+                Assert.assertEquals("/" + bucket, client.getLastUri().getPath());
+            }
         } finally {
             client.deleteBucket(bucket);
         }
     }
 
-    private class TestClient extends S3JerseyClient {
-        private UriCaptureFilter captureFilter = new UriCaptureFilter();
+    private static class TestClient extends S3JerseyClient {
+        private final UriCaptureFilter captureFilter = new UriCaptureFilter();
 
         TestClient(S3Config s3Config) {
             super(s3Config);
 
-            List<ClientFilter> filters = new ArrayList<ClientFilter>();
+            List<ClientFilter> filters = new ArrayList<>();
 
             ClientHandler handler = client.getHeadHandler();
             while (handler instanceof ClientFilter) {
@@ -83,7 +88,7 @@ URI getLastUri() {
         }
     }
 
-    private class UriCaptureFilter extends ClientFilter {
+    private static class UriCaptureFilter extends ClientFilter {
         private URI uri;
 
         @Override