Use assertTrue/False instead of equals with boolean literals

This include replacing assertTrue(!..) with assertFalse()

Change-Id: Idecd8018641454e10127d82ea3ddda3f671489ef

4 files changed, 67 insertions, 62 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 07387e4fa6..c99762f976 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.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Set;
@@ -111,7 +112,7 @@ public class CleanCommandTest extends RepositoryTestCase {
 		files = status.getUntracked();
 		assertTrue(files.size() == 1);
 		assertTrue(cleanedFiles.contains("File3.txt"));
-		assertTrue(!cleanedFiles.contains("File2.txt"));
+		assertFalse(cleanedFiles.contains("File2.txt"));
 	}
 
 	@Test
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/fnmatch/FileNameMatcherTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/fnmatch/FileNameMatcherTest.java
index 66943c242e..3553fcf43c 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/fnmatch/FileNameMatcherTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/fnmatch/FileNameMatcherTest.java
@@ -45,6 +45,7 @@
 package org.eclipse.jgit.fnmatch;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -829,22 +830,22 @@ public class FileNameMatcherTest {
 		final String pattern = "helloworld";
 		final FileNameMatcher matcher = new FileNameMatcher(pattern, null);
 		matcher.append("helloworld");
-		assertEquals(true, matcher.isMatch());
-		assertEquals(false, matcher.canAppendMatch());
+		assertTrue(matcher.isMatch());
+		assertFalse(matcher.canAppendMatch());
 		matcher.reset();
 		matcher.append("hello");
-		assertEquals(false, matcher.isMatch());
-		assertEquals(true, matcher.canAppendMatch());
+		assertFalse(matcher.isMatch());
+		assertTrue(matcher.canAppendMatch());
 		matcher.append("world");
-		assertEquals(true, matcher.isMatch());
-		assertEquals(false, matcher.canAppendMatch());
+		assertTrue(matcher.isMatch());
+		assertFalse(matcher.canAppendMatch());
 		matcher.append("to much");
-		assertEquals(false, matcher.isMatch());
-		assertEquals(false, matcher.canAppendMatch());
+		assertFalse(matcher.isMatch());
+		assertFalse(matcher.canAppendMatch());
 		matcher.reset();
 		matcher.append("helloworld");
-		assertEquals(true, matcher.isMatch());
-		assertEquals(false, matcher.canAppendMatch());
+		assertTrue(matcher.isMatch());
+		assertFalse(matcher.canAppendMatch());
 	}
 
 	@Test
@@ -853,30 +854,30 @@ public class FileNameMatcherTest {
 		final FileNameMatcher matcher = new FileNameMatcher(pattern, null);
 		matcher.append("hello");
 		final FileNameMatcher childMatcher = matcher.createMatcherForSuffix();
-		assertEquals(false, matcher.isMatch());
-		assertEquals(true, matcher.canAppendMatch());
-		assertEquals(false, childMatcher.isMatch());
-		assertEquals(true, childMatcher.canAppendMatch());
+		assertFalse(matcher.isMatch());
+		assertTrue(matcher.canAppendMatch());
+		assertFalse(childMatcher.isMatch());
+		assertTrue(childMatcher.canAppendMatch());
 		matcher.append("world");
-		assertEquals(true, matcher.isMatch());
-		assertEquals(false, matcher.canAppendMatch());
-		assertEquals(false, childMatcher.isMatch());
-		assertEquals(true, childMatcher.canAppendMatch());
+		assertTrue(matcher.isMatch());
+		assertFalse(matcher.canAppendMatch());
+		assertFalse(childMatcher.isMatch());
+		assertTrue(childMatcher.canAppendMatch());
 		childMatcher.append("world");
-		assertEquals(true, matcher.isMatch());
-		assertEquals(false, matcher.canAppendMatch());
-		assertEquals(true, childMatcher.isMatch());
-		assertEquals(false, childMatcher.canAppendMatch());
+		assertTrue(matcher.isMatch());
+		assertFalse(matcher.canAppendMatch());
+		assertTrue(childMatcher.isMatch());
+		assertFalse(childMatcher.canAppendMatch());
 		childMatcher.reset();
-		assertEquals(true, matcher.isMatch());
-		assertEquals(false, matcher.canAppendMatch());
-		assertEquals(false, childMatcher.isMatch());
-		assertEquals(true, childMatcher.canAppendMatch());
+		assertTrue(matcher.isMatch());
+		assertFalse(matcher.canAppendMatch());
+		assertFalse(childMatcher.isMatch());
+		assertTrue(childMatcher.canAppendMatch());
 		childMatcher.append("world");
-		assertEquals(true, matcher.isMatch());
-		assertEquals(false, matcher.canAppendMatch());
-		assertEquals(true, childMatcher.isMatch());
-		assertEquals(false, childMatcher.canAppendMatch());
+		assertTrue(matcher.isMatch());
+		assertFalse(matcher.canAppendMatch());
+		assertTrue(childMatcher.isMatch());
+		assertFalse(childMatcher.canAppendMatch());
 	}
 
 	@Test
