ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ScheduledExecutorTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ScheduledExecutorTest.java (file contents):
Revision 1.4 by dl, Sun Sep 14 20:42:40 2003 UTC vs.
Revision 1.84 by jsr166, Mon Mar 20 00:34:27 2017 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
2 > * Written by Doug Lea with assistance from members of JCP JSR-166
3 > * Expert Group and released to the public domain, as explained at
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
10 < import java.util.*;
11 < import java.util.concurrent.*;
9 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
11 > import static java.util.concurrent.TimeUnit.SECONDS;
12 >
13 > import java.util.ArrayList;
14 > import java.util.HashSet;
15 > import java.util.List;
16 > import java.util.concurrent.BlockingQueue;
17 > import java.util.concurrent.Callable;
18 > import java.util.concurrent.CancellationException;
19 > import java.util.concurrent.CountDownLatch;
20 > import java.util.concurrent.ExecutionException;
21 > import java.util.concurrent.ExecutorService;
22 > import java.util.concurrent.Future;
23 > import java.util.concurrent.RejectedExecutionException;
24 > import java.util.concurrent.ScheduledFuture;
25 > import java.util.concurrent.ScheduledThreadPoolExecutor;
26 > import java.util.concurrent.ThreadFactory;
27 > import java.util.concurrent.ThreadPoolExecutor;
28 > import java.util.concurrent.atomic.AtomicBoolean;
29 > import java.util.concurrent.atomic.AtomicInteger;
30 > import java.util.concurrent.atomic.AtomicLong;
31 >
32 > import junit.framework.Test;
33 > import junit.framework.TestSuite;
34  
35   public class ScheduledExecutorTest extends JSR166TestCase {
36      public static void main(String[] args) {
37 <        junit.textui.TestRunner.run (suite());  
37 >        main(suite(), args);
38      }
39      public static Test suite() {
40 <        return new TestSuite(ScheduledExecutorTest.class);
40 >        return new TestSuite(ScheduledExecutorTest.class);
41      }
42  
43 <    static class MyRunnable implements Runnable {
44 <        volatile boolean done = false;
45 <        public void run(){
46 <            try{
47 <                Thread.sleep(SMALL_DELAY_MS);
48 <                done = true;
49 <            } catch(Exception e){
50 <            }
43 >    /**
44 >     * execute successfully executes a runnable
45 >     */
46 >    public void testExecute() throws InterruptedException {
47 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
48 >        try (PoolCleaner cleaner = cleaner(p)) {
49 >            final CountDownLatch done = new CountDownLatch(1);
50 >            final Runnable task = new CheckedRunnable() {
51 >                public void realRun() { done.countDown(); }};
52 >            p.execute(task);
53 >            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
54 >        }
55 >    }
56 >
57 >    /**
58 >     * delayed schedule of callable successfully executes after delay
59 >     */
60 >    public void testSchedule1() throws Exception {
61 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
62 >        try (PoolCleaner cleaner = cleaner(p)) {
63 >            final long startTime = System.nanoTime();
64 >            final CountDownLatch done = new CountDownLatch(1);
65 >            Callable task = new CheckedCallable<Boolean>() {
66 >                public Boolean realCall() {
67 >                    done.countDown();
68 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
69 >                    return Boolean.TRUE;
70 >                }};
71 >            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
72 >            assertSame(Boolean.TRUE, f.get());
73 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
74 >            assertTrue(done.await(0L, MILLISECONDS));
75 >        }
76 >    }
77 >
78 >    /**
79 >     * delayed schedule of runnable successfully executes after delay
80 >     */
81 >    public void testSchedule3() throws Exception {
82 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
83 >        try (PoolCleaner cleaner = cleaner(p)) {
84 >            final long startTime = System.nanoTime();
85 >            final CountDownLatch done = new CountDownLatch(1);
86 >            Runnable task = new CheckedRunnable() {
87 >                public void realRun() {
88 >                    done.countDown();
89 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
90 >                }};
91 >            Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
92 >            await(done);
93 >            assertNull(f.get(LONG_DELAY_MS, MILLISECONDS));
94 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
95          }
96      }
97  
98 <    static class MyCallable implements Callable {
99 <        volatile boolean done = false;
100 <        public Object call(){
101 <            try{
102 <                Thread.sleep(SMALL_DELAY_MS);
103 <                done = true;
104 <            }catch(Exception e){}
105 <            return Boolean.TRUE;
98 >    /**
99 >     * scheduleAtFixedRate executes runnable after given initial delay
100 >     */
101 >    public void testSchedule4() throws Exception {
102 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
103 >        try (PoolCleaner cleaner = cleaner(p)) {
104 >            final long startTime = System.nanoTime();
105 >            final CountDownLatch done = new CountDownLatch(1);
106 >            Runnable task = new CheckedRunnable() {
107 >                public void realRun() {
108 >                    done.countDown();
109 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
110 >                }};
111 >            ScheduledFuture f =
112 >                p.scheduleAtFixedRate(task, timeoutMillis(),
113 >                                      LONG_DELAY_MS, MILLISECONDS);
114 >            await(done);
115 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
116 >            f.cancel(true);
117          }
118      }
119  
120 <    public void testExecute(){
121 <        try{
122 <            MyRunnable runnable =new MyRunnable();
123 <            ScheduledExecutor one = new ScheduledExecutor(1);
124 <            one.execute(runnable);
125 <            assertFalse(runnable.done);
126 <            Thread.sleep(SHORT_DELAY_MS);
127 <            one.shutdown();
128 <            try{
129 <                Thread.sleep(MEDIUM_DELAY_MS);
130 <            } catch(InterruptedException e){
131 <                fail("unexpected exception");
120 >    /**
121 >     * scheduleWithFixedDelay executes runnable after given initial delay
122 >     */
123 >    public void testSchedule5() throws Exception {
124 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
125 >        try (PoolCleaner cleaner = cleaner(p)) {
126 >            final long startTime = System.nanoTime();
127 >            final CountDownLatch done = new CountDownLatch(1);
128 >            Runnable task = new CheckedRunnable() {
129 >                public void realRun() {
130 >                    done.countDown();
131 >                    assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
132 >                }};
133 >            ScheduledFuture f =
134 >                p.scheduleWithFixedDelay(task, timeoutMillis(),
135 >                                         LONG_DELAY_MS, MILLISECONDS);
136 >            await(done);
137 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
138 >            f.cancel(true);
139 >        }
140 >    }
141 >
142 >    static class RunnableCounter implements Runnable {
143 >        AtomicInteger count = new AtomicInteger(0);
144 >        public void run() { count.getAndIncrement(); }
145 >    }
146 >
147 >    /**
148 >     * scheduleAtFixedRate executes series of tasks at given rate.
149 >     * Eventually, it must hold that:
150 >     *   cycles - 1 <= elapsedMillis/delay < cycles
151 >     */
152 >    public void testFixedRateSequence() throws InterruptedException {
153 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
154 >        try (PoolCleaner cleaner = cleaner(p)) {
155 >            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
156 >                final long startTime = System.nanoTime();
157 >                final int cycles = 8;
158 >                final CountDownLatch done = new CountDownLatch(cycles);
159 >                final Runnable task = new CheckedRunnable() {
160 >                    public void realRun() { done.countDown(); }};
161 >                final ScheduledFuture periodicTask =
162 >                    p.scheduleAtFixedRate(task, 0, delay, MILLISECONDS);
163 >                final int totalDelayMillis = (cycles - 1) * delay;
164 >                await(done, totalDelayMillis + LONG_DELAY_MS);
165 >                periodicTask.cancel(true);
166 >                final long elapsedMillis = millisElapsedSince(startTime);
167 >                assertTrue(elapsedMillis >= totalDelayMillis);
168 >                if (elapsedMillis <= cycles * delay)
169 >                    return;
170 >                // else retry with longer delay
171              }
172 <            assertTrue(runnable.done);
56 <            one.shutdown();
57 <            joinPool(one);
172 >            fail("unexpected execution rate");
173          }
174 <        catch(Exception e){
175 <            fail("unexpected exception");
174 >    }
175 >
176 >    /**
177 >     * scheduleWithFixedDelay executes series of tasks with given period.
178 >     * Eventually, it must hold that each task starts at least delay and at
179 >     * most 2 * delay after the termination of the previous task.
180 >     */
181 >    public void testFixedDelaySequence() throws InterruptedException {
182 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
183 >        try (PoolCleaner cleaner = cleaner(p)) {
184 >            for (int delay = 1; delay <= LONG_DELAY_MS; delay *= 3) {
185 >                final long startTime = System.nanoTime();
186 >                final AtomicLong previous = new AtomicLong(startTime);
187 >                final AtomicBoolean tryLongerDelay = new AtomicBoolean(false);
188 >                final int cycles = 8;
189 >                final CountDownLatch done = new CountDownLatch(cycles);
190 >                final int d = delay;
191 >                final Runnable task = new CheckedRunnable() {
192 >                    public void realRun() {
193 >                        long now = System.nanoTime();
194 >                        long elapsedMillis
195 >                            = NANOSECONDS.toMillis(now - previous.get());
196 >                        if (done.getCount() == cycles) { // first execution
197 >                            if (elapsedMillis >= d)
198 >                                tryLongerDelay.set(true);
199 >                        } else {
200 >                            assertTrue(elapsedMillis >= d);
201 >                            if (elapsedMillis >= 2 * d)
202 >                                tryLongerDelay.set(true);
203 >                        }
204 >                        previous.set(now);
205 >                        done.countDown();
206 >                    }};
207 >                final ScheduledFuture periodicTask =
208 >                    p.scheduleWithFixedDelay(task, 0, delay, MILLISECONDS);
209 >                final int totalDelayMillis = (cycles - 1) * delay;
210 >                await(done, totalDelayMillis + cycles * LONG_DELAY_MS);
211 >                periodicTask.cancel(true);
212 >                final long elapsedMillis = millisElapsedSince(startTime);
213 >                assertTrue(elapsedMillis >= totalDelayMillis);
214 >                if (!tryLongerDelay.get())
215 >                    return;
216 >                // else retry with longer delay
217 >            }
218 >            fail("unexpected execution rate");
219          }
62        
220      }
221  
222 <    public void testSchedule1(){
223 <        try{
224 <            MyCallable callable = new MyCallable();
225 <            ScheduledExecutor one = new ScheduledExecutor(1);
226 <            Future f = one.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
227 <            assertFalse(callable.done);
228 <            Thread.sleep(MEDIUM_DELAY_MS);
229 <            assertTrue(callable.done);
230 <            assertEquals(Boolean.TRUE, f.get());
231 <            one.shutdown();
75 <            joinPool(one);
76 <        }catch(RejectedExecutionException e){}
77 <        catch(Exception e){
78 <            fail("unexpected exception");
222 >    /**
223 >     * execute(null) throws NPE
224 >     */
225 >    public void testExecuteNull() throws InterruptedException {
226 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
227 >        try (PoolCleaner cleaner = cleaner(p)) {
228 >            try {
229 >                p.execute(null);
230 >                shouldThrow();
231 >            } catch (NullPointerException success) {}
232          }
233      }
234  
235      /**
236 <     *  Another version of schedule, only using Runnable instead of Callable
236 >     * schedule(null) throws NPE
237       */
238 <    public void testSchedule3(){
239 <        try{
240 <            MyRunnable runnable = new MyRunnable();
241 <            ScheduledExecutor one = new ScheduledExecutor(1);
242 <            one.schedule(runnable, SMALL_DELAY_MS, TimeUnit.MILLISECONDS);
243 <            Thread.sleep(SHORT_DELAY_MS);
244 <            assertFalse(runnable.done);
245 <            Thread.sleep(MEDIUM_DELAY_MS);
93 <            assertTrue(runnable.done);
94 <            one.shutdown();
95 <            joinPool(one);
96 <        } catch(Exception e){
97 <            fail("unexpected exception");
238 >    public void testScheduleNull() throws InterruptedException {
239 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
240 >        try (PoolCleaner cleaner = cleaner(p)) {
241 >            try {
242 >                TrackedCallable callable = null;
243 >                Future f = p.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
244 >                shouldThrow();
245 >            } catch (NullPointerException success) {}
246          }
247      }
248 <    
248 >
249      /**
250 <     *  The final version of schedule, using both long, TimeUnit and Runnable
250 >     * execute throws RejectedExecutionException if shutdown
251       */
252 <    public void testSchedule4(){
253 <        try{
254 <            MyRunnable runnable = new MyRunnable();
255 <            ScheduledExecutor one = new ScheduledExecutor(1);
256 <            one.schedule(runnable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
257 <            assertFalse(runnable.done);
258 <            Thread.sleep(MEDIUM_DELAY_MS);
259 <            assertTrue(runnable.done);
260 <            one.shutdown();
261 <            joinPool(one);
114 <        } catch(Exception e){
115 <            fail("unexpected exception");
252 >    public void testSchedule1_RejectedExecutionException() throws InterruptedException {
253 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
254 >        try (PoolCleaner cleaner = cleaner(p)) {
255 >            try {
256 >                p.shutdown();
257 >                p.schedule(new NoOpRunnable(),
258 >                           MEDIUM_DELAY_MS, MILLISECONDS);
259 >                shouldThrow();
260 >            } catch (RejectedExecutionException success) {
261 >            } catch (SecurityException ok) {}
262          }
263      }
118    
119  
120    // exception tests
264  
265      /**
266 <     *   schedule(Runnable, long) throws RejectedExecutionException
124 <     *  This occurs on an attempt to schedule a task on a shutdown executor
266 >     * schedule throws RejectedExecutionException if shutdown
267       */
268 <    public void testSchedule1_RejectedExecutionException(){
269 <        ScheduledExecutor se = new ScheduledExecutor(1);
270 <        try{
271 <            se.shutdown();
272 <            se.schedule(new NoOpRunnable(),
273 <                        MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
274 <            fail("shoud throw");
275 <        } catch(RejectedExecutionException success){
268 >    public void testSchedule2_RejectedExecutionException() throws InterruptedException {
269 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
270 >        try (PoolCleaner cleaner = cleaner(p)) {
271 >            try {
272 >                p.shutdown();
273 >                p.schedule(new NoOpCallable(),
274 >                           MEDIUM_DELAY_MS, MILLISECONDS);
275 >                shouldThrow();
276 >            } catch (RejectedExecutionException success) {
277 >            } catch (SecurityException ok) {}
278          }
279 <        joinPool(se);
279 >    }
280  
281 +    /**
282 +     * schedule callable throws RejectedExecutionException if shutdown
283 +     */
284 +    public void testSchedule3_RejectedExecutionException() throws InterruptedException {
285 +        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
286 +        try (PoolCleaner cleaner = cleaner(p)) {
287 +            try {
288 +                p.shutdown();
289 +                p.schedule(new NoOpCallable(),
290 +                           MEDIUM_DELAY_MS, MILLISECONDS);
291 +                shouldThrow();
292 +            } catch (RejectedExecutionException success) {
293 +            } catch (SecurityException ok) {}
294 +        }
295      }
296  
297      /**
298 <     *   schedule(Callable, long, TimeUnit) throws RejectedExecutionException
141 <     *  This occurs on an attempt to schedule a task on a shutdown executor
298 >     * scheduleAtFixedRate throws RejectedExecutionException if shutdown
299       */
300 <    public void testSchedule2_RejectedExecutionException(){
301 <        ScheduledExecutor se = new ScheduledExecutor(1);
302 <        try{
303 <            se.shutdown();
304 <            se.schedule(new NoOpCallable(),
305 <                        MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
306 <            fail("should throw");
307 <        } catch(RejectedExecutionException success){
300 >    public void testScheduleAtFixedRate1_RejectedExecutionException() throws InterruptedException {
301 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
302 >        try (PoolCleaner cleaner = cleaner(p)) {
303 >            try {
304 >                p.shutdown();
305 >                p.scheduleAtFixedRate(new NoOpRunnable(),
306 >                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
307 >                shouldThrow();
308 >            } catch (RejectedExecutionException success) {
309 >            } catch (SecurityException ok) {}
310          }
152        joinPool(se);
311      }
312  
313      /**
314 <     *   schedule(Callable, long) throws RejectedExecutionException
157 <     *  This occurs on an attempt to schedule a task on a shutdown executor
314 >     * scheduleWithFixedDelay throws RejectedExecutionException if shutdown
315       */
316 <     public void testSchedule3_RejectedExecutionException(){
317 <         ScheduledExecutor se = new ScheduledExecutor(1);
318 <         try{
319 <            se.shutdown();
320 <            se.schedule(new NoOpCallable(),
321 <                        MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
322 <            fail("should throw");
323 <        } catch(RejectedExecutionException success){
324 <        }
325 <         joinPool(se);
316 >    public void testScheduleWithFixedDelay1_RejectedExecutionException() throws InterruptedException {
317 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
318 >        try (PoolCleaner cleaner = cleaner(p)) {
319 >            try {
320 >                p.shutdown();
321 >                p.scheduleWithFixedDelay(new NoOpRunnable(),
322 >                                         MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, MILLISECONDS);
323 >                shouldThrow();
324 >            } catch (RejectedExecutionException success) {
325 >            } catch (SecurityException ok) {}
326 >        }
327      }
328  
329      /**
330 <     *   scheduleAtFixedRate(Runnable, long, long, TimeUnit) throws
331 <     *  RejectedExecutionException.
174 <     *  This occurs on an attempt to schedule a task on a shutdown executor
330 >     * getActiveCount increases but doesn't overestimate, when a
331 >     * thread becomes active
332       */
333 <    public void testScheduleAtFixedRate1_RejectedExecutionException(){
334 <        ScheduledExecutor se = new ScheduledExecutor(1);
335 <        try{
336 <            se.shutdown();
337 <            se.scheduleAtFixedRate(new NoOpRunnable(),
338 <                                   MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
339 <            fail("should throw");
340 <        } catch(RejectedExecutionException success){
341 <        }
342 <        joinPool(se);
333 >    public void testGetActiveCount() throws InterruptedException {
334 >        final CountDownLatch done = new CountDownLatch(1);
335 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
336 >        try (PoolCleaner cleaner = cleaner(p, done)) {
337 >            final CountDownLatch threadStarted = new CountDownLatch(1);
338 >            assertEquals(0, p.getActiveCount());
339 >            p.execute(new CheckedRunnable() {
340 >                public void realRun() throws InterruptedException {
341 >                    threadStarted.countDown();
342 >                    assertEquals(1, p.getActiveCount());
343 >                    await(done);
344 >                }});
345 >            await(threadStarted);
346 >            assertEquals(1, p.getActiveCount());
347 >        }
348      }
349 <    
349 >
350      /**
351 <     *   scheduleAtFixedRate(Runnable, long, long, TimeUnit) throws
352 <     *  RejectedExecutionException.
191 <     *  This occurs on an attempt to schedule a task on a shutdown executor
351 >     * getCompletedTaskCount increases, but doesn't overestimate,
352 >     * when tasks complete
353       */
354 <    public void testScheduleAtFixedRate2_RejectedExecutionException(){
355 <        ScheduledExecutor se = new ScheduledExecutor(1);
356 <        try{
357 <            se.shutdown();
358 <            se.scheduleAtFixedRate(new NoOpRunnable(),
359 <                                   1, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
360 <            fail("should throw");
361 <        } catch(RejectedExecutionException success){
362 <        }
363 <        joinPool(se);
354 >    public void testGetCompletedTaskCount() throws InterruptedException {
355 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(2);
356 >        try (PoolCleaner cleaner = cleaner(p)) {
357 >            final CountDownLatch threadStarted = new CountDownLatch(1);
358 >            final CountDownLatch threadProceed = new CountDownLatch(1);
359 >            final CountDownLatch threadDone = new CountDownLatch(1);
360 >            assertEquals(0, p.getCompletedTaskCount());
361 >            p.execute(new CheckedRunnable() {
362 >                public void realRun() throws InterruptedException {
363 >                    threadStarted.countDown();
364 >                    assertEquals(0, p.getCompletedTaskCount());
365 >                    threadProceed.await();
366 >                    threadDone.countDown();
367 >                }});
368 >            await(threadStarted);
369 >            assertEquals(0, p.getCompletedTaskCount());
370 >            threadProceed.countDown();
371 >            threadDone.await();
372 >            long startTime = System.nanoTime();
373 >            while (p.getCompletedTaskCount() != 1) {
374 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
375 >                    fail("timed out");
376 >                Thread.yield();
377 >            }
378 >        }
379      }
380  
381      /**
382 <     *   scheduleWithFixedDelay(Runnable, long, long, TimeUnit) throws
207 <     *  RejectedExecutionException.
208 <     *  This occurs on an attempt to schedule a task on a shutdown executor
382 >     * getCorePoolSize returns size given in constructor if not otherwise set
383       */
384 <    public void testScheduleWithFixedDelay1_RejectedExecutionException(){
385 <        ScheduledExecutor se = new ScheduledExecutor(1);
386 <        try{
387 <            se.shutdown();
388 <            se.scheduleWithFixedDelay(new NoOpRunnable(),
215 <                                      MEDIUM_DELAY_MS, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
216 <            fail("should throw");
217 <        } catch(RejectedExecutionException success){
218 <        }
219 <        joinPool(se);
384 >    public void testGetCorePoolSize() throws InterruptedException {
385 >        ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
386 >        try (PoolCleaner cleaner = cleaner(p)) {
387 >            assertEquals(1, p.getCorePoolSize());
388 >        }
389      }
390  
391      /**
392 <     *   scheduleWithFixedDelay(Runnable, long, long, TimeUnit) throws
393 <     *  RejectedExecutionException.
225 <     *  This occurs on an attempt to schedule a task on a shutdown executor
392 >     * getLargestPoolSize increases, but doesn't overestimate, when
393 >     * multiple threads active
394       */
395 <     public void testScheduleWithFixedDelay2_RejectedExecutionException(){
396 <         ScheduledExecutor se = new ScheduledExecutor(1);
397 <        try{
398 <            se.shutdown();
399 <            se.scheduleWithFixedDelay(new NoOpRunnable(),
400 <                                      1, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
401 <            fail("should throw");
402 <        } catch(RejectedExecutionException success){
403 <        }
404 <        joinPool(se);
395 >    public void testGetLargestPoolSize() throws InterruptedException {
396 >        final int THREADS = 3;
397 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(THREADS);
398 >        final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
399 >        final CountDownLatch done = new CountDownLatch(1);
400 >        try (PoolCleaner cleaner = cleaner(p, done)) {
401 >            assertEquals(0, p.getLargestPoolSize());
402 >            for (int i = 0; i < THREADS; i++)
403 >                p.execute(new CheckedRunnable() {
404 >                    public void realRun() throws InterruptedException {
405 >                        threadsStarted.countDown();
406 >                        await(done);
407 >                        assertEquals(THREADS, p.getLargestPoolSize());
408 >                    }});
409 >            await(threadsStarted);
410 >            assertEquals(THREADS, p.getLargestPoolSize());
411 >        }
412 >        assertEquals(THREADS, p.getLargestPoolSize());
413      }
414  
415      /**
416 <     *   execute throws RejectedExecutionException
417 <     *  This occurs on an attempt to schedule a task on a shutdown executor
416 >     * getPoolSize increases, but doesn't overestimate, when threads
417 >     * become active
418       */
419 <    public void testExecute_RejectedExecutionException(){
420 <        ScheduledExecutor se = new ScheduledExecutor(1);
421 <        try{
422 <            se.shutdown();
423 <            se.execute(new NoOpRunnable());
424 <            fail("should throw");
425 <        } catch(RejectedExecutionException success){
426 <        }
427 <        joinPool(se);
419 >    public void testGetPoolSize() throws InterruptedException {
420 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
421 >        final CountDownLatch threadStarted = new CountDownLatch(1);
422 >        final CountDownLatch done = new CountDownLatch(1);
423 >        try (PoolCleaner cleaner = cleaner(p, done)) {
424 >            assertEquals(0, p.getPoolSize());
425 >            p.execute(new CheckedRunnable() {
426 >                public void realRun() throws InterruptedException {
427 >                    threadStarted.countDown();
428 >                    assertEquals(1, p.getPoolSize());
429 >                    await(done);
430 >                }});
431 >            await(threadStarted);
432 >            assertEquals(1, p.getPoolSize());
433 >        }
434      }
435  
436      /**
437 <     *   getActiveCount gives correct values
437 >     * getTaskCount increases, but doesn't overestimate, when tasks
438 >     * submitted
439       */
440 <    public void testGetActiveCount(){
441 <        ScheduledExecutor two = new ScheduledExecutor(2);
442 <        assertEquals(0, two.getActiveCount());
443 <        two.execute(new SmallRunnable());
444 <        try{
445 <            Thread.sleep(SHORT_DELAY_MS);
446 <        } catch(Exception e){
447 <            fail("unexpected exception");
440 >    public void testGetTaskCount() throws InterruptedException {
441 >        final int TASKS = 3;
442 >        final CountDownLatch done = new CountDownLatch(1);
443 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
444 >        try (PoolCleaner cleaner = cleaner(p, done)) {
445 >            final CountDownLatch threadStarted = new CountDownLatch(1);
446 >            assertEquals(0, p.getTaskCount());
447 >            assertEquals(0, p.getCompletedTaskCount());
448 >            p.execute(new CheckedRunnable() {
449 >                public void realRun() throws InterruptedException {
450 >                    threadStarted.countDown();
451 >                    await(done);
452 >                }});
453 >            await(threadStarted);
454 >            assertEquals(1, p.getTaskCount());
455 >            assertEquals(0, p.getCompletedTaskCount());
456 >            for (int i = 0; i < TASKS; i++) {
457 >                assertEquals(1 + i, p.getTaskCount());
458 >                p.execute(new CheckedRunnable() {
459 >                    public void realRun() throws InterruptedException {
460 >                        threadStarted.countDown();
461 >                        assertEquals(1 + TASKS, p.getTaskCount());
462 >                        await(done);
463 >                    }});
464 >            }
465 >            assertEquals(1 + TASKS, p.getTaskCount());
466 >            assertEquals(0, p.getCompletedTaskCount());
467          }
468 <        assertEquals(1, two.getActiveCount());
469 <        joinPool(two);
468 >        assertEquals(1 + TASKS, p.getTaskCount());
469 >        assertEquals(1 + TASKS, p.getCompletedTaskCount());
470      }
471 <    
471 >
472      /**
473 <     *   getCompleteTaskCount gives correct values
473 >     * getThreadFactory returns factory in constructor if not set
474       */
475 <    public void testGetCompletedTaskCount(){
476 <        ScheduledExecutor two = new ScheduledExecutor(2);
477 <        assertEquals(0, two.getCompletedTaskCount());
478 <        two.execute(new SmallRunnable());
479 <        try{
480 <            Thread.sleep(MEDIUM_DELAY_MS);
279 <        } catch(Exception e){
280 <            fail("unexpected exception");
475 >    public void testGetThreadFactory() throws InterruptedException {
476 >        final ThreadFactory threadFactory = new SimpleThreadFactory();
477 >        final ScheduledThreadPoolExecutor p =
478 >            new ScheduledThreadPoolExecutor(1, threadFactory);
479 >        try (PoolCleaner cleaner = cleaner(p)) {
480 >            assertSame(threadFactory, p.getThreadFactory());
481          }
282        assertEquals(1, two.getCompletedTaskCount());
283        joinPool(two);
482      }
483 <    
483 >
484      /**
485 <     *   getCorePoolSize gives correct values
485 >     * setThreadFactory sets the thread factory returned by getThreadFactory
486       */
487 <    public void testGetCorePoolSize(){
488 <        ScheduledExecutor one = new ScheduledExecutor(1);
489 <        assertEquals(1, one.getCorePoolSize());
490 <        joinPool(one);
487 >    public void testSetThreadFactory() throws InterruptedException {
488 >        ThreadFactory threadFactory = new SimpleThreadFactory();
489 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
490 >        try (PoolCleaner cleaner = cleaner(p)) {
491 >            p.setThreadFactory(threadFactory);
492 >            assertSame(threadFactory, p.getThreadFactory());
493 >        }
494      }
495 <    
495 >
496      /**
497 <     *   getLargestPoolSize gives correct values
497 >     * setThreadFactory(null) throws NPE
498       */
499 <    public void testGetLargestPoolSize(){
500 <        ScheduledExecutor two = new ScheduledExecutor(2);
501 <        assertEquals(0, two.getLargestPoolSize());
502 <        two.execute(new SmallRunnable());
503 <        two.execute(new SmallRunnable());
504 <        try{
505 <            Thread.sleep(SHORT_DELAY_MS);
305 <        } catch(Exception e){
306 <            fail("unexpected exception");
499 >    public void testSetThreadFactoryNull() throws InterruptedException {
500 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
501 >        try (PoolCleaner cleaner = cleaner(p)) {
502 >            try {
503 >                p.setThreadFactory(null);
504 >                shouldThrow();
505 >            } catch (NullPointerException success) {}
506          }
308        assertEquals(2, two.getLargestPoolSize());
309        joinPool(two);
507      }
508 <    
508 >
509      /**
510 <     *   getPoolSize gives correct values
510 >     * isShutdown is false before shutdown, true after
511       */
512 <    public void testGetPoolSize(){
513 <        ScheduledExecutor one = new ScheduledExecutor(1);
514 <        assertEquals(0, one.getPoolSize());
515 <        one.execute(new SmallRunnable());
516 <        assertEquals(1, one.getPoolSize());
517 <        joinPool(one);
512 >    public void testIsShutdown() {
513 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
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      }
522 <    
522 >
523      /**
524 <     *   getTaskCount gives correct values
524 >     * isTerminated is false before termination, true after
525       */
526 <    public void testGetTaskCount(){
527 <        ScheduledExecutor one = new ScheduledExecutor(1);
528 <        assertEquals(0, one.getTaskCount());
529 <        for(int i = 0; i < 5; i++)
530 <            one.execute(new SmallRunnable());
531 <        try{
532 <            Thread.sleep(SHORT_DELAY_MS);
533 <        } catch(Exception e){
534 <            fail("unexpected exception");
526 >    public void testIsTerminated() throws InterruptedException {
527 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
528 >        try (PoolCleaner cleaner = cleaner(p)) {
529 >            final CountDownLatch threadStarted = new CountDownLatch(1);
530 >            final CountDownLatch done = new CountDownLatch(1);
531 >            assertFalse(p.isTerminated());
532 >            p.execute(new CheckedRunnable() {
533 >                public void realRun() throws InterruptedException {
534 >                    assertFalse(p.isTerminated());
535 >                    threadStarted.countDown();
536 >                    await(done);
537 >                }});
538 >            await(threadStarted);
539 >            assertFalse(p.isTerminating());
540 >            done.countDown();
541 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
542 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
543 >            assertTrue(p.isTerminated());
544          }
336        assertEquals(5, one.getTaskCount());
337        joinPool(one);
545      }
546 <    
546 >
547      /**
548 <     *   isShutDown gives correct values
548 >     * isTerminating is not true when running or when terminated
549       */
550 <    public void testIsShutdown(){
551 <        
552 <        ScheduledExecutor one = new ScheduledExecutor(1);
553 <        try {
554 <            assertFalse(one.isShutdown());
550 >    public void testIsTerminating() throws InterruptedException {
551 >        final ThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
552 >        final CountDownLatch threadStarted = new CountDownLatch(1);
553 >        final CountDownLatch done = new CountDownLatch(1);
554 >        try (PoolCleaner cleaner = cleaner(p)) {
555 >            assertFalse(p.isTerminating());
556 >            p.execute(new CheckedRunnable() {
557 >                public void realRun() throws InterruptedException {
558 >                    assertFalse(p.isTerminating());
559 >                    threadStarted.countDown();
560 >                    await(done);
561 >                }});
562 >            await(threadStarted);
563 >            assertFalse(p.isTerminating());
564 >            done.countDown();
565 >            try { p.shutdown(); } catch (SecurityException ok) { return; }
566 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
567 >            assertTrue(p.isTerminated());
568 >            assertFalse(p.isTerminating());
569          }
570 <        finally {
571 <            one.shutdown();
570 >    }
571 >
572 >    /**
573 >     * getQueue returns the work queue, which contains queued tasks
574 >     */
575 >    public void testGetQueue() throws InterruptedException {
576 >        final CountDownLatch done = new CountDownLatch(1);
577 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
578 >        try (PoolCleaner cleaner = cleaner(p, done)) {
579 >            final CountDownLatch threadStarted = new CountDownLatch(1);
580 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
581 >            for (int i = 0; i < tasks.length; i++) {
582 >                Runnable r = new CheckedRunnable() {
583 >                    public void realRun() throws InterruptedException {
584 >                        threadStarted.countDown();
585 >                        await(done);
586 >                    }};
587 >                tasks[i] = p.schedule(r, 1, MILLISECONDS);
588 >            }
589 >            await(threadStarted);
590 >            BlockingQueue<Runnable> q = p.getQueue();
591 >            assertTrue(q.contains(tasks[tasks.length - 1]));
592 >            assertFalse(q.contains(tasks[0]));
593          }
352        assertTrue(one.isShutdown());
594      }
595  
355        
596      /**
597 <     *   isTerminated gives correct values
358 <     *  Makes sure termination does not take an innapropriate
359 <     *  amount of time
597 >     * remove(task) removes queued task, and fails to remove active task
598       */
599 <    public void testIsTerminated(){
600 <        ScheduledExecutor one = new ScheduledExecutor(1);
601 <        try {
602 <            one.execute(new SmallRunnable());
603 <        } finally {
604 <            one.shutdown();
599 >    public void testRemove() throws InterruptedException {
600 >        final CountDownLatch done = new CountDownLatch(1);
601 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
602 >        try (PoolCleaner cleaner = cleaner(p, done)) {
603 >            ScheduledFuture[] tasks = new ScheduledFuture[5];
604 >            final CountDownLatch threadStarted = new CountDownLatch(1);
605 >            for (int i = 0; i < tasks.length; i++) {
606 >                Runnable r = new CheckedRunnable() {
607 >                    public void realRun() throws InterruptedException {
608 >                        threadStarted.countDown();
609 >                        await(done);
610 >                    }};
611 >                tasks[i] = p.schedule(r, 1, MILLISECONDS);
612 >            }
613 >            await(threadStarted);
614 >            BlockingQueue<Runnable> q = p.getQueue();
615 >            assertFalse(p.remove((Runnable)tasks[0]));
616 >            assertTrue(q.contains((Runnable)tasks[4]));
617 >            assertTrue(q.contains((Runnable)tasks[3]));
618 >            assertTrue(p.remove((Runnable)tasks[4]));
619 >            assertFalse(p.remove((Runnable)tasks[4]));
620 >            assertFalse(q.contains((Runnable)tasks[4]));
621 >            assertTrue(q.contains((Runnable)tasks[3]));
622 >            assertTrue(p.remove((Runnable)tasks[3]));
623 >            assertFalse(q.contains((Runnable)tasks[3]));
624          }
368        try {
369            assertTrue(one.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
370            assertTrue(one.isTerminated());
371        } catch(Exception e){
372            fail("unexpected exception");
373        }      
625      }
626  
627      /**
628 <     *   that purge correctly removes cancelled tasks
378 <     *  from the queue
628 >     * purge eventually removes cancelled tasks from the queue
629       */
630 <    public void testPurge(){
631 <        ScheduledExecutor one = new ScheduledExecutor(1);
632 <        ScheduledCancellable[] tasks = new ScheduledCancellable[5];
633 <        for(int i = 0; i < 5; i++){
634 <            tasks[i] = one.schedule(new SmallRunnable(), 1, TimeUnit.MILLISECONDS);
630 >    public void testPurge() throws InterruptedException {
631 >        final ScheduledFuture[] tasks = new ScheduledFuture[5];
632 >        final Runnable releaser = new Runnable() { public void run() {
633 >            for (ScheduledFuture task : tasks)
634 >                if (task != null) task.cancel(true); }};
635 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
636 >        try (PoolCleaner cleaner = cleaner(p, releaser)) {
637 >            for (int i = 0; i < tasks.length; i++)
638 >                tasks[i] = p.schedule(new SmallPossiblyInterruptedRunnable(),
639 >                                      LONG_DELAY_MS, MILLISECONDS);
640 >            int max = tasks.length;
641 >            if (tasks[4].cancel(true)) --max;
642 >            if (tasks[3].cancel(true)) --max;
643 >            // There must eventually be an interference-free point at
644 >            // which purge will not fail. (At worst, when queue is empty.)
645 >            long startTime = System.nanoTime();
646 >            do {
647 >                p.purge();
648 >                long count = p.getTaskCount();
649 >                if (count == max)
650 >                    return;
651 >            } while (millisElapsedSince(startTime) < LONG_DELAY_MS);
652 >            fail("Purge failed to remove cancelled tasks");
653          }
386        int max = 5;
387        if (tasks[4].cancel(true)) --max;
388        if (tasks[3].cancel(true)) --max;
389        one.purge();
390        long count = one.getTaskCount();
391        assertTrue(count > 0 && count <= max);
392        joinPool(one);
654      }
655  
656      /**
657 <     *   shutDownNow returns a list
658 <     *  containing the correct number of elements
657 >     * shutdownNow returns a list containing tasks that were not run,
658 >     * and those tasks are drained from the queue
659       */
660 <    public void testShutDownNow(){
661 <        ScheduledExecutor one = new ScheduledExecutor(1);
662 <        for(int i = 0; i < 5; i++)
663 <            one.schedule(new SmallRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
664 <        List l = one.shutdownNow();
665 <        assertTrue(one.isShutdown());
666 <        assertTrue(l.size() > 0 && l.size() <= 5);
667 <        joinPool(one);
660 >    public void testShutdownNow() throws InterruptedException {
661 >        final int poolSize = 2;
662 >        final int count = 5;
663 >        final AtomicInteger ran = new AtomicInteger(0);
664 >        final ScheduledThreadPoolExecutor p =
665 >            new ScheduledThreadPoolExecutor(poolSize);
666 >        final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
667 >        Runnable waiter = new CheckedRunnable() { public void realRun() {
668 >            threadsStarted.countDown();
669 >            try {
670 >                MILLISECONDS.sleep(2 * LONG_DELAY_MS);
671 >            } catch (InterruptedException success) {}
672 >            ran.getAndIncrement();
673 >        }};
674 >        for (int i = 0; i < count; i++)
675 >            p.execute(waiter);
676 >        await(threadsStarted);
677 >        assertEquals(poolSize, p.getActiveCount());
678 >        assertEquals(0, p.getCompletedTaskCount());
679 >        final List<Runnable> queuedTasks;
680 >        try {
681 >            queuedTasks = p.shutdownNow();
682 >        } catch (SecurityException ok) {
683 >            return; // Allowed in case test doesn't have privs
684 >        }
685 >        assertTrue(p.isShutdown());
686 >        assertTrue(p.getQueue().isEmpty());
687 >        assertEquals(count - poolSize, queuedTasks.size());
688 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
689 >        assertTrue(p.isTerminated());
690 >        assertEquals(poolSize, ran.get());
691 >        assertEquals(poolSize, p.getCompletedTaskCount());
692      }
693  
694 <    public void testShutDown1(){
694 >    /**
695 >     * shutdownNow returns a list containing tasks that were not run,
696 >     * and those tasks are drained from the queue
697 >     */
698 >    public void testShutdownNow_delayedTasks() throws InterruptedException {
699 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
700 >        List<ScheduledFuture> tasks = new ArrayList<>();
701 >        for (int i = 0; i < 3; i++) {
702 >            Runnable r = new NoOpRunnable();
703 >            tasks.add(p.schedule(r, 9, SECONDS));
704 >            tasks.add(p.scheduleAtFixedRate(r, 9, 9, SECONDS));
705 >            tasks.add(p.scheduleWithFixedDelay(r, 9, 9, SECONDS));
706 >        }
707 >        if (testImplementationDetails)
708 >            assertEquals(new HashSet(tasks), new HashSet(p.getQueue()));
709 >        final List<Runnable> queuedTasks;
710          try {
711 <            ScheduledExecutor one = new ScheduledExecutor(1);
712 <            assertTrue(one.getExecuteExistingDelayedTasksAfterShutdownPolicy());
713 <            assertFalse(one.getContinueExistingPeriodicTasksAfterShutdownPolicy());
711 >            queuedTasks = p.shutdownNow();
712 >        } catch (SecurityException ok) {
713 >            return; // Allowed in case test doesn't have privs
714 >        }
715 >        assertTrue(p.isShutdown());
716 >        assertTrue(p.getQueue().isEmpty());
717 >        if (testImplementationDetails)
718 >            assertEquals(new HashSet(tasks), new HashSet(queuedTasks));
719 >        assertEquals(tasks.size(), queuedTasks.size());
720 >        for (ScheduledFuture task : tasks) {
721 >            assertFalse(task.isDone());
722 >            assertFalse(task.isCancelled());
723 >        }
724 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
725 >        assertTrue(p.isTerminated());
726 >    }
727  
728 <            ScheduledCancellable[] tasks = new ScheduledCancellable[5];
729 <            for(int i = 0; i < 5; i++)
730 <                tasks[i] = one.schedule(new NoOpRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
731 <            one.shutdown();
732 <            BlockingQueue q = one.getQueue();
733 <            for (Iterator it = q.iterator(); it.hasNext();) {
734 <                ScheduledCancellable t = (ScheduledCancellable)it.next();
735 <                assertFalse(t.isCancelled());
728 >    /**
729 >     * By default, periodic tasks are cancelled at shutdown.
730 >     * By default, delayed tasks keep running after shutdown.
731 >     * Check that changing the default values work:
732 >     * - setExecuteExistingDelayedTasksAfterShutdownPolicy
733 >     * - setContinueExistingPeriodicTasksAfterShutdownPolicy
734 >     */
735 >    public void testShutdown_cancellation() throws Exception {
736 >        Boolean[] allBooleans = { null, Boolean.FALSE, Boolean.TRUE };
737 >        for (Boolean policy : allBooleans)
738 >    {
739 >        final int poolSize = 2;
740 >        final ScheduledThreadPoolExecutor p
741 >            = new ScheduledThreadPoolExecutor(poolSize);
742 >        final boolean effectiveDelayedPolicy = (policy != Boolean.FALSE);
743 >        final boolean effectivePeriodicPolicy = (policy == Boolean.TRUE);
744 >        final boolean effectiveRemovePolicy = (policy == Boolean.TRUE);
745 >        if (policy != null) {
746 >            p.setExecuteExistingDelayedTasksAfterShutdownPolicy(policy);
747 >            p.setContinueExistingPeriodicTasksAfterShutdownPolicy(policy);
748 >            p.setRemoveOnCancelPolicy(policy);
749 >        }
750 >        assertEquals(effectiveDelayedPolicy,
751 >                     p.getExecuteExistingDelayedTasksAfterShutdownPolicy());
752 >        assertEquals(effectivePeriodicPolicy,
753 >                     p.getContinueExistingPeriodicTasksAfterShutdownPolicy());
754 >        assertEquals(effectiveRemovePolicy,
755 >                     p.getRemoveOnCancelPolicy());
756 >        // Strategy: Wedge the pool with poolSize "blocker" threads
757 >        final AtomicInteger ran = new AtomicInteger(0);
758 >        final CountDownLatch poolBlocked = new CountDownLatch(poolSize);
759 >        final CountDownLatch unblock = new CountDownLatch(1);
760 >        final CountDownLatch periodicLatch1 = new CountDownLatch(2);
761 >        final CountDownLatch periodicLatch2 = new CountDownLatch(2);
762 >        Runnable task = new CheckedRunnable() { public void realRun()
763 >                                                    throws InterruptedException {
764 >            poolBlocked.countDown();
765 >            assertTrue(unblock.await(LONG_DELAY_MS, MILLISECONDS));
766 >            ran.getAndIncrement();
767 >        }};
768 >        List<Future<?>> blockers = new ArrayList<>();
769 >        List<Future<?>> periodics = new ArrayList<>();
770 >        List<Future<?>> delayeds = new ArrayList<>();
771 >        for (int i = 0; i < poolSize; i++)
772 >            blockers.add(p.submit(task));
773 >        assertTrue(poolBlocked.await(LONG_DELAY_MS, MILLISECONDS));
774 >
775 >        periodics.add(p.scheduleAtFixedRate(countDowner(periodicLatch1),
776 >                                            1, 1, MILLISECONDS));
777 >        periodics.add(p.scheduleWithFixedDelay(countDowner(periodicLatch2),
778 >                                               1, 1, MILLISECONDS));
779 >        delayeds.add(p.schedule(task, 1, MILLISECONDS));
780 >
781 >        assertTrue(p.getQueue().containsAll(periodics));
782 >        assertTrue(p.getQueue().containsAll(delayeds));
783 >        try { p.shutdown(); } catch (SecurityException ok) { return; }
784 >        assertTrue(p.isShutdown());
785 >        assertFalse(p.isTerminated());
786 >        for (Future<?> periodic : periodics) {
787 >            assertTrue(effectivePeriodicPolicy ^ periodic.isCancelled());
788 >            assertTrue(effectivePeriodicPolicy ^ periodic.isDone());
789 >        }
790 >        for (Future<?> delayed : delayeds) {
791 >            assertTrue(effectiveDelayedPolicy ^ delayed.isCancelled());
792 >            assertTrue(effectiveDelayedPolicy ^ delayed.isDone());
793 >        }
794 >        if (testImplementationDetails) {
795 >            assertEquals(effectivePeriodicPolicy,
796 >                         p.getQueue().containsAll(periodics));
797 >            assertEquals(effectiveDelayedPolicy,
798 >                         p.getQueue().containsAll(delayeds));
799 >        }
800 >        // Release all pool threads
801 >        unblock.countDown();
802 >
803 >        for (Future<?> delayed : delayeds) {
804 >            if (effectiveDelayedPolicy) {
805 >                assertNull(delayed.get());
806              }
807 <            assertTrue(one.isShutdown());
808 <            Thread.sleep(SMALL_DELAY_MS);
809 <            for (int i = 0; i < 5; ++i) {
810 <                assertTrue(tasks[i].isDone());
811 <                assertFalse(tasks[i].isCancelled());
807 >        }
808 >        if (effectivePeriodicPolicy) {
809 >            assertTrue(periodicLatch1.await(LONG_DELAY_MS, MILLISECONDS));
810 >            assertTrue(periodicLatch2.await(LONG_DELAY_MS, MILLISECONDS));
811 >            for (Future<?> periodic : periodics) {
812 >                assertTrue(periodic.cancel(false));
813 >                assertTrue(periodic.isCancelled());
814 >                assertTrue(periodic.isDone());
815              }
430            
816          }
817 <        catch(Exception ex) {
818 <            fail("unexpected exception");
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());
821 >    }}
822 >
823 >    /**
824 >     * completed submit of callable returns result
825 >     */
826 >    public void testSubmitCallable() throws Exception {
827 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
828 >        try (PoolCleaner cleaner = cleaner(e)) {
829 >            Future<String> future = e.submit(new StringTask());
830 >            String result = future.get();
831 >            assertSame(TEST_STRING, result);
832          }
833      }
834  
835 +    /**
836 +     * completed submit of runnable returns successfully
837 +     */
838 +    public void testSubmitRunnable() throws Exception {
839 +        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
840 +        try (PoolCleaner cleaner = cleaner(e)) {
841 +            Future<?> future = e.submit(new NoOpRunnable());
842 +            future.get();
843 +            assertTrue(future.isDone());
844 +        }
845 +    }
846  
847 <    public void testShutDown2(){
848 <        try {
849 <            ScheduledExecutor one = new ScheduledExecutor(1);
850 <            one.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
851 <            ScheduledCancellable[] tasks = new ScheduledCancellable[5];
852 <            for(int i = 0; i < 5; i++)
853 <                tasks[i] = one.schedule(new NoOpRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
854 <            one.shutdown();
855 <            assertTrue(one.isShutdown());
447 <            BlockingQueue q = one.getQueue();
448 <            assertTrue(q.isEmpty());
449 <            Thread.sleep(SMALL_DELAY_MS);
450 <            assertTrue(one.isTerminated());
847 >    /**
848 >     * completed submit of (runnable, result) returns result
849 >     */
850 >    public void testSubmitRunnable2() throws Exception {
851 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
852 >        try (PoolCleaner cleaner = cleaner(e)) {
853 >            Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
854 >            String result = future.get();
855 >            assertSame(TEST_STRING, result);
856          }
857 <        catch(Exception ex) {
858 <            fail("unexpected exception");
857 >    }
858 >
859 >    /**
860 >     * invokeAny(null) throws NPE
861 >     */
862 >    public void testInvokeAny1() throws Exception {
863 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
864 >        try (PoolCleaner cleaner = cleaner(e)) {
865 >            try {
866 >                e.invokeAny(null);
867 >                shouldThrow();
868 >            } catch (NullPointerException success) {}
869          }
870      }
871  
872 +    /**
873 +     * invokeAny(empty collection) throws IAE
874 +     */
875 +    public void testInvokeAny2() throws Exception {
876 +        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
877 +        try (PoolCleaner cleaner = cleaner(e)) {
878 +            try {
879 +                e.invokeAny(new ArrayList<Callable<String>>());
880 +                shouldThrow();
881 +            } catch (IllegalArgumentException success) {}
882 +        }
883 +    }
884  
885 <    public void testShutDown3(){
886 <        try {
887 <            ScheduledExecutor one = new ScheduledExecutor(1);
888 <            one.setContinueExistingPeriodicTasksAfterShutdownPolicy(false);
889 <            ScheduledCancellable task =
890 <                one.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, TimeUnit.MILLISECONDS);
891 <            one.shutdown();
892 <            assertTrue(one.isShutdown());
893 <            BlockingQueue q = one.getQueue();
894 <            assertTrue(q.isEmpty());
895 <            Thread.sleep(SHORT_DELAY_MS);
896 <            assertTrue(one.isTerminated());
885 >    /**
886 >     * invokeAny(c) throws NPE if c has null elements
887 >     */
888 >    public void testInvokeAny3() throws Exception {
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<>();
893 >            l.add(latchAwaitingStringTask(latch));
894 >            l.add(null);
895 >            try {
896 >                e.invokeAny(l);
897 >                shouldThrow();
898 >            } catch (NullPointerException success) {}
899 >            latch.countDown();
900          }
901 <        catch(Exception ex) {
902 <            fail("unexpected exception");
901 >    }
902 >
903 >    /**
904 >     * invokeAny(c) throws ExecutionException if no task completes
905 >     */
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<>();
910 >            l.add(new NPETask());
911 >            try {
912 >                e.invokeAny(l);
913 >                shouldThrow();
914 >            } catch (ExecutionException success) {
915 >                assertTrue(success.getCause() instanceof NullPointerException);
916 >            }
917          }
918      }
919  
920 <    public void testShutDown4(){
921 <        ScheduledExecutor one = new ScheduledExecutor(1);
922 <        try {
923 <            one.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
924 <            ScheduledCancellable task =
925 <                one.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, TimeUnit.MILLISECONDS);
926 <            assertFalse(task.isCancelled());
927 <            one.shutdown();
928 <            assertFalse(task.isCancelled());
929 <            assertFalse(one.isTerminated());
930 <            assertTrue(one.isShutdown());
931 <            Thread.sleep(SHORT_DELAY_MS);
932 <            assertFalse(task.isCancelled());
933 <            task.cancel(true);
934 <            assertTrue(task.isCancelled());
935 <            Thread.sleep(SHORT_DELAY_MS);
936 <            assertTrue(one.isTerminated());
920 >    /**
921 >     * invokeAny(c) returns result of some task
922 >     */
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<>();
927 >            l.add(new StringTask());
928 >            l.add(new StringTask());
929 >            String result = e.invokeAny(l);
930 >            assertSame(TEST_STRING, result);
931 >        }
932 >    }
933 >
934 >    /**
935 >     * invokeAll(null) throws NPE
936 >     */
937 >    public void testInvokeAll1() throws Exception {
938 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
939 >        try (PoolCleaner cleaner = cleaner(e)) {
940 >            try {
941 >                e.invokeAll(null);
942 >                shouldThrow();
943 >            } catch (NullPointerException success) {}
944 >        }
945 >    }
946 >
947 >    /**
948 >     * invokeAll(empty collection) returns empty collection
949 >     */
950 >    public void testInvokeAll2() throws Exception {
951 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
952 >        try (PoolCleaner cleaner = cleaner(e)) {
953 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
954 >            assertTrue(r.isEmpty());
955 >        }
956 >    }
957 >
958 >    /**
959 >     * invokeAll(c) throws NPE if c has null elements
960 >     */
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<>();
965 >            l.add(new StringTask());
966 >            l.add(null);
967 >            try {
968 >                e.invokeAll(l);
969 >                shouldThrow();
970 >            } catch (NullPointerException success) {}
971 >        }
972 >    }
973 >
974 >    /**
975 >     * get of invokeAll(c) throws exception on failed task
976 >     */
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<>();
981 >            l.add(new NPETask());
982 >            List<Future<String>> futures = e.invokeAll(l);
983 >            assertEquals(1, futures.size());
984 >            try {
985 >                futures.get(0).get();
986 >                shouldThrow();
987 >            } catch (ExecutionException success) {
988 >                assertTrue(success.getCause() instanceof NullPointerException);
989 >            }
990 >        }
991 >    }
992 >
993 >    /**
994 >     * invokeAll(c) returns results of all completed tasks
995 >     */
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<>();
1000 >            l.add(new StringTask());
1001 >            l.add(new StringTask());
1002 >            List<Future<String>> futures = e.invokeAll(l);
1003 >            assertEquals(2, futures.size());
1004 >            for (Future<String> future : futures)
1005 >                assertSame(TEST_STRING, future.get());
1006 >        }
1007 >    }
1008 >
1009 >    /**
1010 >     * timed invokeAny(null) throws NPE
1011 >     */
1012 >    public void testTimedInvokeAny1() throws Exception {
1013 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1014 >        try (PoolCleaner cleaner = cleaner(e)) {
1015 >            try {
1016 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1017 >                shouldThrow();
1018 >            } catch (NullPointerException success) {}
1019 >        }
1020 >    }
1021 >
1022 >    /**
1023 >     * timed invokeAny(,,null) throws NPE
1024 >     */
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<>();
1029 >            l.add(new StringTask());
1030 >            try {
1031 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
1032 >                shouldThrow();
1033 >            } catch (NullPointerException success) {}
1034 >        }
1035 >    }
1036 >
1037 >    /**
1038 >     * timed invokeAny(empty collection) throws IAE
1039 >     */
1040 >    public void testTimedInvokeAny2() throws Exception {
1041 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1042 >        try (PoolCleaner cleaner = cleaner(e)) {
1043 >            try {
1044 >                e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1045 >                shouldThrow();
1046 >            } catch (IllegalArgumentException success) {}
1047 >        }
1048 >    }
1049 >
1050 >    /**
1051 >     * timed invokeAny(c) throws NPE if c has null elements
1052 >     */
1053 >    public void testTimedInvokeAny3() throws Exception {
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<>();
1058 >            l.add(latchAwaitingStringTask(latch));
1059 >            l.add(null);
1060 >            try {
1061 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1062 >                shouldThrow();
1063 >            } catch (NullPointerException success) {}
1064 >            latch.countDown();
1065 >        }
1066 >    }
1067 >
1068 >    /**
1069 >     * timed invokeAny(c) throws ExecutionException if no task completes
1070 >     */
1071 >    public void testTimedInvokeAny4() throws Exception {
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<>();
1076 >            l.add(new NPETask());
1077 >            try {
1078 >                e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1079 >                shouldThrow();
1080 >            } catch (ExecutionException success) {
1081 >                assertTrue(success.getCause() instanceof NullPointerException);
1082 >            }
1083 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1084 >        }
1085 >    }
1086 >
1087 >    /**
1088 >     * timed invokeAny(c) returns result of some task
1089 >     */
1090 >    public void testTimedInvokeAny5() throws Exception {
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<>();
1095 >            l.add(new StringTask());
1096 >            l.add(new StringTask());
1097 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1098 >            assertSame(TEST_STRING, result);
1099 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1100 >        }
1101 >    }
1102 >
1103 >    /**
1104 >     * timed invokeAll(null) throws NPE
1105 >     */
1106 >    public void testTimedInvokeAll1() throws Exception {
1107 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1108 >        try (PoolCleaner cleaner = cleaner(e)) {
1109 >            try {
1110 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1111 >                shouldThrow();
1112 >            } catch (NullPointerException success) {}
1113 >        }
1114 >    }
1115 >
1116 >    /**
1117 >     * timed invokeAll(,,null) throws NPE
1118 >     */
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<>();
1123 >            l.add(new StringTask());
1124 >            try {
1125 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
1126 >                shouldThrow();
1127 >            } catch (NullPointerException success) {}
1128 >        }
1129 >    }
1130 >
1131 >    /**
1132 >     * timed invokeAll(empty collection) returns empty collection
1133 >     */
1134 >    public void testTimedInvokeAll2() throws Exception {
1135 >        final ExecutorService e = new ScheduledThreadPoolExecutor(2);
1136 >        try (PoolCleaner cleaner = cleaner(e)) {
1137 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(),
1138 >                                                 MEDIUM_DELAY_MS, MILLISECONDS);
1139 >            assertTrue(r.isEmpty());
1140          }
1141 <        catch(Exception ex) {
1142 <            fail("unexpected exception");
1141 >    }
1142 >
1143 >    /**
1144 >     * timed invokeAll(c) throws NPE if c has null elements
1145 >     */
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<>();
1150 >            l.add(new StringTask());
1151 >            l.add(null);
1152 >            try {
1153 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1154 >                shouldThrow();
1155 >            } catch (NullPointerException success) {}
1156          }
1157 <        finally {
1158 <            one.shutdownNow();
1157 >    }
1158 >
1159 >    /**
1160 >     * get of element of invokeAll(c) throws exception on failed task
1161 >     */
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<>();
1166 >            l.add(new NPETask());
1167 >            List<Future<String>> futures =
1168 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1169 >            assertEquals(1, futures.size());
1170 >            try {
1171 >                futures.get(0).get();
1172 >                shouldThrow();
1173 >            } catch (ExecutionException success) {
1174 >                assertTrue(success.getCause() instanceof NullPointerException);
1175 >            }
1176 >        }
1177 >    }
1178 >
1179 >    /**
1180 >     * timed invokeAll(c) returns results of all completed tasks
1181 >     */
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<>();
1186 >            l.add(new StringTask());
1187 >            l.add(new StringTask());
1188 >            List<Future<String>> futures =
1189 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1190 >            assertEquals(2, futures.size());
1191 >            for (Future<String> future : futures)
1192 >                assertSame(TEST_STRING, future.get());
1193 >        }
1194 >    }
1195 >
1196 >    /**
1197 >     * timed invokeAll(c) cancels tasks not completed by timeout
1198 >     */
1199 >    public void testTimedInvokeAll6() throws Exception {
1200 >        for (long timeout = timeoutMillis();;) {
1201 >            final CountDownLatch done = new CountDownLatch(1);
1202 >            final Callable<String> waiter = new CheckedCallable<String>() {
1203 >                public String realCall() {
1204 >                    try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1205 >                    catch (InterruptedException ok) {}
1206 >                    return "1"; }};
1207 >            final ExecutorService p = new ScheduledThreadPoolExecutor(2);
1208 >            try (PoolCleaner cleaner = cleaner(p, done)) {
1209 >                List<Callable<String>> tasks = new ArrayList<>();
1210 >                tasks.add(new StringTask("0"));
1211 >                tasks.add(waiter);
1212 >                tasks.add(new StringTask("2"));
1213 >                long startTime = System.nanoTime();
1214 >                List<Future<String>> futures =
1215 >                    p.invokeAll(tasks, timeout, MILLISECONDS);
1216 >                assertEquals(tasks.size(), futures.size());
1217 >                assertTrue(millisElapsedSince(startTime) >= timeout);
1218 >                for (Future future : futures)
1219 >                    assertTrue(future.isDone());
1220 >                assertTrue(futures.get(1).isCancelled());
1221 >                try {
1222 >                    assertEquals("0", futures.get(0).get());
1223 >                    assertEquals("2", futures.get(2).get());
1224 >                    break;
1225 >                } catch (CancellationException retryWithLongerTimeout) {
1226 >                    timeout *= 2;
1227 >                    if (timeout >= LONG_DELAY_MS / 2)
1228 >                        fail("expected exactly one task to be cancelled");
1229 >                }
1230 >            }
1231 >        }
1232 >    }
1233 >
1234 >    /**
1235 >     * A fixed delay task with overflowing period should not prevent a
1236 >     * one-shot task from executing.
1237 >     * https://bugs.openjdk.java.net/browse/JDK-8051859
1238 >     */
1239 >    public void testScheduleWithFixedDelay_overflow() throws Exception {
1240 >        final CountDownLatch delayedDone = new CountDownLatch(1);
1241 >        final CountDownLatch immediateDone = new CountDownLatch(1);
1242 >        final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
1243 >        try (PoolCleaner cleaner = cleaner(p)) {
1244 >            final Runnable immediate = new Runnable() { public void run() {
1245 >                immediateDone.countDown();
1246 >            }};
1247 >            final Runnable delayed = new Runnable() { public void run() {
1248 >                delayedDone.countDown();
1249 >                p.submit(immediate);
1250 >            }};
1251 >            p.scheduleWithFixedDelay(delayed, 0L, Long.MAX_VALUE, SECONDS);
1252 >            await(delayedDone);
1253 >            await(immediateDone);
1254          }
1255      }
1256  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines