Skip to content

Commit 4aa716a

Browse files
author
DenverM80
committed
Update tests to not require End-to-end-crc on test bucket.
Optimize test imports.
1 parent 5bbd0e9 commit 4aa716a

File tree

8 files changed

+26
-24
lines changed

8 files changed

+26
-24
lines changed

‎ds3-sdk-integration/src/test/java/com/spectralogic/ds3client/integration/AdvancedBucketManagement_Test.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
import java.util.List;
2020
import java.util.UUID;
2121

22-
import static com.spectralogic.ds3client.integration.Util.*;
22+
import static com.spectralogic.ds3client.integration.Util.deleteAllContents;
23+
import static com.spectralogic.ds3client.integration.Util.loadBookTestData;
2324
import static com.spectralogic.ds3client.integration.test.helpers.ABMTestHelper.*;
2425
import static org.hamcrest.CoreMatchers.is;
2526
import static org.junit.Assert.*;
@@ -33,7 +34,7 @@ public class AdvancedBucketManagement_Test {
3334
@BeforeClass
3435
public static void startup() throws IOException, SignatureException {
3536
client = Util.fromEnv();
36-
final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, true, ChecksumType.Type.MD5, client);
37+
final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, false, ChecksumType.Type.MD5, client);
3738
envStorageIds = TempStorageUtil.setup(TEST_ENV_NAME, dataPolicyId, client);
3839
}
3940

‎ds3-sdk-integration/src/test/java/com/spectralogic/ds3client/integration/DataIntegrity_Test.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
import com.google.common.collect.Lists;
1919
import com.spectralogic.ds3client.Ds3Client;
20-
import com.spectralogic.ds3client.commands.PutBucketRequest;
21-
import com.spectralogic.ds3client.commands.spectrads3.PutBucketSpectraS3Request;
2220
import com.spectralogic.ds3client.commands.spectrads3.PutBulkJobSpectraS3Request;
2321
import com.spectralogic.ds3client.helpers.ChecksumFunction;
2422
import com.spectralogic.ds3client.helpers.ChecksumListener;
@@ -66,7 +64,7 @@ public class DataIntegrity_Test {
6664
@BeforeClass
6765
public static void startup() throws IOException, SignatureException {
6866
client = Util.fromEnv();
69-
final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, true, ChecksumType.Type.MD5, client);
67+
final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, false, ChecksumType.Type.MD5, client);
7068
envStorageIds = TempStorageUtil.setup(TEST_ENV_NAME, dataPolicyId, client);
7169
}
7270

‎ds3-sdk-integration/src/test/java/com/spectralogic/ds3client/integration/GroupManagement_Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class GroupManagement_Test {
2929
@BeforeClass
3030
public static void startup() throws IOException, SignatureException {
3131
client = Util.fromEnv();
32-
final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, true, ChecksumType.Type.MD5, client);
32+
final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, false, ChecksumType.Type.MD5, client);
3333
envStorageIds = TempStorageUtil.setup(TEST_ENV_NAME, dataPolicyId, client);
3434
}
3535

‎ds3-sdk-integration/src/test/java/com/spectralogic/ds3client/integration/Metadata_Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class Metadata_Test {
4444
@BeforeClass
4545
public static void startup() throws IOException, SignatureException {
4646
client = Util.fromEnv();
47-
final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, true, ChecksumType.Type.MD5, client);
47+
final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, false, ChecksumType.Type.MD5, client);
4848
envStorageIds = TempStorageUtil.setup(TEST_ENV_NAME, dataPolicyId, client);
4949
}
5050

‎ds3-sdk-integration/src/test/java/com/spectralogic/ds3client/integration/NotificationsIntegration_test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class NotificationsIntegration_test {
4545
@BeforeClass
4646
public static void startup() throws IOException, SignatureException {
4747
client = Util.fromEnv();
48-
final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, true, ChecksumType.Type.MD5, client);
48+
final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, false, ChecksumType.Type.MD5, client);
4949
envStorageIds = TempStorageUtil.setup(TEST_ENV_NAME, dataPolicyId, client);
5050
}
5151

