Skip to content

Commit ae20017

Browse files
arnett, stutwincitiesguy
arnett, stu
authored andcommitted
corrected testListVersionsPagingPrefixDelim to test for accurate AWS behavior
1 parent 02723e3 commit ae20017

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

src/test/java/com/emc/object/s3/S3JerseyClientTest.java

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -546,28 +546,19 @@ public void testListVersionsPagingPrefixDelim() throws Exception {
546546
client.putObject(getTestBucket(), key, content, null);
547547

548548
// create key in sub-prefix
549-
client.putObject(getTestBucket(), "prefix/prefix2/bar", content, null);
549+
key = "prefix/prefix2/bar";
550+
client.putObject(getTestBucket(), key, content, null);
550551
client.deleteObject(getTestBucket(), key);
551-
client.putObject(getTestBucket(), "prefix/prefix2/bar", content, null);
552+
client.putObject(getTestBucket(), key, content, null);
552553

553554
ListVersionsRequest request = new ListVersionsRequest(getTestBucket()).withPrefix("prefix/")
554-
.withDelimiter("/").withMaxKeys(2);
555+
.withDelimiter("/").withMaxKeys(4);
555556
ListVersionsResult result = client.listVersions(request);
556557

557-
Assert.assertEquals(2, result.getVersions().size());
558+
Assert.assertEquals(3, result.getVersions().size());
558559
Assert.assertEquals(1, result.getCommonPrefixes().size());
559560
Assert.assertEquals("prefix/prefix2/", result.getCommonPrefixes().get(0));
560-
561-
List<AbstractVersion> versions = result.getVersions();
562-
int callCount = 1;
563-
while (result.isTruncated()) {
564-
result = client.listMoreVersions(result);
565-
versions.addAll(result.getVersions());
566-
callCount++;
567-
}
568-
569-
Assert.assertEquals(3, callCount);
570-
Assert.assertEquals(6, versions.size());
561+
Assert.assertFalse(result.isTruncated());
571562
}
572563

573564
protected void createTestObjects(String prefix, int numObjects) throws Exception {

0 commit comments

Comments
 (0)