Skip to content

Commit 480d9b3

Browse files
author
Denver
authored
Merge pull request #482 from RachelTucker/4_0_update_user_and_group_tests
Updated tests in UsersAndGroups to reflect change in 4.0.0 api
2 parents f7fe41b + 7697334 commit 480d9b3

File tree

2 files changed

+55
-37
lines changed

2 files changed

+55
-37
lines changed

‎ds3-sdk-integration/src/main/java/com/spectralogic/ds3client/integration/Util.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ public static void assumeVersion1_2(final Ds3Client client) throws IOException {
6565
assumeThat(majorVersion, is(1));
6666
}
6767

68-
public static void assumeVersion3orLess(final Ds3Client client) throws IOException {
68+
public static void assumeVersion4orHigher(final Ds3Client client) throws IOException {
6969
final int majorVersion = Integer.parseInt(client.getSystemInformationSpectraS3(
7070
new GetSystemInformationSpectraS3Request()).getSystemInformationResult().getBuildInformation().getVersion().split("\\.")[0]);
71-
assumeTrue(majorVersion <= 3);
71+
assumeTrue(majorVersion >= 4);
7272
}
7373

7474
public static void loadBookTestData(final Ds3Client client, final String bucketName) throws IOException, URISyntaxException {

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

Lines changed: 53 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import java.security.SignatureException;
3434
import java.util.UUID;
3535

36-
import static com.spectralogic.ds3client.integration.Util.assumeVersion3orLess;
36+
import static com.spectralogic.ds3client.integration.Util.assumeVersion4orHigher;
3737
import static com.spectralogic.ds3client.integration.Util.deleteAllContents;
3838
import static com.spectralogic.ds3client.integration.test.helpers.TempStorageUtil.DEFAULT_USER;
3939
import static org.hamcrest.Matchers.is;
@@ -181,6 +181,9 @@ public void ModifyUserDefaultDataPolicy() throws IOException, SignatureException
181181

182182
final GetUserSpectraS3Response getSpectraResponse = client
183183
.getUserSpectraS3(new GetUserSpectraS3Request(spectraUUID));
184+
185+
assertThat(getSpectraResponse.getSpectraUserResult(), is(notNullValue()));
186+
184187
final ModifyUserSpectraS3Response modifyUserSpectraS3Response = client
185188
.modifyUserSpectraS3(new ModifyUserSpectraS3Request(spectraUUID)
186189
.withDefaultDataPolicyId(dataPolicyId));
@@ -341,7 +344,7 @@ public void getGroupsWithPageStartMarker() throws IOException, SignatureExceptio
341344
.withPageStartMarker(UUID.randomUUID()));
342345
fail("The above should not be found and throw exception.");
343346
} catch (final FailedRequestException e) {
344-
assertThat(e.getStatusCode(), is(410));
347+
assertThat(e.getStatusCode(), is(404));
345348
}
346349
}
347350

@@ -547,24 +550,30 @@ public void getGroupGroupMembersWithLastPage() throws IOException, SignatureExce
547550

548551
@Test
549552
public void getGroupGroupMembersWithPageStartMarkerUUID() throws IOException, SignatureException {
550-
assumeVersion3orLess(client); //TODO update once 4.0 error code is no longer 410
553+
assumeVersion4orHigher(client);
551554

552-
final GetGroupMembersSpectraS3Response getGroupMembersSpectraS3Response = client
553-
.getGroupMembersSpectraS3(new GetGroupMembersSpectraS3Request()
554-
.withPageStartMarker(UUID.randomUUID()));
555+
try {
556+
client.getGroupMembersSpectraS3(new GetGroupMembersSpectraS3Request()
557+
.withPageStartMarker(UUID.randomUUID()));
558+
fail("The above should not be found and throw exception.");
555559

556-
assertThat(getGroupMembersSpectraS3Response.getGroupMemberListResult(), is(notNullValue()));
560+
} catch (final FailedRequestException e) {
561+
assertThat(e.getStatusCode(), is(404));
562+
}
557563
}
558564

559565
@Test
560566
public void getGroupGroupMembersWithPageStartMarkerString() throws IOException, SignatureException {
561-
assumeVersion3orLess(client); //TODO update once 4.0 error code is no longer 410
567+
assumeVersion4orHigher(client);
562568

563-
final GetGroupMembersSpectraS3Response getGroupMembersSpectraS3Response = client
564-
.getGroupMembersSpectraS3(new GetGroupMembersSpectraS3Request()
565-
.withPageStartMarker(UUID.randomUUID().toString()));
569+
try {
570+
client.getGroupMembersSpectraS3(new GetGroupMembersSpectraS3Request()
571+
.withPageStartMarker(UUID.randomUUID().toString()));
572+
fail("The above should not be found and throw exception.");
566573

567-
assertThat(getGroupMembersSpectraS3Response.getGroupMemberListResult(), is(notNullValue()));
574+
} catch (final FailedRequestException e) {
575+
assertThat(e.getStatusCode(), is(404));
576+
}
568577
}
569578

