ViewVC Help

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

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

Comparing jsr166/src/test/tck/ArrayBlockingQueueTest.java (file contents):
Revision 1.3 by dl, Sun Sep 14 20:42:40 2003 UTC vs.
Revision 1.50 by jsr166, Fri Jul 15 18:49:31 2011 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.*;
12	<	import java.io.*;
10	>	import java.util.Arrays;
11	>	import java.util.ArrayList;
12	>	import java.util.Collection;
13	>	import java.util.Iterator;
14	>	import java.util.NoSuchElementException;
15	>	import java.util.Queue;
16	>	import java.util.concurrent.ArrayBlockingQueue;
17	>	import java.util.concurrent.BlockingQueue;
18	>	import java.util.concurrent.CountDownLatch;
19	>	import java.util.concurrent.Executors;
20	>	import java.util.concurrent.ExecutorService;
21	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
22
23		public class ArrayBlockingQueueTest extends JSR166TestCase {
24
25	+	public static class Fair extends BlockingQueueTest {
26	+	protected BlockingQueue emptyCollection() {
27	+	return new ArrayBlockingQueue(SIZE, true);
28	+	}
29	+	}
30	+
31	+	public static class NonFair extends BlockingQueueTest {
32	+	protected BlockingQueue emptyCollection() {
33	+	return new ArrayBlockingQueue(SIZE, false);
34	+	}
35	+	}
36	+
37		public static void main(String[] args) {
38	<	junit.textui.TestRunner.run (suite());
38	>	junit.textui.TestRunner.run(suite());
39		}
40
41		public static Test suite() {
42	<	return new TestSuite(ArrayBlockingQueueTest.class);
42	>	return newTestSuite(ArrayBlockingQueueTest.class,
43	>	new Fair().testSuite(),
44	>	new NonFair().testSuite());
45		}
46
47		/**
48		* Create a queue of given size containing consecutive
49		* Integers 0 ... n.
50		*/
51	<	private ArrayBlockingQueue populatedQueue(int n) {
52	<	ArrayBlockingQueue q = new ArrayBlockingQueue(n);
51	>	private ArrayBlockingQueue<Integer> populatedQueue(int n) {
52	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<Integer>(n);
53		assertTrue(q.isEmpty());
54	<	for(int i = 0; i < n; i++)
55	<	assertTrue(q.offer(new Integer(i)));
54	>	for (int i = 0; i < n; i++)
55	>	assertTrue(q.offer(new Integer(i)));
56		assertFalse(q.isEmpty());
57		assertEquals(0, q.remainingCapacity());
58	<	assertEquals(n, q.size());
58	>	assertEquals(n, q.size());
59		return q;
60		}
61	<
62	<	public void testConstructor1(){
61	>
62	>	/**
63	>	* A new queue has the indicated capacity
64	>	*/
65	>	public void testConstructor1() {
66		assertEquals(SIZE, new ArrayBlockingQueue(SIZE).remainingCapacity());
67		}
68
69	<	public void testConstructor2(){
69	>	/**
70	>	* Constructor throws IAE if capacity argument nonpositive
71	>	*/
72	>	public void testConstructor2() {
73		try {
74	<	ArrayBlockingQueue q = new ArrayBlockingQueue(0);
75	<	fail("Cannot make zero-sized");
76	<	}
47	<	catch (IllegalArgumentException success) {}
74	>	new ArrayBlockingQueue(0);
75	>	shouldThrow();
76	>	} catch (IllegalArgumentException success) {}
77		}
78
79	<	public void testConstructor3(){
80	<
79	>	/**
80	>	* Initializing from null Collection throws NPE
81	>	*/
82	>	public void testConstructor3() {
83		try {
84	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1, true, null);
85	<	fail("Cannot make from null collection");
86	<	}
56	<	catch (NullPointerException success) {}
84	>	new ArrayBlockingQueue(1, true, null);
85	>	shouldThrow();
86	>	} catch (NullPointerException success) {}
87		}
88
89	<	public void testConstructor4(){
89	>	/**
90	>	* Initializing from Collection of null elements throws NPE
91	>	*/
92	>	public void testConstructor4() {
93	>	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
94		try {
95	<	Integer[] ints = new Integer[SIZE];
96	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
97	<	fail("Cannot make with null elements");
64	<	}
65	<	catch (NullPointerException success) {}
95	>	new ArrayBlockingQueue(SIZE, false, elements);
96	>	shouldThrow();
97	>	} catch (NullPointerException success) {}
98		}
99
100	<	public void testConstructor5(){
101	<	try {
102	<	Integer[] ints = new Integer[SIZE];
103	<	for (int i = 0; i < SIZE-1; ++i)
104	<	ints[i] = new Integer(i);
105	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
106	<	fail("Cannot make with null elements");
107	<	}
108	<	catch (NullPointerException success) {}
100	>	/**
101	>	* Initializing from Collection with some null elements throws NPE
102	>	*/
103	>	public void testConstructor5() {
104	>	Integer[] ints = new Integer[SIZE];
105	>	for (int i = 0; i < SIZE-1; ++i)
106	>	ints[i] = i;
107	>	Collection<Integer> elements = Arrays.asList(ints);
108	>	try {
109	>	new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
110	>	shouldThrow();
111	>	} catch (NullPointerException success) {}
112		}
113
114	<	public void testConstructor6(){
115	<	try {
116	<	Integer[] ints = new Integer[SIZE];
117	<	for (int i = 0; i < SIZE; ++i)
118	<	ints[i] = new Integer(i);
119	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1, false, Arrays.asList(ints));
120	<	fail("Cannot make with insufficient capacity");
121	<	}
122	<	catch (IllegalArgumentException success) {}
114	>	/**
115	>	* Initializing from too large collection throws IAE
116	>	*/
117	>	public void testConstructor6() {
118	>	Integer[] ints = new Integer[SIZE];
119	>	for (int i = 0; i < SIZE; ++i)
120	>	ints[i] = i;
121	>	Collection<Integer> elements = Arrays.asList(ints);
122	>	try {
123	>	new ArrayBlockingQueue(SIZE - 1, false, elements);
124	>	shouldThrow();
125	>	} catch (IllegalArgumentException success) {}
126		}
127
128	<	public void testConstructor7(){
129	<	try {
130	<	Integer[] ints = new Integer[SIZE];
131	<	for (int i = 0; i < SIZE; ++i)
132	<	ints[i] = new Integer(i);
133	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, Arrays.asList(ints));
134	<	for (int i = 0; i < SIZE; ++i)
135	<	assertEquals(ints[i], q.poll());
136	<	}
137	<	finally {}
128	>	/**
129	>	* Queue contains all elements of collection used to initialize
130	>	*/
131	>	public void testConstructor7() {
132	>	Integer[] ints = new Integer[SIZE];
133	>	for (int i = 0; i < SIZE; ++i)
134	>	ints[i] = i;
135	>	Collection<Integer> elements = Arrays.asList(ints);
136	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, elements);
137	>	for (int i = 0; i < SIZE; ++i)
138	>	assertEquals(ints[i], q.poll());
139		}
140
141	+	/**
142	+	* Queue transitions from empty to full when elements added
143	+	*/
144		public void testEmptyFull() {
145		ArrayBlockingQueue q = new ArrayBlockingQueue(2);
146		assertTrue(q.isEmpty());
147	<	assertEquals("should have room for 2", 2, q.remainingCapacity());
147	>	assertEquals(2, q.remainingCapacity());
148		q.add(one);
149		assertFalse(q.isEmpty());
150		q.add(two);
151		assertFalse(q.isEmpty());
152	<	assertEquals("queue should be full", 0, q.remainingCapacity());
153	<	assertFalse("offer should be rejected", q.offer(three));
152	>	assertEquals(0, q.remainingCapacity());
153	>	assertFalse(q.offer(three));
154		}
155
156	<	public void testRemainingCapacity(){
156	>	/**
157	>	* remainingCapacity decreases on add, increases on remove
158	>	*/
159	>	public void testRemainingCapacity() {
160		ArrayBlockingQueue q = populatedQueue(SIZE);
161		for (int i = 0; i < SIZE; ++i) {
162		assertEquals(i, q.remainingCapacity());
#	Line 125 | Line 170 | public class ArrayBlockingQueueTest exte
170		}
171		}
172
173	<	public void testOfferNull(){
174	<	try {
175	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
176	<	q.offer(null);
132	<	fail("should throw NPE");
133	<	} catch (NullPointerException success) { }
134	<	}
135	<
136	<	public void testOffer(){
173	>	/**
174	>	* Offer succeeds if not full; fails if full
175	>	*/
176	>	public void testOffer() {
177		ArrayBlockingQueue q = new ArrayBlockingQueue(1);
178		assertTrue(q.offer(zero));
179		assertFalse(q.offer(one));
180		}
181
182	<	public void testAdd(){
183	<	try {
182	>	/**
183	>	* add succeeds if not full; throws ISE if full
184	>	*/
185	>	public void testAdd() {
186	>	try {
187		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
188		for (int i = 0; i < SIZE; ++i) {
189		assertTrue(q.add(new Integer(i)));
190		}
191		assertEquals(0, q.remainingCapacity());
192		q.add(new Integer(SIZE));
193	<	} catch (IllegalStateException success){
194	<	}
193	>	shouldThrow();
194	>	} catch (IllegalStateException success) {}
195		}
196
197	<	public void testAddAll1(){
198	<	try {
199	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
200	<	q.addAll(null);
158	<	fail("Cannot add null collection");
159	<	}
160	<	catch (NullPointerException success) {}
161	<	}
162	<	public void testAddAll2(){
197	>	/**
198	>	* addAll(this) throws IAE
199	>	*/
200	>	public void testAddAllSelf() {
201		try {
202	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
203	<	Integer[] ints = new Integer[SIZE];
204	<	q.addAll(Arrays.asList(ints));
205	<	fail("Cannot add null elements");
168	<	}
169	<	catch (NullPointerException success) {}
202	>	ArrayBlockingQueue q = populatedQueue(SIZE);
203	>	q.addAll(q);
204	>	shouldThrow();
205	>	} catch (IllegalArgumentException success) {}
206		}
207	<	public void testAddAll3(){
207	>
208	>	/**
209	>	* addAll of a collection with any null elements throws NPE after
210	>	* possibly adding some elements
211	>	*/
212	>	public void testAddAll3() {
213		try {
214		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
215		Integer[] ints = new Integer[SIZE];
216		for (int i = 0; i < SIZE-1; ++i)
217		ints[i] = new Integer(i);
218		q.addAll(Arrays.asList(ints));
219	<	fail("Cannot add null elements");
220	<	}
180	<	catch (NullPointerException success) {}
219	>	shouldThrow();
220	>	} catch (NullPointerException success) {}
221		}
222	<	public void testAddAll4(){
222	>
223	>	/**
224	>	* addAll throws ISE if not enough room
225	>	*/
226	>	public void testAddAll4() {
227		try {
228		ArrayBlockingQueue q = new ArrayBlockingQueue(1);
229		Integer[] ints = new Integer[SIZE];
230		for (int i = 0; i < SIZE; ++i)
231		ints[i] = new Integer(i);
232		q.addAll(Arrays.asList(ints));
233	<	fail("Cannot add with insufficient capacity");
234	<	}
191	<	catch (IllegalStateException success) {}
192	<	}
193	<	public void testAddAll5(){
194	<	try {
195	<	Integer[] empty = new Integer[0];
196	<	Integer[] ints = new Integer[SIZE];
197	<	for (int i = 0; i < SIZE; ++i)
198	<	ints[i] = new Integer(i);
199	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
200	<	assertFalse(q.addAll(Arrays.asList(empty)));
201	<	assertTrue(q.addAll(Arrays.asList(ints)));
202	<	for (int i = 0; i < SIZE; ++i)
203	<	assertEquals(ints[i], q.poll());
204	<	}
205	<	finally {}
233	>	shouldThrow();
234	>	} catch (IllegalStateException success) {}
235		}
236
237	<	public void testPutNull() {
238	<	try {
239	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
240	<	q.put(null);
241	<	fail("put should throw NPE");
242	<	}
243	<	catch (NullPointerException success){
244	<	}
245	<	catch (InterruptedException ie) {
246	<	fail("Unexpected exception");
247	<	}
248	<	}
249	<
221	<	public void testPut() {
222	<	try {
223	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
224	<	for (int i = 0; i < SIZE; ++i) {
225	<	Integer I = new Integer(i);
226	<	q.put(I);
227	<	assertTrue(q.contains(I));
228	<	}
229	<	assertEquals(0, q.remainingCapacity());
230	<	}
231	<	catch (InterruptedException ie) {
232	<	fail("Unexpected exception");
233	<	}
237	>	/**
238	>	* Queue contains all elements, in traversal order, of successful addAll
239	>	*/
240	>	public void testAddAll5() {
241	>	Integer[] empty = new Integer[0];
242	>	Integer[] ints = new Integer[SIZE];
243	>	for (int i = 0; i < SIZE; ++i)
244	>	ints[i] = new Integer(i);
245	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
246	>	assertFalse(q.addAll(Arrays.asList(empty)));
247	>	assertTrue(q.addAll(Arrays.asList(ints)));
248	>	for (int i = 0; i < SIZE; ++i)
249	>	assertEquals(ints[i], q.poll());
250		}
251
252	<	public void testBlockingPut(){
253	<	Thread t = new Thread(new Runnable() {
254	<	public void run() {
255	<	int added = 0;
256	<	try {
257	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
258	<	for (int i = 0; i < SIZE; ++i) {
259	<	q.put(new Integer(i));
260	<	++added;
245	<	}
246	<	q.put(new Integer(SIZE));
247	<	threadFail("put should block");
248	<	} catch (InterruptedException ie){
249	<	threadAssertEquals(added, SIZE);
250	<	}
251	<	}});
252	<	try {
253	<	t.start();
254	<	Thread.sleep(SHORT_DELAY_MS);
255	<	t.interrupt();
256	<	t.join();
257	<	}
258	<	catch (InterruptedException ie) {
259	<	fail("Unexpected exception");
252	>	/**
253	>	* all elements successfully put are contained
254	>	*/
255	>	public void testPut() throws InterruptedException {
256	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
257	>	for (int i = 0; i < SIZE; ++i) {
258	>	Integer I = new Integer(i);
259	>	q.put(I);
260	>	assertTrue(q.contains(I));
261		}
262	+	assertEquals(0, q.remainingCapacity());
263		}
264
265	<	public void testPutWithTake() {
266	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
267	<	Thread t = new Thread(new Runnable() {
268	<	public void run(){
269	<	int added = 0;
270	<	try {
271	<	q.put(new Object());
272	<	++added;
273	<	q.put(new Object());
274	<	++added;
275	<	q.put(new Object());
276	<	++added;
275	<	q.put(new Object());
276	<	++added;
277	<	threadFail("Should block");
278	<	} catch (InterruptedException e){
279	<	threadAssertTrue(added >= 2);
280	<	}
281	<	}
282	<	});
283	<	try {
284	<	t.start();
285	<	Thread.sleep(SHORT_DELAY_MS);
286	<	q.take();
287	<	t.interrupt();
288	<	t.join();
289	<	} catch (Exception e){
290	<	fail("Unexpected exception");
291	<	}
292	<	}
265	>	/**
266	>	* put blocks interruptibly if full
267	>	*/
268	>	public void testBlockingPut() throws InterruptedException {
269	>	final ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
270	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
271	>	Thread t = newStartedThread(new CheckedRunnable() {
272	>	public void realRun() throws InterruptedException {
273	>	for (int i = 0; i < SIZE; ++i)
274	>	q.put(i);
275	>	assertEquals(SIZE, q.size());
276	>	assertEquals(0, q.remainingCapacity());
277
278	<	public void testTimedOffer() {
279	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
280	<	Thread t = new Thread(new Runnable() {
281	<	public void run(){
282	<	try {
283	<	q.put(new Object());
284	<	q.put(new Object());
285	<	threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, TimeUnit.MILLISECONDS));
286	<	q.offer(new Object(), LONG_DELAY_MS, TimeUnit.MILLISECONDS);
287	<	threadFail("Should block");
288	<	} catch (InterruptedException success){}
289	<	}
290	<	});
291	<
292	<	try {
293	<	t.start();
294	<	Thread.sleep(SHORT_DELAY_MS);
295	<	t.interrupt();
296	<	t.join();
297	<	} catch (Exception e){
298	<	fail("Unexpected exception");
315	<	}
278	>	Thread.currentThread().interrupt();
279	>	try {
280	>	q.put(99);
281	>	shouldThrow();
282	>	} catch (InterruptedException success) {}
283	>	assertFalse(Thread.interrupted());
284	>
285	>	pleaseInterrupt.countDown();
286	>	try {
287	>	q.put(99);
288	>	shouldThrow();
289	>	} catch (InterruptedException success) {}
290	>	assertFalse(Thread.interrupted());
291	>	}});
292	>
293	>	await(pleaseInterrupt);
294	>	assertThreadStaysAlive(t);
295	>	t.interrupt();
296	>	awaitTermination(t);
297	>	assertEquals(SIZE, q.size());
298	>	assertEquals(0, q.remainingCapacity());
299		}
300
301	<	public void testTake(){
302	<	try {
303	<	ArrayBlockingQueue q = populatedQueue(SIZE);
304	<	for (int i = 0; i < SIZE; ++i) {
305	<	assertEquals(i, ((Integer)q.take()).intValue());
306	<	}
307	<	} catch (InterruptedException e){
308	<	fail("Unexpected exception");
309	<	}
301	>	/**
302	>	* put blocks interruptibly waiting for take when full
303	>	*/
304	>	public void testPutWithTake() throws InterruptedException {
305	>	final int capacity = 2;
306	>	final ArrayBlockingQueue q = new ArrayBlockingQueue(capacity);
307	>	final CountDownLatch pleaseTake = new CountDownLatch(1);
308	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
309	>	Thread t = newStartedThread(new CheckedRunnable() {
310	>	public void realRun() throws InterruptedException {
311	>	for (int i = 0; i < capacity; i++)
312	>	q.put(i);
313	>	pleaseTake.countDown();
314	>	q.put(86);
315	>
316	>	pleaseInterrupt.countDown();
317	>	try {
318	>	q.put(99);
319	>	shouldThrow();
320	>	} catch (InterruptedException success) {}
321	>	assertFalse(Thread.interrupted());
322	>	}});
323	>
324	>	await(pleaseTake);
325	>	assertEquals(q.remainingCapacity(), 0);
326	>	assertEquals(0, q.take());
327	>
328	>	await(pleaseInterrupt);
329	>	assertThreadStaysAlive(t);
330	>	t.interrupt();
331	>	awaitTermination(t);
332	>	assertEquals(q.remainingCapacity(), 0);
333		}
334
335	<	public void testTakeFromEmpty() {
335	>	/**
336	>	* timed offer times out if full and elements not taken
337	>	*/
338	>	public void testTimedOffer() throws InterruptedException {
339		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
340	<	Thread t = new Thread(new Runnable() {
341	<	public void run(){
342	<	try {
343	<	q.take();
344	<	threadFail("Should block");
345	<	} catch (InterruptedException success){ }
346	<	}
347	<	});
348	<	try {
349	<	t.start();
350	<	Thread.sleep(SHORT_DELAY_MS);
351	<	t.interrupt();
352	<	t.join();
353	<	} catch (Exception e){
354	<	fail("Unexpected exception");
355	<	}
340	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
341	>	Thread t = newStartedThread(new CheckedRunnable() {
342	>	public void realRun() throws InterruptedException {
343	>	q.put(new Object());
344	>	q.put(new Object());
345	>	long startTime = System.nanoTime();
346	>	assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
347	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
348	>	pleaseInterrupt.countDown();
349	>	try {
350	>	q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
351	>	shouldThrow();
352	>	} catch (InterruptedException success) {}
353	>	}});
354	>
355	>	await(pleaseInterrupt);
356	>	assertThreadStaysAlive(t);
357	>	t.interrupt();
358	>	awaitTermination(t);
359		}
360
361	<	public void testBlockingTake(){
362	<	Thread t = new Thread(new Runnable() {
363	<	public void run() {
364	<	try {
365	<	ArrayBlockingQueue q = populatedQueue(SIZE);
366	<	for (int i = 0; i < SIZE; ++i) {
367	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
356	<	}
357	<	q.take();
358	<	threadFail("take should block");
359	<	} catch (InterruptedException success){
360	<	}
361	<	}});
362	<	try {
363	<	t.start();
364	<	Thread.sleep(SHORT_DELAY_MS);
365	<	t.interrupt();
366	<	t.join();
367	<	}
368	<	catch (InterruptedException ie) {
369	<	fail("Unexpected exception");
361	>	/**
362	>	* take retrieves elements in FIFO order
363	>	*/
364	>	public void testTake() throws InterruptedException {
365	>	ArrayBlockingQueue q = populatedQueue(SIZE);
366	>	for (int i = 0; i < SIZE; ++i) {
367	>	assertEquals(i, q.take());
368		}
369		}
370
371	+	/**
372	+	* Take removes existing elements until empty, then blocks interruptibly
373	+	*/
374	+	public void testBlockingTake() throws InterruptedException {
375	+	final ArrayBlockingQueue q = populatedQueue(SIZE);
376	+	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
377	+	Thread t = newStartedThread(new CheckedRunnable() {
378	+	public void realRun() throws InterruptedException {
379	+	for (int i = 0; i < SIZE; ++i) {
380	+	assertEquals(i, q.take());
381	+	}
382	+
383	+	Thread.currentThread().interrupt();
384	+	try {
385	+	q.take();
386	+	shouldThrow();
387	+	} catch (InterruptedException success) {}
388	+	assertFalse(Thread.interrupted());
389
390	<	public void testPoll(){
390	>	pleaseInterrupt.countDown();
391	>	try {
392	>	q.take();
393	>	shouldThrow();
394	>	} catch (InterruptedException success) {}
395	>	assertFalse(Thread.interrupted());
396	>	}});
397	>
398	>	await(pleaseInterrupt);
399	>	assertThreadStaysAlive(t);
400	>	t.interrupt();
401	>	awaitTermination(t);
402	>	}
403	>
404	>	/**
405	>	* poll succeeds unless empty
406	>	*/
407	>	public void testPoll() {
408		ArrayBlockingQueue q = populatedQueue(SIZE);
409		for (int i = 0; i < SIZE; ++i) {
410	<	assertEquals(i, ((Integer)q.poll()).intValue());
410	>	assertEquals(i, q.poll());
411		}
412	<	assertNull(q.poll());
412	>	assertNull(q.poll());
413		}
414
415	<	public void testTimedPoll0() {
416	<	try {
417	<	ArrayBlockingQueue q = populatedQueue(SIZE);
418	<	for (int i = 0; i < SIZE; ++i) {
419	<	assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
420	<	}
421	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
422	<	} catch (InterruptedException e){
423	<	fail("Unexpected exception");
424	<	}
415	>	/**
416	>	* timed poll with zero timeout succeeds when non-empty, else times out
417	>	*/
418	>	public void testTimedPoll0() throws InterruptedException {
419	>	ArrayBlockingQueue q = populatedQueue(SIZE);
420	>	for (int i = 0; i < SIZE; ++i) {
421	>	assertEquals(i, q.poll(0, MILLISECONDS));
422	>	}
423	>	assertNull(q.poll(0, MILLISECONDS));
424	>	checkEmpty(q);
425		}
426
427	<	public void testTimedPoll() {
428	<	try {
429	<	ArrayBlockingQueue q = populatedQueue(SIZE);
430	<	for (int i = 0; i < SIZE; ++i) {
431	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
432	<	}
433	<	assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
434	<	} catch (InterruptedException e){
435	<	fail("Unexpected exception");
436	<	}
437	<	}
438	<
439	<	public void testInterruptedTimedPoll(){
440	<	Thread t = new Thread(new Runnable() {
408	<	public void run() {
409	<	try {
410	<	ArrayBlockingQueue q = populatedQueue(SIZE);
411	<	for (int i = 0; i < SIZE; ++i) {
412	<	threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
413	<	}
414	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
415	<	} catch (InterruptedException success){
416	<	}
417	<	}});
418	<	try {
419	<	t.start();
420	<	Thread.sleep(SHORT_DELAY_MS);
421	<	t.interrupt();
422	<	t.join();
423	<	}
424	<	catch (InterruptedException ie) {
425	<	fail("Unexpected exception");
426	<	}
427	>	/**
428	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
429	>	*/
430	>	public void testTimedPoll() throws InterruptedException {
431	>	ArrayBlockingQueue q = populatedQueue(SIZE);
432	>	for (int i = 0; i < SIZE; ++i) {
433	>	long startTime = System.nanoTime();
434	>	assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
435	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
436	>	}
437	>	long startTime = System.nanoTime();
438	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
439	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
440	>	checkEmpty(q);
441		}
442
443	<	public void testTimedPollWithOffer(){
444	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
445	<	Thread t = new Thread(new Runnable() {
446	<	public void run(){
447	<	try {
448	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
449	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
450	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
451	<	threadFail("Should block");
452	<	} catch (InterruptedException success) { }
443	>	/**
444	>	* Interrupted timed poll throws InterruptedException instead of
445	>	* returning timeout status
446	>	*/
447	>	public void testInterruptedTimedPoll() throws InterruptedException {
448	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
449	>	final CountDownLatch aboutToWait = new CountDownLatch(1);
450	>	Thread t = newStartedThread(new CheckedRunnable() {
451	>	public void realRun() throws InterruptedException {
452	>	for (int i = 0; i < SIZE; ++i) {
453	>	long t0 = System.nanoTime();
454	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
455	>	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
456		}
457	<	});
458	<	try {
459	<	t.start();
460	<	Thread.sleep(SMALL_DELAY_MS);
461	<	assertTrue(q.offer(zero, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
462	<	t.interrupt();
463	<	t.join();
464	<	} catch (Exception e){
465	<	fail("Unexpected exception");
466	<	}
467	<	}
468	<
457	>	long t0 = System.nanoTime();
458	>	aboutToWait.countDown();
459	>	try {
460	>	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
461	>	shouldThrow();
462	>	} catch (InterruptedException success) {
463	>	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
464	>	}
465	>	}});
466	>
467	>	aboutToWait.await();
468	>	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
469	>	t.interrupt();
470	>	awaitTermination(t, MEDIUM_DELAY_MS);
471	>	checkEmpty(q);
472	>	}
473
474	<	public void testPeek(){
474	>	/**
475	>	* peek returns next element, or null if empty
476	>	*/
477	>	public void testPeek() {
478		ArrayBlockingQueue q = populatedQueue(SIZE);
479		for (int i = 0; i < SIZE; ++i) {
480	<	assertEquals(i, ((Integer)q.peek()).intValue());
481	<	q.poll();
480	>	assertEquals(i, q.peek());
481	>	assertEquals(i, q.poll());
482		assertTrue(q.peek() == null ||
483	<	i != ((Integer)q.peek()).intValue());
483	>	!q.peek().equals(i));
484		}
485	<	assertNull(q.peek());
485	>	assertNull(q.peek());
486		}
487
488	<	public void testElement(){
488	>	/**
489	>	* element returns next element, or throws NSEE if empty
490	>	*/
491	>	public void testElement() {
492		ArrayBlockingQueue q = populatedQueue(SIZE);
493		for (int i = 0; i < SIZE; ++i) {
494	<	assertEquals(i, ((Integer)q.element()).intValue());
495	<	q.poll();
494	>	assertEquals(i, q.element());
495	>	assertEquals(i, q.poll());
496		}
497		try {
498		q.element();
499	<	fail("no such element");
500	<	}
474	<	catch (NoSuchElementException success) {}
499	>	shouldThrow();
500	>	} catch (NoSuchElementException success) {}
501		}
502
503	<	public void testRemove(){
503	>	/**
504	>	* remove removes next element, or throws NSEE if empty
505	>	*/
506	>	public void testRemove() {
507		ArrayBlockingQueue q = populatedQueue(SIZE);
508		for (int i = 0; i < SIZE; ++i) {
509	<	assertEquals(i, ((Integer)q.remove()).intValue());
509	>	assertEquals(i, q.remove());
510		}
511		try {
512		q.remove();
513	<	fail("remove should throw");
514	<	} catch (NoSuchElementException success){
486	<	}
513	>	shouldThrow();
514	>	} catch (NoSuchElementException success) {}
515		}
516
517	<	public void testRemoveElement(){
518	<	ArrayBlockingQueue q = populatedQueue(SIZE);
519	<	for (int i = 1; i < SIZE; i+=2) {
520	<	assertTrue(q.remove(new Integer(i)));
493	<	}
494	<	for (int i = 0; i < SIZE; i+=2) {
495	<	assertTrue(q.remove(new Integer(i)));
496	<	assertFalse(q.remove(new Integer(i+1)));
497	<	}
498	<	assertTrue(q.isEmpty());
499	<	}
500	<
501	<	public void testContains(){
517	>	/**
518	>	* contains(x) reports true when elements added but not yet removed
519	>	*/
520	>	public void testContains() {
521		ArrayBlockingQueue q = populatedQueue(SIZE);
522		for (int i = 0; i < SIZE; ++i) {
523		assertTrue(q.contains(new Integer(i)));
524	<	q.poll();
524	>	assertEquals(i, q.poll());
525		assertFalse(q.contains(new Integer(i)));
526		}
527		}
528
529	<	public void testClear(){
529	>	/**
530	>	* clear removes all elements
531	>	*/
532	>	public void testClear() {
533		ArrayBlockingQueue q = populatedQueue(SIZE);
534		q.clear();
535		assertTrue(q.isEmpty());
#	Line 515 | Line 537 | public class ArrayBlockingQueueTest exte
537		assertEquals(SIZE, q.remainingCapacity());
538		q.add(one);
539		assertFalse(q.isEmpty());
540	+	assertTrue(q.contains(one));
541		q.clear();
542		assertTrue(q.isEmpty());
543		}
544
545	<	public void testContainsAll(){
545	>	/**
546	>	* containsAll(c) is true when c contains a subset of elements
547	>	*/
548	>	public void testContainsAll() {
549		ArrayBlockingQueue q = populatedQueue(SIZE);
550		ArrayBlockingQueue p = new ArrayBlockingQueue(SIZE);
551		for (int i = 0; i < SIZE; ++i) {
#	Line 530 | Line 556 | public class ArrayBlockingQueueTest exte
556		assertTrue(p.containsAll(q));
557		}
558
559	<	public void testRetainAll(){
559	>	/**
560	>	* retainAll(c) retains only those elements of c and reports true if changed
561	>	*/
562	>	public void testRetainAll() {
563		ArrayBlockingQueue q = populatedQueue(SIZE);
564		ArrayBlockingQueue p = populatedQueue(SIZE);
565		for (int i = 0; i < SIZE; ++i) {
#	Line 546 | Line 575 | public class ArrayBlockingQueueTest exte
575		}
576		}
577
578	<	public void testRemoveAll(){
578	>	/**
579	>	* removeAll(c) removes only those elements of c and reports true if changed
580	>	*/
581	>	public void testRemoveAll() {
582		for (int i = 1; i < SIZE; ++i) {
583		ArrayBlockingQueue q = populatedQueue(SIZE);
584		ArrayBlockingQueue p = populatedQueue(i);
#	Line 559 | Line 591 | public class ArrayBlockingQueueTest exte
591		}
592		}
593
594	+	/**
595	+	* toArray contains all elements in FIFO order
596	+	*/
597	+	public void testToArray() {
598	+	ArrayBlockingQueue q = populatedQueue(SIZE);
599	+	Object[] o = q.toArray();
600	+	for (int i = 0; i < o.length; i++)
601	+	assertSame(o[i], q.poll());
602	+	}
603	+
604	+	/**
605	+	* toArray(a) contains all elements in FIFO order
606	+	*/
607	+	public void testToArray2() {
608	+	ArrayBlockingQueue<Integer> q = populatedQueue(SIZE);
609	+	Integer[] ints = new Integer[SIZE];
610	+	Integer[] array = q.toArray(ints);
611	+	assertSame(ints, array);
612	+	for (int i = 0; i < ints.length; i++)
613	+	assertSame(ints[i], q.poll());
614	+	}
615
616	<	public void testToArray(){
616	>	/**
617	>	* toArray(incompatible array type) throws ArrayStoreException
618	>	*/
619	>	public void testToArray1_BadArg() {
620		ArrayBlockingQueue q = populatedQueue(SIZE);
621	<	Object[] o = q.toArray();
622	<	try {
623	<	for(int i = 0; i < o.length; i++)
624	<	assertEquals(o[i], q.take());
569	<	} catch (InterruptedException e){
570	<	fail("Unexpected exception");
571	<	}
572	<	}
573	<
574	<	public void testToArray2(){
575	<	ArrayBlockingQueue q = populatedQueue(SIZE);
576	<	Integer[] ints = new Integer[SIZE];
577	<	ints = (Integer[])q.toArray(ints);
578	<	try {
579	<	for(int i = 0; i < ints.length; i++)
580	<	assertEquals(ints[i], q.take());
581	<	} catch (InterruptedException e){
582	<	fail("Unexpected exception");
583	<	}
584	<	}
585	<
586	<	public void testIterator(){
587	<	ArrayBlockingQueue q = populatedQueue(SIZE);
588	<	Iterator it = q.iterator();
589	<	try {
590	<	while(it.hasNext()){
591	<	assertEquals(it.next(), q.take());
592	<	}
593	<	} catch (InterruptedException e){
594	<	fail("Unexpected exception");
595	<	}
621	>	try {
622	>	q.toArray(new String[10]);
623	>	shouldThrow();
624	>	} catch (ArrayStoreException success) {}
625		}
626
627	<	public void testIteratorOrdering() {
627	>	/**
628	>	* iterator iterates through all elements
629	>	*/
630	>	public void testIterator() throws InterruptedException {
631	>	ArrayBlockingQueue q = populatedQueue(SIZE);
632	>	Iterator it = q.iterator();
633	>	while (it.hasNext()) {
634	>	assertEquals(it.next(), q.take());
635	>	}
636	>	}
637
638	+	/**
639	+	* iterator.remove removes current element
640	+	*/
641	+	public void testIteratorRemove() {
642		final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
643	+	q.add(two);
644	+	q.add(one);
645	+	q.add(three);
646
647	+	Iterator it = q.iterator();
648	+	it.next();
649	+	it.remove();
650	+
651	+	it = q.iterator();
652	+	assertSame(it.next(), one);
653	+	assertSame(it.next(), three);
654	+	assertFalse(it.hasNext());
655	+	}
656	+
657	+	/**
658	+	* iterator ordering is FIFO
659	+	*/
660	+	public void testIteratorOrdering() {
661	+	final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
662		q.add(one);
663		q.add(two);
664		q.add(three);
#	Line 607 | Line 667 | public class ArrayBlockingQueueTest exte
667
668		int k = 0;
669		for (Iterator it = q.iterator(); it.hasNext();) {
670	<	int i = ((Integer)(it.next())).intValue();
611	<	assertEquals("items should come out in order", ++k, i);
670	>	assertEquals(++k, it.next());
671		}
672	<
614	<	assertEquals("should go through 3 elements", 3, k);
672	>	assertEquals(3, k);
673		}
674
675	<	public void testWeaklyConsistentIteration () {
676	<
675	>	/**
676	>	* Modifications do not cause iterators to fail
677	>	*/
678	>	public void testWeaklyConsistentIteration() {
679		final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
620	–
680		q.add(one);
681		q.add(two);
682		q.add(three);
683	<
684	<	try {
685	<	for (Iterator it = q.iterator(); it.hasNext();) {
627	<	q.remove();
628	<	it.next();
629	<	}
630	<	}
631	<	catch (ConcurrentModificationException e) {
632	<	fail("weakly consistent iterator; should not get CME");
683	>	for (Iterator it = q.iterator(); it.hasNext();) {
684	>	q.remove();
685	>	it.next();
686		}
687	<
635	<	assertEquals("queue should be empty again", 0, q.size());
687	>	assertEquals(0, q.size());
688		}
689
690	<
691	<	public void testToString(){
690	>	/**
691	>	* toString contains toStrings of elements
692	>	*/
693	>	public void testToString() {
694		ArrayBlockingQueue q = populatedQueue(SIZE);
695		String s = q.toString();
696		for (int i = 0; i < SIZE; ++i) {
697	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
697	>	assertTrue(s.contains(String.valueOf(i)));
698		}
699	<	}
646	<
699	>	}
700
701	+	/**
702	+	* offer transfers elements across Executor tasks
703	+	*/
704		public void testOfferInExecutor() {
649	–
705		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
651	–
706		q.add(one);
707		q.add(two);
654	–
708		ExecutorService executor = Executors.newFixedThreadPool(2);
709	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
710	+	executor.execute(new CheckedRunnable() {
711	+	public void realRun() throws InterruptedException {
712	+	assertFalse(q.offer(three));
713	+	threadsStarted.await();
714	+	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
715	+	assertEquals(0, q.remainingCapacity());
716	+	}});
717	+
718	+	executor.execute(new CheckedRunnable() {
719	+	public void realRun() throws InterruptedException {
720	+	threadsStarted.await();
721	+	assertEquals(0, q.remainingCapacity());
722	+	assertSame(one, q.take());
723	+	}});
724
657	–	executor.execute(new Runnable() {
658	–	public void run() {
659	–	threadAssertFalse(q.offer(three));
660	–	try {
661	–	threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
662	–	threadAssertEquals(0, q.remainingCapacity());
663	–	}
664	–	catch (InterruptedException e) {
665	–	threadFail("should not be interrupted");
666	–	}
667	–	}
668	–	});
669	–
670	–	executor.execute(new Runnable() {
671	–	public void run() {
672	–	try {
673	–	Thread.sleep(SMALL_DELAY_MS);
674	–	threadAssertEquals(one, q.take());
675	–	}
676	–	catch (InterruptedException e) {
677	–	threadFail("should not be interrupted");
678	–	}
679	–	}
680	–	});
681	–
725		joinPool(executor);
683	–
726		}
727
728	+	/**
729	+	* timed poll retrieves elements across Executor threads
730	+	*/
731		public void testPollInExecutor() {
687	–
732		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
733	<
733	>	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
734		ExecutorService executor = Executors.newFixedThreadPool(2);
735	+	executor.execute(new CheckedRunnable() {
736	+	public void realRun() throws InterruptedException {
737	+	assertNull(q.poll());
738	+	threadsStarted.await();
739	+	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
740	+	checkEmpty(q);
741	+	}});
742	+
743	+	executor.execute(new CheckedRunnable() {
744	+	public void realRun() throws InterruptedException {
745	+	threadsStarted.await();
746	+	q.put(one);
747	+	}});
748
692	–	executor.execute(new Runnable() {
693	–	public void run() {
694	–	threadAssertNull(q.poll());
695	–	try {
696	–	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
697	–	threadAssertTrue(q.isEmpty());
698	–	}
699	–	catch (InterruptedException e) {
700	–	threadFail("should not be interrupted");
701	–	}
702	–	}
703	–	});
704	–
705	–	executor.execute(new Runnable() {
706	–	public void run() {
707	–	try {
708	–	Thread.sleep(SMALL_DELAY_MS);
709	–	q.put(one);
710	–	}
711	–	catch (InterruptedException e) {
712	–	threadFail("should not be interrupted");
713	–	}
714	–	}
715	–	});
716	–
749		joinPool(executor);
750	+	}
751
752	+	/**
753	+	* A deserialized serialized queue has same elements in same order
754	+	*/
755	+	public void testSerialization() throws Exception {
756	+	Queue x = populatedQueue(SIZE);
757	+	Queue y = serialClone(x);
758	+
759	+	assertTrue(x != y);
760	+	assertEquals(x.size(), y.size());
761	+	assertEquals(x.toString(), y.toString());
762	+	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
763	+	while (!x.isEmpty()) {
764	+	assertFalse(y.isEmpty());
765	+	assertEquals(x.remove(), y.remove());
766	+	}
767	+	assertTrue(y.isEmpty());
768		}
769
770	<	public void testSerialization() {
770	>	/**
771	>	* drainTo(c) empties queue into another collection c
772	>	*/
773	>	public void testDrainTo() {
774		ArrayBlockingQueue q = populatedQueue(SIZE);
775	+	ArrayList l = new ArrayList();
776	+	q.drainTo(l);
777	+	assertEquals(q.size(), 0);
778	+	assertEquals(l.size(), SIZE);
779	+	for (int i = 0; i < SIZE; ++i)
780	+	assertEquals(l.get(i), new Integer(i));
781	+	q.add(zero);
782	+	q.add(one);
783	+	assertFalse(q.isEmpty());
784	+	assertTrue(q.contains(zero));
785	+	assertTrue(q.contains(one));
786	+	l.clear();
787	+	q.drainTo(l);
788	+	assertEquals(q.size(), 0);
789	+	assertEquals(l.size(), 2);
790	+	for (int i = 0; i < 2; ++i)
791	+	assertEquals(l.get(i), new Integer(i));
792	+	}
793
794	<	try {
795	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
796	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
797	<	out.writeObject(q);
798	<	out.close();
799	<
800	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
801	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
802	<	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
803	<	assertEquals(q.size(), r.size());
804	<	while (!q.isEmpty())
805	<	assertEquals(q.remove(), r.remove());
806	<	} catch(Exception e){
807	<	fail("unexpected exception");
808	<	}
794	>	/**
795	>	* drainTo empties full queue, unblocking a waiting put.
796	>	*/
797	>	public void testDrainToWithActivePut() throws InterruptedException {
798	>	final ArrayBlockingQueue q = populatedQueue(SIZE);
799	>	Thread t = new Thread(new CheckedRunnable() {
800	>	public void realRun() throws InterruptedException {
801	>	q.put(new Integer(SIZE+1));
802	>	}});
803	>
804	>	t.start();
805	>	ArrayList l = new ArrayList();
806	>	q.drainTo(l);
807	>	assertTrue(l.size() >= SIZE);
808	>	for (int i = 0; i < SIZE; ++i)
809	>	assertEquals(l.get(i), new Integer(i));
810	>	t.join();
811	>	assertTrue(q.size() + l.size() >= SIZE);
812		}
813
814	+	/**
815	+	* drainTo(c, n) empties first min(n, size) elements of queue into c
816	+	*/
817	+	public void testDrainToN() {
818	+	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
819	+	for (int i = 0; i < SIZE + 2; ++i) {
820	+	for (int j = 0; j < SIZE; j++)
821	+	assertTrue(q.offer(new Integer(j)));
822	+	ArrayList l = new ArrayList();
823	+	q.drainTo(l, i);
824	+	int k = (i < SIZE) ? i : SIZE;
825	+	assertEquals(l.size(), k);
826	+	assertEquals(q.size(), SIZE-k);
827	+	for (int j = 0; j < k; ++j)
828	+	assertEquals(l.get(j), new Integer(j));
829	+	while (q.poll() != null) ;
830	+	}
831	+	}
832
833		}

Diff Legend

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