Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove erroneous static final from BIG_FILE 

Also use preferred bigFile capitalization for member.  Fixes
regression from e058973abc.
This commit is contained in:
Andrew Gaul 2017-03-17 17:40:26 -07:00
parent e058973abc
commit 01780db4db
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/blobstore/RegionScopedSwiftBlobStoreParallelLiveTest.java
View File

@ -56,7 +56,7 @@ import com.google.common.util.concurrent.MoreExecutors;
@Test(groups = "live", singleThreaded = true) @Test(groups = "live", singleThreaded = true)
public class RegionScopedSwiftBlobStoreParallelLiveTest extends BaseBlobStoreIntegrationTest { public class RegionScopedSwiftBlobStoreParallelLiveTest extends BaseBlobStoreIntegrationTest {
private static final File BIG_FILE = new File("random.dat"); private File bigFile = new File("random.dat");
private static final long SIZE = 10 * 1000 * 1000; private static final long SIZE = 10 * 1000 * 1000;
private BlobStore blobStore; private BlobStore blobStore;
private String etag; private String etag;
@ -72,7 +72,7 @@ public class RegionScopedSwiftBlobStoreParallelLiveTest extends BaseBlobStoreInt
public RegionScopedSwiftBlobStoreParallelLiveTest() { public RegionScopedSwiftBlobStoreParallelLiveTest() {
provider = "openstack-swift"; provider = "openstack-swift";
try { try {
BIG_FILE = File.createTempFile("random", "dat"); bigFile = File.createTempFile("random", "dat");
} catch (IOException ioe) { } catch (IOException ioe) {
throw new RuntimeException(ioe); throw new RuntimeException(ioe);
} }
@ -94,8 +94,8 @@ public class RegionScopedSwiftBlobStoreParallelLiveTest extends BaseBlobStoreInt
@BeforeClass @BeforeClass
public void setup() throws IOException, InterruptedException { public void setup() throws IOException, InterruptedException {
blobStore = getBlobStore(); blobStore = getBlobStore();
createRandomFile(SIZE, BIG_FILE); createRandomFile(SIZE, bigFile);
HashCode hashCode = Files.hash(BIG_FILE, Hashing.md5()); HashCode hashCode = Files.hash(bigFile, Hashing.md5());
etag = hashCode.toString(); etag = hashCode.toString();
blobStore.createContainerInLocation(null, CONTAINER); blobStore.createContainerInLocation(null, CONTAINER);
System.out.println("generated file md5: " + etag); System.out.println("generated file md5: " + etag);
@ -104,8 +104,8 @@ public class RegionScopedSwiftBlobStoreParallelLiveTest extends BaseBlobStoreInt
@AfterClass @AfterClass
public void cleanupFiles() { public void cleanupFiles() {
// Delete local file // Delete local file
delete(BIG_FILE); delete(bigFile);
delete(new File(BIG_FILE + ".downloaded")); delete(new File(bigFile + ".downloaded"));
// Delete uploaded file // Delete uploaded file
blobStore.clearContainer(CONTAINER); blobStore.clearContainer(CONTAINER);
@ -114,8 +114,8 @@ public class RegionScopedSwiftBlobStoreParallelLiveTest extends BaseBlobStoreInt
@Test @Test
public void uploadMultipartBlob() { public void uploadMultipartBlob() {
Blob blob = blobStore.blobBuilder(BIG_FILE.getName()) Blob blob = blobStore.blobBuilder(bigFile.getName())
.payload(new FilePayload(BIG_FILE)) .payload(new FilePayload(bigFile))
.build(); .build();
// configure the blobstore to use multipart uploading of the file // configure the blobstore to use multipart uploading of the file
String eTag = blobStore.putBlob(CONTAINER, blob, multipart(executor)); String eTag = blobStore.putBlob(CONTAINER, blob, multipart(executor));
@ -126,15 +126,15 @@ public class RegionScopedSwiftBlobStoreParallelLiveTest extends BaseBlobStoreInt
@Test(dependsOnMethods = "uploadMultipartBlob", singleThreaded = true) @Test(dependsOnMethods = "uploadMultipartBlob", singleThreaded = true)
public void downloadParallelBlob() throws IOException { public void downloadParallelBlob() throws IOException {
final File downloadedFile = new File(BIG_FILE + ".downloaded"); final File downloadedFile = new File(bigFile + ".downloaded");
blobStore.downloadBlob(CONTAINER, BIG_FILE.getName(), downloadedFile, executor); blobStore.downloadBlob(CONTAINER, bigFile.getName(), downloadedFile, executor);
String eTag = Files.hash(downloadedFile, Hashing.md5()).toString(); String eTag = Files.hash(downloadedFile, Hashing.md5()).toString();
assertEquals(eTag, etag); assertEquals(eTag, etag);
} }
@Test(dependsOnMethods = "uploadMultipartBlob", singleThreaded = true) @Test(dependsOnMethods = "uploadMultipartBlob", singleThreaded = true)
public void streamParallelBlob() throws IOException { public void streamParallelBlob() throws IOException {
InputStream is = blobStore.streamBlob(CONTAINER, BIG_FILE.getName(), executor); InputStream is = blobStore.streamBlob(CONTAINER, bigFile.getName(), executor);
byte[] segment = new byte[1000000]; byte[] segment = new byte[1000000];
Hasher hasher = Hashing.md5().newHasher(); Hasher hasher = Hashing.md5().newHasher();