From d92287bcc2745a91490490bcb7145e6ce1d3f9be Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Sat, 15 Sep 2012 00:47:06 +0200 Subject: [PATCH] Use assertEquals instead of == for literal primitives Change-Id: I8449695ecc94a423369a7644a6ec93cf0cacef5d --- .../tst/org/eclipse/jgit/api/CleanCommandTest.java | 7 ++++--- .../tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java | 2 +- .../tst/org/eclipse/jgit/api/MergeCommandTest.java | 4 ++-- .../tst/org/eclipse/jgit/api/NotesCommandTest.java | 6 ++---- .../tst/org/eclipse/jgit/lib/T0002_TreeTest.java | 4 ++-- .../tst/org/eclipse/jgit/revwalk/RevFlagSetTest.java | 2 +- .../tst/org/eclipse/jgit/storage/file/T0003_BasicTest.java | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CleanCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CleanCommandTest.java index c99762f97..5ded3bce1 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CleanCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CleanCommandTest.java @@ -42,6 +42,7 @@ */ package org.eclipse.jgit.api; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -89,7 +90,7 @@ public class CleanCommandTest extends RepositoryTestCase { status = git.status().call(); files = status.getUntracked(); - assertTrue(files.size() == 0); + assertEquals(0, files.size()); assertTrue(cleanedFiles.contains("File2.txt")); assertTrue(cleanedFiles.contains("File3.txt")); } @@ -110,7 +111,7 @@ public class CleanCommandTest extends RepositoryTestCase { status = git.status().call(); files = status.getUntracked(); - assertTrue(files.size() == 1); + assertEquals(1, files.size()); assertTrue(cleanedFiles.contains("File3.txt")); assertFalse(cleanedFiles.contains("File2.txt")); } @@ -130,7 +131,7 @@ public class CleanCommandTest extends RepositoryTestCase { status = git.status().call(); files = status.getUntracked(); - assertTrue(files.size() == 2); + assertEquals(2, files.size()); assertTrue(cleanedFiles.contains("File2.txt")); assertTrue(cleanedFiles.contains("File3.txt")); } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java index 6424f1c5d..2eaec1476 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTests.java @@ -220,7 +220,7 @@ public class CommitAndLogCommandTests extends RepositoryTestCase { RevCommit[] parents = commit.getParents(); assertEquals(parents[0], firstSide); assertEquals(parents[1], second); - assertTrue(parents.length==2); + assertEquals(2, parents.length); } @Test diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java index 9effe6022..21ac3ad4e 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java @@ -461,7 +461,7 @@ public class MergeCommandTest extends RepositoryTestCase { assertEquals(null, result.getConflicts()); - assertTrue(2 == result.getMergedCommits().length); + assertEquals(2, result.getMergedCommits().length); assertEquals(thirdCommit, result.getMergedCommits()[0]); assertEquals(secondCommit, result.getMergedCommits()[1]); @@ -523,7 +523,7 @@ public class MergeCommandTest extends RepositoryTestCase { assertEquals(null, result.getConflicts()); - assertTrue(2 == result.getMergedCommits().length); + assertEquals(2, result.getMergedCommits().length); assertEquals(thirdCommit, result.getMergedCommits()[0]); assertEquals(secondCommit, result.getMergedCommits()[1]); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/NotesCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/NotesCommandTest.java index cb34c0e87..5afb1e880 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/NotesCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/NotesCommandTest.java @@ -43,8 +43,6 @@ package org.eclipse.jgit.api; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.util.List; import org.eclipse.jgit.lib.RepositoryTestCase; @@ -80,7 +78,7 @@ public class NotesCommandTest extends RepositoryTestCase { @Test public void testListNotes() throws Exception { List notes = git.notesList().call(); - assertTrue(notes.size() == 1); + assertEquals(1, notes.size()); } @Test @@ -94,7 +92,7 @@ public class NotesCommandTest extends RepositoryTestCase { git.notesRemove().setObjectId(commit2).call(); List notes = git.notesList().call(); - assertTrue(notes.size() == 1); + assertEquals(1, notes.size()); } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0002_TreeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0002_TreeTest.java index 8027f980d..dd7d335c8 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0002_TreeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/T0002_TreeTest.java @@ -123,7 +123,7 @@ public class T0002_TreeTest extends SampleDataRepositoryTestCase { assertTrue("no name", t.getName() == null); assertTrue("no nameUTF8", t.getNameUTF8() == null); assertTrue("has entries array", t.members() != null); - assertTrue("entries is empty", t.members().length == 0); + assertEquals("entries is empty", 0, t.members().length); assertEquals("full name is empty", "", t.getFullName()); assertTrue("no id", t.getId() == null); assertTrue("database is r", t.getRepository() == db); @@ -184,7 +184,7 @@ public class T0002_TreeTest extends SampleDataRepositoryTestCase { final TreeEntry[] i = t.members(); assertTrue("iterator is not empty", i.length > 0); assertTrue("iterator returns file", i[0] == f); - assertTrue("iterator is empty", i.length == 1); + assertEquals("iterator is empty", 1, i.length); } @Test diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevFlagSetTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevFlagSetTest.java index 95860d63f..1eebb5002 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevFlagSetTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevFlagSetTest.java @@ -86,7 +86,7 @@ public class RevFlagSetTest extends RevWalkTestCase { public void testAddTwo() { final RevFlag flag1 = rw.newFlag("flag_1"); final RevFlag flag2 = rw.newFlag("flag_2"); - assertTrue((flag1.mask & flag2.mask) == 0); + assertEquals(0, (flag1.mask & flag2.mask)); final RevFlagSet set = new RevFlagSet(); assertTrue(set.add(flag1)); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/T0003_BasicTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/T0003_BasicTest.java index 2a9bb7a56..12c634909 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/T0003_BasicTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/T0003_BasicTest.java @@ -399,7 +399,7 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { try { assertEquals(0x78, xis.readUInt8()); assertEquals(0x9c, xis.readUInt8()); - assertTrue(0x789c % 31 == 0); + assertEquals(0, 0x789c % 31); } finally { xis.close(); }