MurmurHashTest2: Use Assert.equals and conditional Assert.fail.

Author: aherbert

src/test/java/org/apache/commons/codec/digest/MurmurHash2Test.java

@@ -17,9 +17,7 @@
 
 package org.apache.commons.codec.digest;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 public class MurmurHash2Test {
@@ -85,8 +83,8 @@ public void testHash32ByteArrayIntInt() {
         for (int i = 0; i < input.length; i++) {
             final int hash = MurmurHash2.hash32(input[i], input[i].length, 0x71b4954d);
             if (hash != results32_seed[i]) {
-                fail(String.format("Unexpected hash32 result for example %d: 0x%08x instead of 0x%08x", i, hash,
-                        results32_seed[i]));
+                Assert.fail(String.format("Unexpected hash32 result for example %d: 0x%08x instead of 0x%08x", i, hash,
+                            results32_seed[i]));
             }
         }
     }
@@ -96,52 +94,55 @@ public void testHash32ByteArrayInt() {
         for (int i = 0; i < input.length; i++) {
             final int hash = MurmurHash2.hash32(input[i], input[i].length);
             if (hash != results32_standard[i]) {
-                fail(String.format("Unexpected hash32 result for example %d: 0x%08x instead of 0x%08x", i, hash,
-                        results32_standard[i]));
+                Assert.fail(String.format("Unexpected hash32 result for example %d: 0x%08x instead of 0x%08x", i, hash,
+                            results32_standard[i]));
             }
         }
     }
 
     @Test
     public void testHash32String() {
         final int hash = MurmurHash2.hash32(text);
-        assertTrue(hash == 0xb3bf597e);
+        Assert.assertEquals(0xb3bf597e, hash);
     }
 
     @Test
     public void testHash32StringIntInt() {
         final int hash = MurmurHash2.hash32(text, 2, text.length() - 4);
-        assertTrue(hash == 0x4d666d90);
+        Assert.assertEquals(0x4d666d90, hash);
     }
 
     @Test
     public void testHash64ByteArrayIntInt() {
         for (int i = 0; i < input.length; i++) {
             final long hash = MurmurHash2.hash64(input[i], input[i].length, 0x344d1f5c);
-            assertTrue(String.format("Unexpected hash64 result for example %d: 0x%016x instead of 0x%016x", i, hash,
-                    results64_seed[i]), hash == results64_seed[i]);
+            if (hash != results64_seed[i]) {
+                Assert.fail(String.format("Unexpected hash64 result for example %d: 0x%016x instead of 0x%016x", i, hash,
+                            results64_seed[i]));
+            }
         }
     }
 
     @Test
     public void testHash64ByteArrayInt() {
         for (int i = 0; i < input.length; i++) {
             final long hash = MurmurHash2.hash64(input[i], input[i].length);
-            assertTrue(String.format("Unexpected hash64 result for example %d: 0x%016x instead of 0x%016x", i, hash,
-                    results64_standard[i]), hash == results64_standard[i]);
+            if (hash != results64_standard[i]) {
+                Assert.fail(String.format("Unexpected hash64 result for example %d: 0x%016x instead of 0x%016x", i, hash,
+                    results64_standard[i]));
+            }
         }
     }
 
     @Test
     public void testHash64String() {
         final long hash = MurmurHash2.hash64(text);
-        assertTrue(hash == 0x0920e0c1b7eeb261l);
+        Assert.assertEquals(0x0920e0c1b7eeb261L, hash);
     }
 
     @Test
     public void testHash64StringIntInt() {
         final long hash = MurmurHash2.hash64(text, 2, text.length() - 4);
-        assertTrue(hash == 0xa8b33145194985a2l);
+        Assert.assertEquals(0xa8b33145194985a2L, hash);
     }
-
 }