Merge pull request #1583 from slievrly/junit

simplify junit

Author: hazendaz

src/test/java/org/apache/ibatis/binding/BindingTest.java

@@ -180,7 +180,7 @@ void shouldInsertAuthorWithSelectKeyAndDynamicParams() {
       Author author = new Author(-1, "cbegin", "******", "[email protected]", "N/A", Section.NEWS);
       int rows = mapper.insertAuthorDynamic(author);
       assertEquals(1, rows);
-      assertFalse(-1 == author.getId()); // id must be autogenerated
+      assertNotEquals(-1, author.getId()); // id must be autogenerated
       Author author2 = mapper.selectAuthor(author.getId());
       assertNotNull(author2);
       assertEquals(author.getEmail(), author2.getEmail());

src/test/java/org/apache/ibatis/cache/BaseCacheTest.java

@@ -32,11 +32,11 @@ class BaseCacheTest {
   @Test
   void shouldDemonstrateEqualsAndHashCodeForVariousCacheTypes() {
     PerpetualCache cache = new PerpetualCache("test_cache");
-    assertTrue(cache.equals(cache));
-    assertTrue(cache.equals(new SynchronizedCache(cache)));
-    assertTrue(cache.equals(new SerializedCache(cache)));
-    assertTrue(cache.equals(new LoggingCache(cache)));
-    assertTrue(cache.equals(new ScheduledCache(cache)));
+    assertEquals(cache, cache);
+    assertEquals(cache, new SynchronizedCache(cache));
+    assertEquals(cache, new SerializedCache(cache));
+    assertEquals(cache, new LoggingCache(cache));
+    assertEquals(cache, new ScheduledCache(cache));
 
     assertEquals(cache.hashCode(), new SynchronizedCache(cache).hashCode());
     assertEquals(cache.hashCode(), new SerializedCache(cache).hashCode());

src/test/java/org/apache/ibatis/cache/CacheKeyTest.java

@@ -34,32 +34,32 @@ void shouldTestCacheKeysEqual() {
     Date date = new Date();
     CacheKey key1 = new CacheKey(new Object[] { 1, "hello", null, new Date(date.getTime()) });
     CacheKey key2 = new CacheKey(new Object[] { 1, "hello", null, new Date(date.getTime()) });
-    assertTrue(key1.equals(key2));
-    assertTrue(key2.equals(key1));
-    assertTrue(key1.hashCode() == key2.hashCode());
-    assertTrue(key1.toString().equals(key2.toString()));
+    assertEquals(key1, key2);
+    assertEquals(key2, key1);
+    assertEquals(key1.hashCode(), key2.hashCode());
+    assertEquals(key1.toString(), key2.toString());
   }
 
   @Test
   void shouldTestCacheKeysNotEqualDueToDateDifference() throws Exception {
     CacheKey key1 = new CacheKey(new Object[] { 1, "hello", null, new Date() });
     Thread.sleep(1000);
     CacheKey key2 = new CacheKey(new Object[] { 1, "hello", null, new Date() });
-    assertFalse(key1.equals(key2));
-    assertFalse(key2.equals(key1));
-    assertFalse(key1.hashCode() == key2.hashCode());
-    assertFalse(key1.toString().equals(key2.toString()));
+    assertNotEquals(key1, key2);
+    assertNotEquals(key2, key1);
+    assertNotEquals(key1.hashCode(), key2.hashCode());
+    assertNotEquals(key1.toString(), key2.toString());
   }
 
   @Test
   void shouldTestCacheKeysNotEqualDueToOrder() throws Exception {
     CacheKey key1 = new CacheKey(new Object[] { 1, "hello", null });
     Thread.sleep(1000);
     CacheKey key2 = new CacheKey(new Object[] { 1, null, "hello" });
-    assertFalse(key1.equals(key2));
-    assertFalse(key2.equals(key1));
-    assertFalse(key1.hashCode() == key2.hashCode());
-    assertFalse(key1.toString().equals(key2.toString()));
+    assertNotEquals(key1, key2);
+    assertNotEquals(key2, key1);
+    assertNotEquals(key1.hashCode(), key2.hashCode());
+    assertNotEquals(key1.toString(), key2.toString());
   }
 
   @Test
@@ -84,7 +84,7 @@ void shouldTestCacheKeysWithBinaryArrays() {
     byte[] array2 = new byte[] { 1 };
     CacheKey key1 = new CacheKey(new Object[] { array1 });
     CacheKey key2 = new CacheKey(new Object[] { array2 });
-    assertTrue(key1.equals(key2));
+    assertEquals(key1, key2);
   }
 
   @Test

src/test/java/org/apache/ibatis/submitted/lazy_immutable/ImmutablePOJOTest.java

@@ -51,7 +51,7 @@ void testLoadLazyImmutablePOJO() {
 
             assertEquals(POJO_ID, pojo.getId());
             assertNotNull(pojo.getDescription(), "Description should not be null.");
-            assertFalse(pojo.getDescription().length() == 0, "Description should not be empty.");
+          assertNotEquals(0, pojo.getDescription().length(), "Description should not be empty.");
         }
     }