@@ -885,29 +886,29 @@ public class FileNameMatcherTest {
 		final FileNameMatcher matcher = new FileNameMatcher(pattern, null);
 		matcher.append("hello");
 		final FileNameMatcher copy = new FileNameMatcher(matcher);
-		assertEquals(false, matcher.isMatch());
-		assertEquals(true, matcher.canAppendMatch());
-		assertEquals(false, copy.isMatch());
-		assertEquals(true, copy.canAppendMatch());
+		assertFalse(matcher.isMatch());
+		assertTrue(matcher.canAppendMatch());
+		assertFalse(copy.isMatch());
+		assertTrue(copy.canAppendMatch());
 		matcher.append("world");
-		assertEquals(true, matcher.isMatch());
-		assertEquals(false, matcher.canAppendMatch());
-		assertEquals(false, copy.isMatch());
-		assertEquals(true, copy.canAppendMatch());
+		assertTrue(matcher.isMatch());
+		assertFalse(matcher.canAppendMatch());
+		assertFalse(copy.isMatch());
+		assertTrue(copy.canAppendMatch());
 		copy.append("world");
-		assertEquals(true, matcher.isMatch());
-		assertEquals(false, matcher.canAppendMatch());
-		assertEquals(true, copy.isMatch());
-		assertEquals(false, copy.canAppendMatch());
+		assertTrue(matcher.isMatch());
+		assertFalse(matcher.canAppendMatch());
+		assertTrue(copy.isMatch());
+		assertFalse(copy.canAppendMatch());
 		copy.reset();
-		assertEquals(true, matcher.isMatch());
-		assertEquals(false, matcher.canAppendMatch());
-		assertEquals(false, copy.isMatch());
-		assertEquals(true, copy.canAppendMatch());
+		assertTrue(matcher.isMatch());
+		assertFalse(matcher.canAppendMatch());
+		assertFalse(copy.isMatch());
+		assertTrue(copy.canAppendMatch());
 		copy.append("helloworld");
-		assertEquals(true, matcher.isMatch());
-		assertEquals(false, matcher.canAppendMatch());
-		assertEquals(true, copy.isMatch());
-		assertEquals(false, copy.canAppendMatch());
+		assertTrue(matcher.isMatch());
+		assertFalse(matcher.canAppendMatch());
+		assertTrue(copy.isMatch());
+		assertFalse(copy.canAppendMatch());
 	}
 }
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/PackWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/PackWriterTest.java
index 965a21ce05..f262d01ea9 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/PackWriterTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/PackWriterTest.java
@@ -44,6 +44,7 @@
 package org.eclipse.jgit.storage.file;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -134,9 +135,9 @@ public class PackWriterTest extends SampleDataRepositoryTestCase {
 	@Test
 	public void testContructor() throws IOException {
 		writer = new PackWriter(config, db.newObjectReader());
-		assertEquals(false, writer.isDeltaBaseAsOffset());
-		assertEquals(true, config.isReuseDeltas());
-		assertEquals(true, config.isReuseObjects());
+		assertFalse(writer.isDeltaBaseAsOffset());
+		assertTrue(config.isReuseDeltas());
+		assertTrue(config.isReuseObjects());
 		assertEquals(0, writer.getObjectCount());
 	}
 
@@ -148,14 +149,14 @@ public class PackWriterTest extends SampleDataRepositoryTestCase {
 		config.setReuseDeltas(false);
 		config.setReuseObjects(false);
 		config.setDeltaBaseAsOffset(false);
-		assertEquals(false, config.isReuseDeltas());
-		assertEquals(false, config.isReuseObjects());
-		assertEquals(false, config.isDeltaBaseAsOffset());
+		assertFalse(config.isReuseDeltas());
+		assertFalse(config.isReuseObjects());
+		assertFalse(config.isDeltaBaseAsOffset());
 
 		writer = new PackWriter(config, db.newObjectReader());
 		writer.setDeltaBaseAsOffset(true);
-		assertEquals(true, writer.isDeltaBaseAsOffset());
-		assertEquals(false, config.isDeltaBaseAsOffset());
+		assertTrue(writer.isDeltaBaseAsOffset());
+		assertFalse(config.isDeltaBaseAsOffset());
 	}
 
 	/**
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/OpenSshConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/OpenSshConfigTest.java
index c079234593..cb527c1712 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/OpenSshConfigTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/OpenSshConfigTest.java
@@ -44,8 +44,10 @@
 package org.eclipse.jgit.transport;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -228,7 +230,7 @@ public class OpenSshConfigTest extends RepositoryTestCase {
 	public void testAlias_BatchModeDefault() throws Exception {
 		final Host h = osc.lookup("orcz");
 		assertNotNull(h);
-		assertEquals(false, h.isBatchMode());
+		assertFalse(h.isBatchMode());
 	}
 
 	@Test
@@ -236,7 +238,7 @@ public class OpenSshConfigTest extends RepositoryTestCase {
 		config("Host orcz\n" + "\tBatchMode yes\n");
 		final Host h = osc.lookup("orcz");
 		assertNotNull(h);
-		assertEquals(true, h.isBatchMode());
+		assertTrue(h.isBatchMode());
 	}
 
 	@Test
@@ -245,6 +247,6 @@ public class OpenSshConfigTest extends RepositoryTestCase {
 				+ "\tBatchMode yes\n");
 		final Host h = osc.lookup("orcz");
 		assertNotNull(h);
-		assertEquals(true, h.isBatchMode());
+		assertTrue(h.isBatchMode());
 	}
 }