Simpler Duration.toString impl. Formatting.

Author: jhalterman

src/main/java/net/jodah/failsafe/util/Duration.java

@@ -19,21 +19,19 @@ public Duration(long length, TimeUnit timeUnit) {
     this.timeUnit = timeUnit;
   }
 
-  @Override public boolean equals(Object o)
-  {
-    return this == o 
-        || Duration.class.isInstance(o)
-           && toNanos() == Duration.class.cast(o).toNanos();
+  @Override
+  public boolean equals(Object o) {
+    return this == o || Duration.class.isInstance(o) && toNanos() == Duration.class.cast(o).toNanos();
   }
 
-  @Override public int hashCode()
-  {
-    return Arrays.hashCode(new Object[] {toNanos(), NANOSECONDS});
+  @Override
+  public int hashCode() {
+    return Arrays.hashCode(new Object[] { toNanos(), NANOSECONDS });
   }
 
-  @Override public String toString()
-  {
-    return "Duration{" + "length=" + length + ", timeUnit=" + timeUnit + '}';
+  @Override
+  public String toString() {
+    return length + " " + timeUnit.toString().toLowerCase();
   }
 
   /**

src/test/java/net/jodah/failsafe/util/DurationTest.java

@@ -9,41 +9,30 @@
 
 package net.jodah.failsafe.util;
 
-import org.testng.annotations.Test;
-
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
-
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertTrue;
 
-@Test public class DurationTest
-{
-
-    //~ Methods ----------------------------------------------------------------
-
-    public void testEquals()
-        throws Exception
-    {
-        assertEquals(new Duration(30000, MILLISECONDS),
-            new Duration(30, SECONDS));
-        assertNotEquals(new Duration(30, MILLISECONDS),
-            new Duration(30, SECONDS));
-    }
-
-    @Test public void testHashCode()
-        throws Exception
-    {
-        assertEquals(new Duration(30000, MILLISECONDS).hashCode(),
-            new Duration(30, SECONDS).hashCode());
-        assertNotEquals(new Duration(30, MILLISECONDS).hashCode(),
-            new Duration(30, SECONDS).hashCode());
-    }
+import org.testng.annotations.Test;
 
-    @Test public void testToString()
-        throws Exception
-    {
-        assertEquals(new Duration(30, SECONDS).toString(),
-            "Duration{length=30, timeUnit=SECONDS}");
-    }
+@Test
+public class DurationTest {
+  public void testEquals() throws Exception {
+    assertTrue(!new Duration(30, SECONDS).equals(null));
+    assertEquals(new Duration(30000, MILLISECONDS), new Duration(30, SECONDS));
+    assertNotEquals(new Duration(30, MILLISECONDS), new Duration(30, SECONDS));
+  }
+
+  @Test
+  public void testHashCode() throws Exception {
+    assertEquals(new Duration(30000, MILLISECONDS).hashCode(), new Duration(30, SECONDS).hashCode());
+    assertNotEquals(new Duration(30, MILLISECONDS).hashCode(), new Duration(30, SECONDS).hashCode());
+  }
+
+  @Test
+  public void testToString() throws Exception {
+    assertEquals(new Duration(30, SECONDS).toString(), "30 seconds");
+  }
 }