570579
@Test
@@ -854,24 +863,29 @@ public void getBucketAclsWithLastPage() throws IOException, SignatureException {
854863

855864
@Test
856865
public void getBucketAclsWithPageStartMarkerUUID() throws IOException, SignatureException {
857-
assumeVersion3orLess(client); //TODO update once 4.0 error code is no longer 410
866+
assumeVersion4orHigher(client);
858867

859-
final GetBucketAclsSpectraS3Response getBucketAclsSpectraS3Response = client
860-
.getBucketAclsSpectraS3(new GetBucketAclsSpectraS3Request()
861-
.withPageStartMarker(UUID.randomUUID()));
868+
try {
869+
client.getBucketAclsSpectraS3(new GetBucketAclsSpectraS3Request()
870+
.withPageStartMarker(UUID.randomUUID()));
871+
fail("The above should not be found and throw exception.");
862872

863-
assertThat(getBucketAclsSpectraS3Response.getBucketAclListResult(), is(notNullValue()));
873+
} catch (final FailedRequestException e) {
874+
assertThat(e.getStatusCode(), is(404));
875+
}
864876
}
865877

866878
@Test
867879
public void getBucketAclsWithPageStartMarkerString() throws IOException, SignatureException {
868-
assumeVersion3orLess(client); //TODO update once 4.0 error code is no longer 410
880+
assumeVersion4orHigher(client);
869881

870-
final GetBucketAclsSpectraS3Response getBucketAclsSpectraS3Response = client
871-
.getBucketAclsSpectraS3(new GetBucketAclsSpectraS3Request()
872-
.withPageStartMarker(UUID.randomUUID().toString()));
873-
874-
assertThat(getBucketAclsSpectraS3Response.getBucketAclListResult(), is(notNullValue()));
882+
try {
883+
client.getBucketAclsSpectraS3(new GetBucketAclsSpectraS3Request()
884+
.withPageStartMarker(UUID.randomUUID().toString()));
885+
fail("The above should not be found and throw exception.");
886+
} catch (final FailedRequestException e) {
887+
assertThat(e.getStatusCode(), is(404));
888+
}
875889
}
876890

877891
@Test
@@ -1189,24 +1203,28 @@ public void getDataPolicyAclsWithPageLength() throws IOException, SignatureExcep
11891203

11901204
@Test
11911205
public void getDataPolicyAclsWithPageStartMarkerString() throws IOException, SignatureException {
1192-
assumeVersion3orLess(client); //TODO update once 4.0 error code is no longer 410
1206+
assumeVersion4orHigher(client);
11931207

1194-
final GetDataPolicyAclsSpectraS3Response getDataPolicyAclsSpectraS3Response = client
1195-
.getDataPolicyAclsSpectraS3(new GetDataPolicyAclsSpectraS3Request()
1196-
.withPageStartMarker(UUID.randomUUID().toString()));
1197-
1198-
assertThat(getDataPolicyAclsSpectraS3Response.getDataPolicyAclListResult(), is(notNullValue()));
1208+
try {
1209+
client.getDataPolicyAclsSpectraS3(new GetDataPolicyAclsSpectraS3Request()
1210+
.withPageStartMarker(UUID.randomUUID().toString()));
1211+
fail("The above should not be found and throw exception.");
1212+
} catch (final FailedRequestException e) {
1213+
assertThat(e.getStatusCode(), is(404));
1214+
}
11991215
}
12001216

12011217
@Test
12021218
public void getDataPolicyAclsWithPageStartMarkerUUID() throws IOException, SignatureException {
1203-
assumeVersion3orLess(client); //TODO update once 4.0 error code is no longer 410
1204-
1205-
final GetDataPolicyAclsSpectraS3Response getDataPolicyAclsSpectraS3Response = client
1206-
.getDataPolicyAclsSpectraS3(new GetDataPolicyAclsSpectraS3Request()
1207-
.withPageStartMarker(UUID.randomUUID()));
1219+
assumeVersion4orHigher(client);
12081220

1209-
assertThat(getDataPolicyAclsSpectraS3Response.getDataPolicyAclListResult(), is(notNullValue()));
1221+
try {
1222+
client.getDataPolicyAclsSpectraS3(new GetDataPolicyAclsSpectraS3Request()
1223+
.withPageStartMarker(UUID.randomUUID()));
1224+
fail("The above should not be found and throw exception.");
1225+
} catch (final FailedRequestException e) {
1226+
assertThat(e.getStatusCode(), is(404));
1227+
}
12101228
}
12111229

12121230
@Test

0 commit comments

Comments
 (0)