|
|
@@ -75,20 +75,20 @@ class DurationTest {
|
|
|
|
|
|
@Test
|
|
|
void testPerformsRoundingOnHigherDisplay() {
|
|
|
- assertEquals("0 min", new Duration(MINUTES, 0, 29).toString());
|
|
|
- assertEquals("1 min", new Duration(MINUTES, 0, 30).toString());
|
|
|
+ assertEquals("0 min", new Duration(MINUTES, 29, 29).toString());
|
|
|
+ assertEquals("1 min", new Duration(MINUTES, 30, 30).toString());
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
void testCanDisplayHalfHours() {
|
|
|
- assertEquals("1 hr", new Duration(HOURS, 0, 3600).toString());
|
|
|
- assertEquals("1.5 hr", new Duration(HOURS, 0, 5400).toString());
|
|
|
+ assertEquals("1 hr", new Duration(HOURS, 3600, 3600).toString());
|
|
|
+ assertEquals("1.5 hr", new Duration(HOURS, 5400, 5400).toString());
|
|
|
}
|
|
|
|
|
|
@ParameterizedTest
|
|
|
@ValueSource(ints= {900, 2699})
|
|
|
void testHalfHourDisplayIsUsedForRoundNear(int value) {
|
|
|
- assertEquals("0.5 hr", new Duration(HOURS, 0, value).toString());
|
|
|
+ assertEquals("0.5 hr", new Duration(HOURS, value, value).toString());
|
|
|
}
|
|
|
|
|
|
@ParameterizedTest
|
|
|
@@ -103,9 +103,9 @@ class DurationTest {
|
|
|
assertEquals(new Duration(MINUTES, 600, 3600), new Duration("10 - 60 min"));
|
|
|
assertEquals(new Duration(SECONDS, 5, 10), new Duration("5 - 10 s"));
|
|
|
|
|
|
- assertEquals(new Duration(HOURS, 0, 3600), new Duration("1 hr"));
|
|
|
- assertEquals(new Duration(MINUTES, 0, 3600), new Duration("60 min"));
|
|
|
- assertEquals(new Duration(SECONDS, 0, 10), new Duration("10 s"));
|
|
|
+ assertEquals(new Duration(HOURS, 3600, 3600), new Duration("1 hr"));
|
|
|
+ assertEquals(new Duration(MINUTES, 3600, 3600), new Duration("60 min"));
|
|
|
+ assertEquals(new Duration(SECONDS, 10, 10), new Duration("10 s"));
|
|
|
}
|
|
|
|
|
|
@Test
|