‎ds3-sdk-integration/src/test/java/com/spectralogic/ds3client/integration/PutJobManagement_Test.java‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717

1818
import com.google.common.collect.Lists;
1919
import com.spectralogic.ds3client.Ds3Client;
20-
import com.spectralogic.ds3client.commands.*;
20+
import com.spectralogic.ds3client.commands.PutObjectRequest;
21+
import com.spectralogic.ds3client.commands.PutObjectResponse;
2122
import com.spectralogic.ds3client.commands.spectrads3.*;
2223
import com.spectralogic.ds3client.commands.spectrads3.notifications.GetObjectCachedNotificationRegistrationSpectraS3Request;
2324
import com.spectralogic.ds3client.commands.spectrads3.notifications.GetObjectCachedNotificationRegistrationSpectraS3Response;
@@ -31,7 +32,6 @@
3132
import com.spectralogic.ds3client.models.bulk.Ds3Object;
3233
import com.spectralogic.ds3client.serializer.XmlProcessingException;
3334
import com.spectralogic.ds3client.utils.ResourceUtils;
34-
import static org.hamcrest.Matchers.*;
3535
import org.junit.AfterClass;
3636
import org.junit.Before;
3737
import org.junit.BeforeClass;
@@ -40,14 +40,17 @@
4040
import java.io.IOException;
4141
import java.net.URISyntaxException;
4242
import java.nio.channels.SeekableByteChannel;
43-
import java.nio.file.*;
43+
import java.nio.file.Files;
44+
import java.nio.file.Path;
4445
import java.security.SignatureException;
4546
import java.util.ArrayList;
4647
import java.util.Date;
4748
import java.util.List;
4849
import java.util.UUID;
4950

50-
import static com.spectralogic.ds3client.integration.Util.*;
51+
import static com.spectralogic.ds3client.integration.Util.RESOURCE_BASE_NAME;
52+
import static com.spectralogic.ds3client.integration.Util.deleteAllContents;
53+
import static org.hamcrest.Matchers.*;
5154
import static org.junit.Assert.*;
5255

5356
public class PutJobManagement_Test {
@@ -61,7 +64,7 @@ public class PutJobManagement_Test {
6164

6265
@BeforeClass
6366
public static void startup() throws IOException, SignatureException {
64-
final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, true, ChecksumType.Type.MD5, client);
67+
final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, false, ChecksumType.Type.MD5, client);
6568
envStorageIds = TempStorageUtil.setup(TEST_ENV_NAME, dataPolicyId, client);
6669
}
6770

@@ -158,7 +161,7 @@ public void modifyJobPriority() throws IOException, SignatureException, XmlProce
158161

