You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2017/05/08 18:10:08 UTC

[06/50] jclouds git commit: Fix DefaultObjectAccessControlsApiLiveTest, ResumableUploadApiLiveTest, ObjectApiLiveTest

Fix DefaultObjectAccessControlsApiLiveTest, ResumableUploadApiLiveTest, ObjectApiLiveTest


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/3d9258f7
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/3d9258f7
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/3d9258f7

Branch: refs/heads/master
Commit: 3d9258f75adf8f0b8258c14c88c1a73316f7dad3
Parents: 2585624
Author: Daniel Broudy <br...@google.com>
Authored: Mon Jun 1 17:18:33 2015 -0700
Committer: Daniel Broudy <br...@google.com>
Committed: Mon Jun 1 17:31:45 2015 -0700

----------------------------------------------------------------------
 .../features/DefaultObjectAccessControlsApiLiveTest.java     | 2 +-
 .../googlecloudstorage/features/ObjectApiLiveTest.java       | 8 +-------
 .../features/ResumableUploadApiLiveTest.java                 | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/3d9258f7/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiLiveTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiLiveTest.java
index 55c45bf..d2697d4 100644
--- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiLiveTest.java
+++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/DefaultObjectAccessControlsApiLiveTest.java
@@ -32,7 +32,7 @@ import org.testng.annotations.Test;
 
 public class DefaultObjectAccessControlsApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
 
-   protected static final String BUCKET_NAME = "jcloudstestbucketdefaultoacl" + UUID.randomUUID();
+   protected static final String BUCKET_NAME = "jcloudsdefaultoacltest" + UUID.randomUUID();
 
    private DefaultObjectAccessControlsApi api() {
       return api.getDefaultObjectAccessControlsApi();

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3d9258f7/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java
index a5728f8..3cef893 100644
--- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java
+++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java
@@ -63,7 +63,6 @@ import com.beust.jcommander.internal.Lists;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.hash.Hashing;
 import com.google.common.io.ByteSource;
-import com.google.common.primitives.Bytes;
 
 public class ObjectApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
 
@@ -435,6 +434,7 @@ public class ObjectApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
       assertTrue(api().deleteObject(BUCKET_NAME2, COMPOSED_OBJECT2));
       assertTrue(api().deleteObject(BUCKET_NAME2, COMPOSED_OBJECT));
       assertTrue(api().deleteObject(BUCKET_NAME2, COPIED_OBJECT_NAME));
+      assertTrue(api().deleteObject(BUCKET_NAME2, COPIED_OBJECT_NAME2));
       assertFalse(api().deleteObject(BUCKET_NAME, UPLOAD_OBJECT_NAME));
       assertTrue(api().deleteObject(BUCKET_NAME, UPLOAD_OBJECT_NAME2));
       assertTrue(api().deleteObject(BUCKET_NAME, MULTIPART_UPLOAD_OBJECT));
@@ -453,10 +453,4 @@ public class ObjectApiLiveTest extends BaseGoogleCloudStorageApiLiveTest {
       api.getBucketApi().deleteBucket(BUCKET_NAME);
       api.getBucketApi().deleteBucket(BUCKET_NAME2);
    }
-
-   private static byte[] reverse(byte[] b) {
-      List<Byte> hashByte = Bytes.asList(b);
-      List<Byte> reversedList = com.google.common.collect.Lists.reverse(hashByte);
-      return Bytes.toArray(reversedList);
-   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3d9258f7/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ResumableUploadApiLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ResumableUploadApiLiveTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ResumableUploadApiLiveTest.java
index 7718281..441c255 100644
--- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ResumableUploadApiLiveTest.java
+++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ResumableUploadApiLiveTest.java
@@ -136,7 +136,7 @@ public class ResumableUploadApiLiveTest extends BaseGoogleCloudStorageApiLiveTes
       // Uploading First chunk
       ByteSourcePayload payload = Payloads.newByteSourcePayload(byteSource.slice(offset, chunkSize));
       long length = byteSource.slice(offset, chunkSize).size();
-      String Content_Range = generateContentRange(0L, length, totalSize);
+      String Content_Range = generateContentRange(0L, length - 1, totalSize);
       ResumableUpload uploadResponse = api().chunkUpload(BUCKET_NAME, uploadId, "application/pdf", length,
                Content_Range, payload);