Merge changes Ib65b0690,I290974f0
* changes:
BasePackWriterTest: use assertThrows instead of @Test(expected=...)
[releng] Bump japicmp base version to 7.4.0.202509020913-r
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BasePackWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BasePackWriterTest.java
index ef634d6..347fef6 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BasePackWriterTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BasePackWriterTest.java
@@ -597,13 +597,19 @@ public void testExclude() throws Exception {
}
private static void assertContent(PackIndex pi, List<ObjectId> expected) {
- assertEquals("Pack index has wrong size.", expected.size(),
- pi.getObjectCount());
- for (int i = 0; i < pi.getObjectCount(); i++)
- assertTrue(
- "Pack index didn't contain the expected id "
- + pi.getObjectId(i),
- expected.contains(pi.getObjectId(i)));
+ Set<ObjectId> packedObjectIds = new HashSet<>();
+ for (int i = 0; i < pi.getObjectCount(); i++) {
+ packedObjectIds.add(pi.getObjectId(i));
+ }
+ for (ObjectId packedObjectId : packedObjectIds) {
+ assertTrue("Unexpected id in pack index: " + packedObjectId,
+ expected.contains(packedObjectId));
+ }
+ for (ObjectId expectedObjectId : expected) {
+ assertTrue("Pack index didn't contain the expected id " + expectedObjectId,
+ packedObjectIds.contains(expectedObjectId));
+ }
+ assertEquals("Pack index has wrong size.", expected.size(), pi.getObjectCount());
}
@Test
