|
|
@@ -5,7 +5,6 @@ import static org.junit.jupiter.api.Assertions.*;
|
|
|
import static org.hamcrest.MatcherAssert.*;
|
|
|
import static org.hamcrest.core.IsNot.*;
|
|
|
import static org.hamcrest.core.StringContains.*;
|
|
|
-import static org.hamcrest.core.StringStartsWith.*;
|
|
|
|
|
|
import org.junit.jupiter.api.Test;
|
|
|
import org.junit.jupiter.params.ParameterizedTest;
|
|
|
@@ -15,57 +14,42 @@ class DurationTest {
|
|
|
|
|
|
@Test
|
|
|
void testPlusConvertsToLowestUnit() {
|
|
|
- final Duration inSec = new Duration(Duration.Display.SECONDS, false, 10, 20);
|
|
|
- final Duration inMin = new Duration(Duration.Display.MINUTES, false, 60, 120);
|
|
|
+ final Duration inSec = new Duration(Duration.Display.SECONDS, 10, 20);
|
|
|
+ final Duration inMin = new Duration(Duration.Display.MINUTES, 60, 120);
|
|
|
|
|
|
assertEquals(Duration.Display.SECONDS, inSec.plus(inMin).getDisplayAs());
|
|
|
assertEquals(Duration.Display.SECONDS, inMin.plus(inSec).getDisplayAs());
|
|
|
}
|
|
|
-
|
|
|
- @Test
|
|
|
- void testPlusWillCarryOverApproximation() {
|
|
|
- final Duration inSec = new Duration(Duration.Display.SECONDS, true, 10, 20);
|
|
|
- final Duration inMin = new Duration(Duration.Display.MINUTES, false, 60, 120);
|
|
|
-
|
|
|
- assertTrue(inSec.plus(inMin).isApproximate());
|
|
|
- assertTrue(inMin.plus(inSec).isApproximate());
|
|
|
- }
|
|
|
-
|
|
|
- @Test
|
|
|
- void testToStringApproxAddsTilde() {
|
|
|
- final Duration inSec = new Duration(Duration.Display.SECONDS, true, 0, 0);
|
|
|
- assertThat(inSec.toString(), startsWith("~"));
|
|
|
- }
|
|
|
|
|
|
@Test
|
|
|
void testToStringNonApproxDoesNotHaveTilde() {
|
|
|
- final Duration inSec = new Duration(Duration.Display.SECONDS, false, 0, 0);
|
|
|
+ final Duration inSec = new Duration(Duration.Display.SECONDS, 0, 0);
|
|
|
assertThat(inSec.toString(), not(containsString("~")));
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
void testNonZeroMinProducesRange() {
|
|
|
- final Duration inSec = new Duration(Duration.Display.SECONDS, false, 10, 0);
|
|
|
+ final Duration inSec = new Duration(Duration.Display.SECONDS, 10, 0);
|
|
|
assertThat(inSec.toString(), containsString("-"));
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
void testZeroMinProducesSingleNumber() {
|
|
|
- final Duration inSec = new Duration(Duration.Display.SECONDS, false, 0, 0);
|
|
|
+ final Duration inSec = new Duration(Duration.Display.SECONDS, 0, 0);
|
|
|
assertThat(inSec.toString(), not(containsString("-")));
|
|
|
}
|
|
|
|
|
|
@ParameterizedTest
|
|
|
@EnumSource(Duration.Display.class)
|
|
|
void testUnitStringIsIncludedInOutput(final Duration.Display as) {
|
|
|
- final Duration dur = new Duration(as, false, 0, 0);
|
|
|
+ final Duration dur = new Duration(as, 0, 0);
|
|
|
assertThat(dur.toString(), containsString(as.abbreviation));
|
|
|
}
|
|
|
|
|
|
@Test
|
|
|
void testUnitControlsOutputScale() {
|
|
|
- final Duration inSec = new Duration(Duration.Display.SECONDS, false, 10, 20);
|
|
|
- final Duration inMin = new Duration(Duration.Display.MINUTES, false, 10, 20);
|
|
|
+ final Duration inSec = new Duration(Duration.Display.SECONDS, 10, 20);
|
|
|
+ final Duration inMin = new Duration(Duration.Display.MINUTES, 10, 20);
|
|
|
assertEquals("10 - 20 s", inSec.toString());
|
|
|
assertEquals("0 - 0 min", inMin.toString());
|
|
|
}
|