UnpackedObjectTest: Create ObjectInserter.Formatter in try-with-resource
The ObjectInserter.Formatter instance is only used to call idFor. Factor out a utility method to do that. Change-Id: I4ef823110c2152ac7905681df3217eb8001f5bd9 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
This commit is contained in:
parent
3ee9e2ac07
commit
84ac3cc379
|
@ -143,7 +143,7 @@ public void testStandardFormat_SmallObject() throws Exception {
|
|||
public void testStandardFormat_LargeObject() throws Exception {
|
||||
final int type = Constants.OBJ_BLOB;
|
||||
byte[] data = getRng().nextBytes(streamThreshold + 5);
|
||||
ObjectId id = new ObjectInserter.Formatter().idFor(type, data);
|
||||
ObjectId id = getId(type, data);
|
||||
write(id, compressStandardFormat(type, data));
|
||||
|
||||
ObjectLoader ol;
|
||||
|
@ -306,7 +306,7 @@ public void testStandardFormat_LargeObject_CorruptZLibStream()
|
|||
throws Exception {
|
||||
final int type = Constants.OBJ_BLOB;
|
||||
byte[] data = getRng().nextBytes(streamThreshold + 5);
|
||||
ObjectId id = new ObjectInserter.Formatter().idFor(type, data);
|
||||
ObjectId id = getId(type, data);
|
||||
byte[] gz = compressStandardFormat(type, data);
|
||||
gz[gz.length - 1] = 0;
|
||||
gz[gz.length - 2] = 0;
|
||||
|
@ -344,7 +344,7 @@ public void testStandardFormat_LargeObject_TruncatedZLibStream()
|
|||
throws Exception {
|
||||
final int type = Constants.OBJ_BLOB;
|
||||
byte[] data = getRng().nextBytes(streamThreshold + 5);
|
||||
ObjectId id = new ObjectInserter.Formatter().idFor(type, data);
|
||||
ObjectId id = getId(type, data);
|
||||
byte[] gz = compressStandardFormat(type, data);
|
||||
byte[] tr = new byte[gz.length - 1];
|
||||
System.arraycopy(gz, 0, tr, 0, tr.length);
|
||||
|
@ -379,7 +379,7 @@ public void testStandardFormat_LargeObject_TrailingGarbage()
|
|||
throws Exception {
|
||||
final int type = Constants.OBJ_BLOB;
|
||||
byte[] data = getRng().nextBytes(streamThreshold + 5);
|
||||
ObjectId id = new ObjectInserter.Formatter().idFor(type, data);
|
||||
ObjectId id = getId(type, data);
|
||||
byte[] gz = compressStandardFormat(type, data);
|
||||
byte[] tr = new byte[gz.length + 1];
|
||||
System.arraycopy(gz, 0, tr, 0, gz.length);
|
||||
|
@ -438,7 +438,7 @@ public void testPackFormat_SmallObject() throws Exception {
|
|||
public void testPackFormat_LargeObject() throws Exception {
|
||||
final int type = Constants.OBJ_BLOB;
|
||||
byte[] data = getRng().nextBytes(streamThreshold + 5);
|
||||
ObjectId id = new ObjectInserter.Formatter().idFor(type, data);
|
||||
ObjectId id = getId(type, data);
|
||||
write(id, compressPackFormat(type, data));
|
||||
|
||||
ObjectLoader ol;
|
||||
|
@ -578,4 +578,10 @@ private void write(ObjectId id, byte[] data) throws IOException {
|
|||
out.close();
|
||||
}
|
||||
}
|
||||
|
||||
private ObjectId getId(int type, byte[] data) {
|
||||
try (ObjectInserter.Formatter formatter = new ObjectInserter.Formatter()) {
|
||||
return formatter.idFor(type, data);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue