diff options
| author | Ivan Frade <ifrade@google.com> | 2025-04-07 20:26:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <support@gerrithub.io> | 2025-04-07 20:26:46 +0000 |
| commit | 6dbd2b7f8167ec29d3e0e6769a9f35883215834f (patch) | |
| tree | 62d8b4d7bf66c8a979074c88a06a1cd3bd517f21 | |
| parent | 30decee44a0f40fb59525f1255ac96a0502cec05 (diff) | |
| parent | 8a05d5e0ac68da1ff0f12020f46646e527905d3d (diff) | |
| download | jgit-6dbd2b7f8167ec29d3e0e6769a9f35883215834f.tar.gz jgit-6dbd2b7f8167ec29d3e0e6769a9f35883215834f.zip | |
Merge "tests: avoid assertEquals on same instance"
4 files changed, 6 insertions, 6 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/EditListTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/EditListTest.java index f657bab771..a2c20aaaba 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/EditListTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/EditListTest.java @@ -28,7 +28,7 @@ public class EditListTest { assertTrue(l.isEmpty()); assertEquals("EditList[]", l.toString()); - assertEquals(l, l); + assertTrue(l.equals(l)); assertEquals(new EditList(), l); assertFalse(l.equals("")); assertEquals(l.hashCode(), new EditList().hashCode()); @@ -44,7 +44,7 @@ public class EditListTest { assertSame(e, l.get(0)); assertSame(e, l.iterator().next()); - assertEquals(l, l); + assertTrue(l.equals(l)); assertFalse(l.equals(new EditList())); final EditList l2 = new EditList(); @@ -69,7 +69,7 @@ public class EditListTest { assertSame(e1, i.next()); assertSame(e2, i.next()); - assertEquals(l, l); + assertTrue(l.equals(l)); assertFalse(l.equals(new EditList())); final EditList l2 = new EditList(); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/EditTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/EditTest.java index 8ab9bb12de..86c6d77cc6 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/EditTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/EditTest.java @@ -98,7 +98,7 @@ public class EditTest { final Edit e1 = new Edit(1, 2, 3, 4); final Edit e2 = new Edit(1, 2, 3, 4); - assertEquals(e1, e1); + assertTrue(e1.equals(e1)); assertEquals(e2, e1); assertEquals(e1, e2); assertEquals(e1.hashCode(), e2.hashCode()); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/BasicRuleTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/BasicRuleTest.java index 6112952549..6983eaa354 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/BasicRuleTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/BasicRuleTest.java @@ -31,7 +31,7 @@ public class BasicRuleTest { assertFalse(rule1.getNegation()); assertTrue(rule3.getNegation()); assertNotEquals(rule1, null); - assertEquals(rule1, rule1); + assertTrue(rule1.equals(rule1)); assertEquals(rule1, rule2); assertNotEquals(rule1, rule3); assertNotEquals(rule1, rule4); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RefMapTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RefMapTest.java index a8077fdb0c..0c9cb2d2b0 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RefMapTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RefMapTest.java @@ -423,7 +423,7 @@ public class RefMapTest { Map.Entry<String, Ref> ent_b = itr.next(); assertEquals(ent_a.hashCode(), "A".hashCode()); - assertEquals(ent_a, ent_a); + assertTrue(ent_a.equals(ent_a)); assertFalse(ent_a.equals(ent_b)); assertEquals(a.toString(), ent_a.toString()); |