ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ScheduledExecutorTest.java

Comparing jsr166/src/test/tck/ScheduledExecutorTest.java (file contents):
Revision 1.81 by jsr166, Wed Aug 24 22:22:39 2016 UTC vs.
Revision 1.84 by jsr166, Mon Mar 20 00:34:27 2017 UTC

#	Line 510 | Line 510 | public class ScheduledExecutorTest exten
510		* isShutdown is false before shutdown, true after
511		*/
512		public void testIsShutdown() {
513	–
513		final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
514	<	try {
515	<	assertFalse(p.isShutdown());
516	<	}
517	<	finally {
518	<	try { p.shutdown(); } catch (SecurityException ok) { return; }
514	>	assertFalse(p.isShutdown());
515	>	try (PoolCleaner cleaner = cleaner(p)) {
516	>	try {
517	>	p.shutdown();
518	>	assertTrue(p.isShutdown());
519	>	} catch (SecurityException ok) {}
520		}
521	–	assertTrue(p.isShutdown());
521		}
522
523		/**
#	Line 815 | Line 814 | public class ScheduledExecutorTest exten
814		assertTrue(periodic.isDone());
815		}
816		}
817	+	for (Future<?> blocker : blockers) assertNull(blocker.get());
818		assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
819		assertTrue(p.isTerminated());
820		assertEquals(2 + (effectiveDelayedPolicy ? 1 : 0), ran.get());
#	Line 889 | Line 889 | public class ScheduledExecutorTest exten
889		CountDownLatch latch = new CountDownLatch(1);
890		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
891		try (PoolCleaner cleaner = cleaner(e)) {
892	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
892	>	List<Callable<String>> l = new ArrayList<>();
893		l.add(latchAwaitingStringTask(latch));
894		l.add(null);
895		try {
#	Line 906 | Line 906 | public class ScheduledExecutorTest exten
906		public void testInvokeAny4() throws Exception {
907		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
908		try (PoolCleaner cleaner = cleaner(e)) {
909	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
909	>	List<Callable<String>> l = new ArrayList<>();
910		l.add(new NPETask());
911		try {
912		e.invokeAny(l);
#	Line 923 | Line 923 | public class ScheduledExecutorTest exten
923		public void testInvokeAny5() throws Exception {
924		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
925		try (PoolCleaner cleaner = cleaner(e)) {
926	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
926	>	List<Callable<String>> l = new ArrayList<>();
927		l.add(new StringTask());
928		l.add(new StringTask());
929		String result = e.invokeAny(l);
#	Line 961 | Line 961 | public class ScheduledExecutorTest exten
961		public void testInvokeAll3() throws Exception {
962		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
963		try (PoolCleaner cleaner = cleaner(e)) {
964	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
964	>	List<Callable<String>> l = new ArrayList<>();
965		l.add(new StringTask());
966		l.add(null);
967		try {
#	Line 977 | Line 977 | public class ScheduledExecutorTest exten
977		public void testInvokeAll4() throws Exception {
978		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
979		try (PoolCleaner cleaner = cleaner(e)) {
980	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
980	>	List<Callable<String>> l = new ArrayList<>();
981		l.add(new NPETask());
982		List<Future<String>> futures = e.invokeAll(l);
983		assertEquals(1, futures.size());
#	Line 996 | Line 996 | public class ScheduledExecutorTest exten
996		public void testInvokeAll5() throws Exception {
997		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
998		try (PoolCleaner cleaner = cleaner(e)) {
999	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
999	>	List<Callable<String>> l = new ArrayList<>();
1000		l.add(new StringTask());
1001		l.add(new StringTask());
1002		List<Future<String>> futures = e.invokeAll(l);
#	Line 1025 | Line 1025 | public class ScheduledExecutorTest exten
1025		public void testTimedInvokeAnyNullTimeUnit() throws Exception {
1026		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1027		try (PoolCleaner cleaner = cleaner(e)) {
1028	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1028	>	List<Callable<String>> l = new ArrayList<>();
1029		l.add(new StringTask());
1030		try {
1031		e.invokeAny(l, MEDIUM_DELAY_MS, null);
#	Line 1054 | Line 1054 | public class ScheduledExecutorTest exten
1054		CountDownLatch latch = new CountDownLatch(1);
1055		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1056		try (PoolCleaner cleaner = cleaner(e)) {
1057	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1057	>	List<Callable<String>> l = new ArrayList<>();
1058		l.add(latchAwaitingStringTask(latch));
1059		l.add(null);
1060		try {
#	Line 1072 | Line 1072 | public class ScheduledExecutorTest exten
1072		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1073		try (PoolCleaner cleaner = cleaner(e)) {
1074		long startTime = System.nanoTime();
1075	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1075	>	List<Callable<String>> l = new ArrayList<>();
1076		l.add(new NPETask());
1077		try {
1078		e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
#	Line 1091 | Line 1091 | public class ScheduledExecutorTest exten
1091		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1092		try (PoolCleaner cleaner = cleaner(e)) {
1093		long startTime = System.nanoTime();
1094	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1094	>	List<Callable<String>> l = new ArrayList<>();
1095		l.add(new StringTask());
1096		l.add(new StringTask());
1097		String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
#	Line 1119 | Line 1119 | public class ScheduledExecutorTest exten
1119		public void testTimedInvokeAllNullTimeUnit() throws Exception {
1120		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1121		try (PoolCleaner cleaner = cleaner(e)) {
1122	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1122	>	List<Callable<String>> l = new ArrayList<>();
1123		l.add(new StringTask());
1124		try {
1125		e.invokeAll(l, MEDIUM_DELAY_MS, null);
#	Line 1146 | Line 1146 | public class ScheduledExecutorTest exten
1146		public void testTimedInvokeAll3() throws Exception {
1147		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1148		try (PoolCleaner cleaner = cleaner(e)) {
1149	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1149	>	List<Callable<String>> l = new ArrayList<>();
1150		l.add(new StringTask());
1151		l.add(null);
1152		try {
#	Line 1162 | Line 1162 | public class ScheduledExecutorTest exten
1162		public void testTimedInvokeAll4() throws Exception {
1163		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1164		try (PoolCleaner cleaner = cleaner(e)) {
1165	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1165	>	List<Callable<String>> l = new ArrayList<>();
1166		l.add(new NPETask());
1167		List<Future<String>> futures =
1168		e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
#	Line 1182 | Line 1182 | public class ScheduledExecutorTest exten
1182		public void testTimedInvokeAll5() throws Exception {
1183		final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1184		try (PoolCleaner cleaner = cleaner(e)) {
1185	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1185	>	List<Callable<String>> l = new ArrayList<>();
1186		l.add(new StringTask());
1187		l.add(new StringTask());
1188		List<Future<String>> futures =

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines