Merge pull request #531 from scribe/adminorSpectra

Minor change, lets us toggle between 3.x and 4.x easier

Author: GraciesPadre

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

@@ -47,6 +47,7 @@ public class UsersAndGroups_Test {
     private static final Ds3ClientHelpers HELPERS = Ds3ClientHelpers.wrap(client);
     private static final String BUCKET_NAME = "Users_And_Groups_Test";
     private static final String TEST_ENV_NAME = "UsersAndGroups_Test";
+    private static final String USER_ID = "spectra";
     private static TempStorageIds envStorageIds;
     private static UUID spectraUUID;
     private static UUID administratorsUUID;
@@ -75,7 +76,7 @@ private static void setupBucket(final UUID dataPolicy) {
         try {
             HELPERS.ensureBucketExists(BUCKET_NAME, dataPolicy);
             spectraUUID = client.getUserSpectraS3(
-                    new GetUserSpectraS3Request("spectra")).getSpectraUserResult().getId();
+                    new GetUserSpectraS3Request(USER_ID)).getSpectraUserResult().getId();
             administratorsUUID = client.getGroupSpectraS3(
                     new GetGroupSpectraS3Request("Administrators")).getGroupResult().getId();
         } catch (final Exception e) {
@@ -89,16 +90,16 @@ public void getUserWithUUID() throws IOException, SignatureException {
         final GetUserSpectraS3Response getSpectraResponse = client
                 .getUserSpectraS3(new GetUserSpectraS3Request(spectraUUID));
 
-        assertThat(getSpectraResponse.getSpectraUserResult().getName(), is("spectra"));
+        assertThat(getSpectraResponse.getSpectraUserResult().getName(), is(USER_ID));
     }
 
     @Test
     public void getUserWithString() throws IOException, SignatureException {
 
         final GetUserSpectraS3Response getSpectraResponse = client
-                .getUserSpectraS3(new GetUserSpectraS3Request("spectra"));
+                .getUserSpectraS3(new GetUserSpectraS3Request(USER_ID));
 
-        assertThat(getSpectraResponse.getSpectraUserResult().getName(), is("spectra"));
+        assertThat(getSpectraResponse.getSpectraUserResult().getName(), is(USER_ID));
     }
 
     @Test
@@ -114,7 +115,7 @@ public void getUsers() throws IOException, SignatureException {
     public void getUsersWithName() throws IOException, SignatureException {
 
         final GetUsersSpectraS3Response getUsersResponse = client.getUsersSpectraS3(
-                new GetUsersSpectraS3Request().withName("spectra"));
+                new GetUsersSpectraS3Request().withName(USER_ID));
 
         assertThat(getUsersResponse.getSpectraUserListResult(), is(notNullValue()));
     }
@@ -467,7 +468,7 @@ public void getUserGroupMembersWithMemberUserIDString() throws IOException, Sign
 
         final GetGroupMembersSpectraS3Response getGroupMembersSpectraS3Response = client
                 .getGroupMembersSpectraS3(new GetGroupMembersSpectraS3Request()
-                        .withMemberUserId("spectra"));
+                        .withMemberUserId(USER_ID));
 
         assertThat(getGroupMembersSpectraS3Response.getGroupMemberListResult(), is(notNullValue()));
     }
@@ -612,7 +613,7 @@ public void putUserGroupMember() throws IOException, SignatureException {
                     new PutGroupSpectraS3Request("test_group"));
 
             putUserGroupMemberSpectraS3Response = client
-                    .putUserGroupMemberSpectraS3(new PutUserGroupMemberSpectraS3Request("test_group", "spectra"));
+                    .putUserGroupMemberSpectraS3(new PutUserGroupMemberSpectraS3Request("test_group", USER_ID));
 
             assertThat(putUserGroupMemberSpectraS3Response.getGroupMemberResult(), is(notNullValue()));
 
@@ -688,7 +689,7 @@ public void putGlobalBucketAclForUserString() throws IOException, SignatureExcep
         try {
             putGlobalBucketAclForUserSpectraS3Response = client.putGlobalBucketAclForUserSpectraS3(
                     new PutGlobalBucketAclForUserSpectraS3Request(BucketAclPermission.DELETE,
-                            "spectra"));
+                            USER_ID));
 
             assertThat(putGlobalBucketAclForUserSpectraS3Response.getBucketAclResult(), is(notNullValue()));
 
@@ -789,7 +790,7 @@ public void getBucketAclsWithUserUUID() throws IOException, SignatureException {
     @Test
     public void getBucketAclsWithUserIDString() throws IOException, SignatureException {
         final GetBucketAclsSpectraS3Response getBucketAclsSpectraS3Response = client
-                .getBucketAclsSpectraS3(new GetBucketAclsSpectraS3Request().withUserId("spectra"));
+                .getBucketAclsSpectraS3(new GetBucketAclsSpectraS3Request().withUserId(USER_ID));
 
         assertThat(getBucketAclsSpectraS3Response.getBucketAclListResult(), is(notNullValue()));
     }
@@ -912,7 +913,7 @@ public void putGlobalDataPolicyAclForUserString() throws IOException, SignatureE
         PutGlobalDataPolicyAclForUserSpectraS3Response putGlobalDataPolicyAclForUserSpectraS3Response = null;
         try {
             putGlobalDataPolicyAclForUserSpectraS3Response = client.putGlobalDataPolicyAclForUserSpectraS3(
-                    new PutGlobalDataPolicyAclForUserSpectraS3Request("spectra"));
+                    new PutGlobalDataPolicyAclForUserSpectraS3Request(USER_ID));
 
             assertThat(putGlobalDataPolicyAclForUserSpectraS3Response.getDataPolicyAclResult(), is(notNullValue()));
 
@@ -971,7 +972,7 @@ public void deleteDataPolicyAcl() throws IOException, SignatureException {
                 = null;
         try {
             putGlobalDataPolicyAclForUserSpectraS3Response = client.putGlobalDataPolicyAclForUserSpectraS3(
-                    new PutGlobalDataPolicyAclForUserSpectraS3Request("spectra"));
+                    new PutGlobalDataPolicyAclForUserSpectraS3Request(USER_ID));
 
             final DeleteDataPolicyAclSpectraS3Response deleteDataPolicyAclSpectraS3Response = client
                     .deleteDataPolicyAclSpectraS3(new DeleteDataPolicyAclSpectraS3Request(
@@ -998,7 +999,7 @@ public void getDataPolicyAcl() throws IOException, SignatureException {
         try {
             putGlobalDataPolicyAclForUserSpectraS3Response = client
                     .putGlobalDataPolicyAclForUserSpectraS3(
-                    new PutGlobalDataPolicyAclForUserSpectraS3Request("spectra"));
+                    new PutGlobalDataPolicyAclForUserSpectraS3Request(USER_ID));
 
             final GetDataPolicyAclSpectraS3Response getDataPolicyAclSpectraS3Response = client
                     .getDataPolicyAclSpectraS3(new GetDataPolicyAclSpectraS3Request(
@@ -1114,7 +1115,7 @@ public void getDataPolicyAclsWithUserString() throws IOException, SignatureExcep
 
         final GetDataPolicyAclsSpectraS3Response getDataPolicyAclsSpectraS3Response = client
                 .getDataPolicyAclsSpectraS3(new GetDataPolicyAclsSpectraS3Request()
-                        .withUserId("spectra"));
+                        .withUserId(USER_ID));
 
         assertThat(getDataPolicyAclsSpectraS3Response.getDataPolicyAclListResult(), is(notNullValue()));
     }

ds3-sdk-integration/src/test/java/com/spectralogic/ds3client/integration/test/helpers/TempStorageUtil.java

@@ -35,6 +35,7 @@ public final class TempStorageUtil {
     private static final String DATA_POLICY_NAME = "_dp";
     private static final String STORAGE_DOMAIN_NAME = "_sd";
     private static final String POOL_PARTITION_NAME = "_pp";
+    private static final String USER_ID = "spectra";
 
     /**
      * Sets up a temporary data policy with a temporary storage domain and partition
@@ -102,7 +103,7 @@ public static UUID setupDataPolicy(
                 new PutDataPolicySpectraS3Request(testSetName + DATA_POLICY_NAME)
                         .withEndToEndCrcRequired(withEndToEndCrcRequired)
                         .withChecksumType(checksumType).withAlwaysForcePutJobCreation(true));
-        client.modifyUserSpectraS3(new ModifyUserSpectraS3Request("spectra")
+        client.modifyUserSpectraS3(new ModifyUserSpectraS3Request(USER_ID)
                 .withDefaultDataPolicyId(dataPolicyResponse.getDataPolicyResult().getId()));
         return dataPolicyResponse.getDataPolicyResult().getId();
     }