Merge "Fix boxing warnings in PushProcessTest"
This commit is contained in:
commit
eb5e9532df
|
@ -99,7 +99,7 @@ public void testUpdateFastForward() throws IOException {
|
||||||
"refs/heads/master", false, null, null);
|
"refs/heads/master", false, null, null);
|
||||||
final Ref ref = new ObjectIdRef.Unpeeled(Ref.Storage.LOOSE, "refs/heads/master",
|
final Ref ref = new ObjectIdRef.Unpeeled(Ref.Storage.LOOSE, "refs/heads/master",
|
||||||
ObjectId.fromString("ac7e7e44c1885efb472ad54a78327d66bfc4ecef"));
|
ObjectId.fromString("ac7e7e44c1885efb472ad54a78327d66bfc4ecef"));
|
||||||
testOneUpdateStatus(rru, ref, Status.OK, true);
|
testOneUpdateStatus(rru, ref, Status.OK, Boolean.TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -146,7 +146,7 @@ public void testUpdateNonFastForwardForced() throws IOException {
|
||||||
"refs/heads/master", true, null, null);
|
"refs/heads/master", true, null, null);
|
||||||
final Ref ref = new ObjectIdRef.Unpeeled(Ref.Storage.LOOSE, "refs/heads/master",
|
final Ref ref = new ObjectIdRef.Unpeeled(Ref.Storage.LOOSE, "refs/heads/master",
|
||||||
ObjectId.fromString("2c349335b7f797072cf729c4f3bb0914ecb6dec9"));
|
ObjectId.fromString("2c349335b7f797072cf729c4f3bb0914ecb6dec9"));
|
||||||
testOneUpdateStatus(rru, ref, Status.OK, false);
|
testOneUpdateStatus(rru, ref, Status.OK, Boolean.FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -159,7 +159,7 @@ public void testUpdateCreateRef() throws IOException {
|
||||||
final RemoteRefUpdate rru = new RemoteRefUpdate(db,
|
final RemoteRefUpdate rru = new RemoteRefUpdate(db,
|
||||||
"ac7e7e44c1885efb472ad54a78327d66bfc4ecef",
|
"ac7e7e44c1885efb472ad54a78327d66bfc4ecef",
|
||||||
"refs/heads/master", false, null, null);
|
"refs/heads/master", false, null, null);
|
||||||
testOneUpdateStatus(rru, null, Status.OK, true);
|
testOneUpdateStatus(rru, null, Status.OK, Boolean.TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -173,7 +173,7 @@ public void testUpdateDelete() throws IOException {
|
||||||
"refs/heads/master", false, null, null);
|
"refs/heads/master", false, null, null);
|
||||||
final Ref ref = new ObjectIdRef.Unpeeled(Ref.Storage.LOOSE, "refs/heads/master",
|
final Ref ref = new ObjectIdRef.Unpeeled(Ref.Storage.LOOSE, "refs/heads/master",
|
||||||
ObjectId.fromString("2c349335b7f797072cf729c4f3bb0914ecb6dec9"));
|
ObjectId.fromString("2c349335b7f797072cf729c4f3bb0914ecb6dec9"));
|
||||||
testOneUpdateStatus(rru, ref, Status.OK, true);
|
testOneUpdateStatus(rru, ref, Status.OK, Boolean.TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -217,7 +217,7 @@ public void testUpdateExpectedRemote() throws IOException {
|
||||||
.fromString("ac7e7e44c1885efb472ad54a78327d66bfc4ecef"));
|
.fromString("ac7e7e44c1885efb472ad54a78327d66bfc4ecef"));
|
||||||
final Ref ref = new ObjectIdRef.Unpeeled(Ref.Storage.LOOSE, "refs/heads/master",
|
final Ref ref = new ObjectIdRef.Unpeeled(Ref.Storage.LOOSE, "refs/heads/master",
|
||||||
ObjectId.fromString("ac7e7e44c1885efb472ad54a78327d66bfc4ecef"));
|
ObjectId.fromString("ac7e7e44c1885efb472ad54a78327d66bfc4ecef"));
|
||||||
testOneUpdateStatus(rru, ref, Status.OK, true);
|
testOneUpdateStatus(rru, ref, Status.OK, Boolean.TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -290,7 +290,7 @@ public void testUpdateMixedCases() throws IOException {
|
||||||
advertisedRefs.add(refToChange);
|
advertisedRefs.add(refToChange);
|
||||||
executePush();
|
executePush();
|
||||||
assertEquals(Status.OK, rruOk.getStatus());
|
assertEquals(Status.OK, rruOk.getStatus());
|
||||||
assertEquals(true, rruOk.isFastForward());
|
assertTrue(rruOk.isFastForward());
|
||||||
assertEquals(Status.NON_EXISTING, rruReject.getStatus());
|
assertEquals(Status.NON_EXISTING, rruReject.getStatus());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -384,7 +384,7 @@ private PushResult testOneUpdateStatus(final RemoteRefUpdate rru,
|
||||||
final PushResult result = executePush();
|
final PushResult result = executePush();
|
||||||
assertEquals(expectedStatus, rru.getStatus());
|
assertEquals(expectedStatus, rru.getStatus());
|
||||||
if (fastForward != null)
|
if (fastForward != null)
|
||||||
assertEquals(fastForward.booleanValue(), rru.isFastForward());
|
assertEquals(fastForward, Boolean.valueOf(rru.isFastForward()));
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue