--- jsr166/src/test/tck/TimeUnitTest.java 2016/03/25 04:53:28 1.29 +++ jsr166/src/test/tck/TimeUnitTest.java 2016/03/26 06:58:47 1.30 @@ -14,7 +14,6 @@ import static java.util.concurrent.TimeU import static java.util.concurrent.TimeUnit.NANOSECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import java.time.temporal.ChronoUnit; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -604,49 +603,4 @@ public class TimeUnitTest extends JSR166 assertSame(x, serialClone(x)); } - /** - * tests for toChronoUnit. - */ - public void testToChronoUnit() throws Exception { - assertSame(ChronoUnit.NANOS, NANOSECONDS.toChronoUnit()); - assertSame(ChronoUnit.MICROS, MICROSECONDS.toChronoUnit()); - assertSame(ChronoUnit.MILLIS, MILLISECONDS.toChronoUnit()); - assertSame(ChronoUnit.SECONDS, SECONDS.toChronoUnit()); - assertSame(ChronoUnit.MINUTES, MINUTES.toChronoUnit()); - assertSame(ChronoUnit.HOURS, HOURS.toChronoUnit()); - assertSame(ChronoUnit.DAYS, DAYS.toChronoUnit()); - - // Every TimeUnit has a defined ChronoUnit equivalent - for (TimeUnit x : TimeUnit.values()) - assertSame(x, TimeUnit.of(x.toChronoUnit())); - } - - /** - * tests for TimeUnit.of(ChronoUnit). - */ - public void testTimeUnitOf() throws Exception { - assertSame(NANOSECONDS, TimeUnit.of(ChronoUnit.NANOS)); - assertSame(MICROSECONDS, TimeUnit.of(ChronoUnit.MICROS)); - assertSame(MILLISECONDS, TimeUnit.of(ChronoUnit.MILLIS)); - assertSame(SECONDS, TimeUnit.of(ChronoUnit.SECONDS)); - assertSame(MINUTES, TimeUnit.of(ChronoUnit.MINUTES)); - assertSame(HOURS, TimeUnit.of(ChronoUnit.HOURS)); - assertSame(DAYS, TimeUnit.of(ChronoUnit.DAYS)); - - assertThrows(NullPointerException.class, - () -> TimeUnit.of((ChronoUnit)null)); - - // ChronoUnits either round trip to their TimeUnit - // equivalents, or throw IllegalArgumentException. - for (ChronoUnit cu : ChronoUnit.values()) { - final TimeUnit tu; - try { - tu = TimeUnit.of(cu); - } catch (IllegalArgumentException acceptable) { - continue; - } - assertSame(cu, tu.toChronoUnit()); - } - } - }