159162
@Test
160163
public void modifyJobName() throws IOException, SignatureException, XmlProcessingException {
161-
164+
162165
try {
163166
final Ds3ClientHelpers.Job job =
164167
HELPERS.startWriteJob(BUCKET_NAME, Lists.newArrayList(new Ds3Object("testOne", 2)));
@@ -178,7 +181,7 @@ public void modifyJobName() throws IOException, SignatureException, XmlProcessin
178181

179182
@Test
180183
public void modifyJobCreationDate() throws IOException, SignatureException, XmlProcessingException {
181-
184+
182185
try {
183186
final Ds3ClientHelpers.Job job =
184187
HELPERS.startWriteJob(BUCKET_NAME, Lists.newArrayList(new Ds3Object("testOne", 2)));
@@ -203,7 +206,7 @@ public void modifyJobCreationDate() throws IOException, SignatureException, XmlP
203206

204207
@Test
205208
public void cancelJob() throws IOException, SignatureException, XmlProcessingException {
206-
209+
207210
try {
208211
final Ds3ClientHelpers.Job job =
209212
HELPERS.startWriteJob(BUCKET_NAME, Lists.newArrayList(new Ds3Object("testOne", 2)));
@@ -272,7 +275,7 @@ public void truncateJobCancelWithOutForce() throws IOException, SignatureExcepti
272275
public void cancelJobWithForce() throws IOException, SignatureException, XmlProcessingException, URISyntaxException, InterruptedException {
273276

274277
final int testTimeOutSeconds = 5;
275-
278+
276279
final String book1 = "beowulf.txt";
277280
final Path objPath1 = ResourceUtils.loadFileResource(RESOURCE_BASE_NAME + book1);
278281
final Ds3Object obj1 = new Ds3Object(book1, Files.size(objPath1));
@@ -310,7 +313,7 @@ public void cancelJobWithForce() throws IOException, SignatureException, XmlProc
310313

311314
@Test
312315
public void cancelAllJobs() throws IOException, SignatureException, XmlProcessingException {
313-
316+
314317
try {
315318
HELPERS.startWriteJob(BUCKET_NAME, Lists.newArrayList(new Ds3Object("testOne", 2)));
316319
final List<Ds3Object> objectsTwo = Lists.newArrayList(new Ds3Object("testTwo", 2));
@@ -419,7 +422,7 @@ public void cancelAllJobsWithForce ()throws IOException, SignatureException, Xml
419422

420423
@Test
421424
public void getCanceledJobs() throws IOException, SignatureException, XmlProcessingException {
422-
425+
423426
try {
424427
final Ds3ClientHelpers.Job jobOne =
425428
HELPERS.startWriteJob(BUCKET_NAME, Lists.newArrayList(new Ds3Object("test", 2)));
@@ -443,7 +446,7 @@ public void getCanceledJobs() throws IOException, SignatureException, XmlProcess
443446

444447
@Test
445448
public void getJobChunksReady() throws IOException, SignatureException, XmlProcessingException {
446-
449+
447450
try {
448451
final Ds3Object ds3Object = new Ds3Object("test", 2);
449452
final Ds3ClientHelpers.Job jobOne =
@@ -470,7 +473,7 @@ public void getJobChunksReady() throws IOException, SignatureException, XmlProce
470473

471474
@Test
472475
public void aggregateTwoJobs() throws IOException, SignatureException, XmlProcessingException {
473-
476+
474477
try {
475478
final WriteJobOptions writeJobOptions = WriteJobOptions.create().withAggregating();
476479

@@ -491,7 +494,7 @@ public void aggregateTwoJobs() throws IOException, SignatureException, XmlProces
491494

492495
@Test
493496
public void allocateJobChunk() throws IOException, SignatureException, XmlProcessingException {
494-
497+
495498
try {
496499
final PutBulkJobSpectraS3Response putBulkResponse = client.
497500
putBulkJobSpectraS3(new PutBulkJobSpectraS3Request(BUCKET_NAME, Lists.newArrayList(new Ds3Object("test", 2))));

‎ds3-sdk-integration/src/test/java/com/spectralogic/ds3client/integration/Regression_Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class Regression_Test {
4242
@BeforeClass
4343
public static void startup() throws IOException, SignatureException {
4444
client = Util.fromEnv();
45-
final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, true, ChecksumType.Type.MD5, client);
45+
final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, false, ChecksumType.Type.MD5, client);
4646
envStorageIds = TempStorageUtil.setup(TEST_ENV_NAME, dataPolicyId, client);
4747
}
4848

‎ds3-sdk-integration/src/test/java/com/spectralogic/ds3client/integration/Smoke_Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public class Smoke_Test {
7474
@BeforeClass
7575
public static void startup() throws IOException, SignatureException {
7676
client = Util.fromEnv();
77-
final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, true, ChecksumType.Type.MD5, client);
77+
final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, false, ChecksumType.Type.MD5, client);
7878
envStorageIds = TempStorageUtil.setup(TEST_ENV_NAME, dataPolicyId, client);
7979
}
8080

0 commit comments

Comments
 (0)