ViewVC Help

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

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

Comparing jsr166/src/test/tck/DelayQueueTest.java (file contents):
Revision 1.41 by jsr166, Thu Oct 28 22:20:47 2010 UTC vs.
Revision 1.64 by jsr166, Wed Dec 31 19:05:42 2014 UTC

#	Line 1 | Line 1
1		/*
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/licenses/publicdomain
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.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	<	import java.util.concurrent.*;
10	>
11	>	import java.util.ArrayList;
12	>	import java.util.Arrays;
13	>	import java.util.Collection;
14	>	import java.util.Iterator;
15	>	import java.util.NoSuchElementException;
16	>	import java.util.concurrent.BlockingQueue;
17	>	import java.util.concurrent.CountDownLatch;
18	>	import java.util.concurrent.Delayed;
19	>	import java.util.concurrent.DelayQueue;
20	>	import java.util.concurrent.Executors;
21	>	import java.util.concurrent.ExecutorService;
22	>	import java.util.concurrent.TimeUnit;
23	>
24	>	import junit.framework.Test;
25
26		public class DelayQueueTest extends JSR166TestCase {
27	+
28	+	public static class Generic extends BlockingQueueTest {
29	+	protected BlockingQueue emptyCollection() {
30	+	return new DelayQueue();
31	+	}
32	+	protected PDelay makeElement(int i) {
33	+	return new PDelay(i);
34	+	}
35	+	}
36	+
37		public static void main(String[] args) {
38		junit.textui.TestRunner.run(suite());
39		}
40
41		public static Test suite() {
42	<	return new TestSuite(DelayQueueTest.class);
42	>	return newTestSuite(DelayQueueTest.class,
43	>	new Generic().testSuite());
44		}
45
46		private static final int NOCAP = Integer.MAX_VALUE;
#	Line 29 | Line 52 | public class DelayQueueTest extends JSR1
52		*/
53		static class PDelay implements Delayed {
54		int pseudodelay;
55	<	PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
56	<	public int compareTo(PDelay y) {
57	<	int i = pseudodelay;
58	<	int j = y.pseudodelay;
59	<	if (i < j) return -1;
37	<	if (i > j) return 1;
38	<	return 0;
55	>	PDelay(int i) { pseudodelay = i; }
56	>	public int compareTo(PDelay other) {
57	>	int a = this.pseudodelay;
58	>	int b = other.pseudodelay;
59	>	return (a < b) ? -1 : (a > b) ? 1 : 0;
60		}
40	–
61		public int compareTo(Delayed y) {
62		return compareTo((PDelay)y);
63		}
44	–
64		public boolean equals(Object other) {
65	<	return equals((PDelay)other);
65	>	return (other instanceof PDelay) &&
66	>	this.pseudodelay == ((PDelay)other).pseudodelay;
67		}
68	<	public boolean equals(PDelay other) {
69	<	return other.pseudodelay == pseudodelay;
50	<	}
51	<
52	<
68	>	// suppress [overrides] javac warning
69	>	public int hashCode() { return pseudodelay; }
70		public long getDelay(TimeUnit ignore) {
71	<	return pseudodelay;
71	>	return Integer.MIN_VALUE + pseudodelay;
72		}
56	–	public int intValue() {
57	–	return pseudodelay;
58	–	}
59	–
73		public String toString() {
74		return String.valueOf(pseudodelay);
75		}
76		}
77
65	–
78		/**
79		* Delayed implementation that actually delays
80		*/
#	Line 90 | Line 102 | public class DelayQueueTest extends JSR1
102		return other.trigger == trigger;
103		}
104
105	+	// suppress [overrides] javac warning
106	+	public int hashCode() { return (int) trigger; }
107	+
108		public long getDelay(TimeUnit unit) {
109		long n = trigger - System.nanoTime();
110		return unit.convert(n, TimeUnit.NANOSECONDS);
#	Line 104 | Line 119 | public class DelayQueueTest extends JSR1
119		}
120		}
121
107	–
122		/**
123	<	* Create a queue of given size containing consecutive
123	>	* Returns a new queue of given size containing consecutive
124		* PDelays 0 ... n.
125		*/
126	<	private DelayQueue populatedQueue(int n) {
127	<	DelayQueue q = new DelayQueue();
126	>	private DelayQueue<PDelay> populatedQueue(int n) {
127	>	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
128		assertTrue(q.isEmpty());
129		for (int i = n-1; i >= 0; i-=2)
130		assertTrue(q.offer(new PDelay(i)));
#	Line 209 | Line 223 | public class DelayQueueTest extends JSR1
223		}
224
225		/**
212	–	* offer(null) throws NPE
213	–	*/
214	–	public void testOfferNull() {
215	–	try {
216	–	DelayQueue q = new DelayQueue();
217	–	q.offer(null);
218	–	shouldThrow();
219	–	} catch (NullPointerException success) {}
220	–	}
221	–
222	–	/**
223	–	* add(null) throws NPE
224	–	*/
225	–	public void testAddNull() {
226	–	try {
227	–	DelayQueue q = new DelayQueue();
228	–	q.add(null);
229	–	shouldThrow();
230	–	} catch (NullPointerException success) {}
231	–	}
232	–
233	–	/**
226		* offer non-null succeeds
227		*/
228		public void testOffer() {
#	Line 251 | Line 243 | public class DelayQueueTest extends JSR1
243		}
244
245		/**
254	–	* addAll(null) throws NPE
255	–	*/
256	–	public void testAddAll1() {
257	–	try {
258	–	DelayQueue q = new DelayQueue();
259	–	q.addAll(null);
260	–	shouldThrow();
261	–	} catch (NullPointerException success) {}
262	–	}
263	–
264	–
265	–	/**
246		* addAll(this) throws IAE
247		*/
248		public void testAddAllSelf() {
#	Line 274 | Line 254 | public class DelayQueueTest extends JSR1
254		}
255
256		/**
277	–	* addAll of a collection with null elements throws NPE
278	–	*/
279	–	public void testAddAll2() {
280	–	try {
281	–	DelayQueue q = new DelayQueue();
282	–	PDelay[] ints = new PDelay[SIZE];
283	–	q.addAll(Arrays.asList(ints));
284	–	shouldThrow();
285	–	} catch (NullPointerException success) {}
286	–	}
287	–
288	–	/**
257		* addAll of a collection with any null elements throws NPE after
258		* possibly adding some elements
259		*/
#	Line 316 | Line 284 | public class DelayQueueTest extends JSR1
284		}
285
286		/**
319	–	* put(null) throws NPE
320	–	*/
321	–	public void testPutNull() {
322	–	try {
323	–	DelayQueue q = new DelayQueue();
324	–	q.put(null);
325	–	shouldThrow();
326	–	} catch (NullPointerException success) {}
327	–	}
328	–
329	–	/**
287		* all elements successfully put are contained
288		*/
289	<	public void testPut() {
290	<	DelayQueue q = new DelayQueue();
291	<	for (int i = 0; i < SIZE; ++i) {
292	<	PDelay I = new PDelay(i);
293	<	q.put(I);
294	<	assertTrue(q.contains(I));
295	<	}
296	<	assertEquals(SIZE, q.size());
289	>	public void testPut() {
290	>	DelayQueue q = new DelayQueue();
291	>	for (int i = 0; i < SIZE; ++i) {
292	>	PDelay I = new PDelay(i);
293	>	q.put(I);
294	>	assertTrue(q.contains(I));
295	>	}
296	>	assertEquals(SIZE, q.size());
297		}
298
299		/**
#	Line 344 | Line 301 | public class DelayQueueTest extends JSR1
301		*/
302		public void testPutWithTake() throws InterruptedException {
303		final DelayQueue q = new DelayQueue();
304	<	Thread t = new Thread(new CheckedRunnable() {
304	>	Thread t = newStartedThread(new CheckedRunnable() {
305		public void realRun() {
306		q.put(new PDelay(0));
307		q.put(new PDelay(0));
#	Line 352 | Line 309 | public class DelayQueueTest extends JSR1
309		q.put(new PDelay(0));
310		}});
311
312	<	t.start();
313	<	Thread.sleep(SHORT_DELAY_MS);
357	<	q.take();
358	<	t.interrupt();
359	<	t.join();
312	>	awaitTermination(t);
313	>	assertEquals(4, q.size());
314		}
315
316		/**
#	Line 364 | Line 318 | public class DelayQueueTest extends JSR1
318		*/
319		public void testTimedOffer() throws InterruptedException {
320		final DelayQueue q = new DelayQueue();
321	<	Thread t = new Thread(new CheckedRunnable() {
321	>	Thread t = newStartedThread(new CheckedRunnable() {
322		public void realRun() throws InterruptedException {
323		q.put(new PDelay(0));
324		q.put(new PDelay(0));
#	Line 372 | Line 326 | public class DelayQueueTest extends JSR1
326		assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
327		}});
328
329	<	t.start();
376	<	Thread.sleep(SMALL_DELAY_MS);
377	<	t.interrupt();
378	<	t.join();
329	>	awaitTermination(t);
330		}
331
332		/**
#	Line 389 | Line 340 | public class DelayQueueTest extends JSR1
340		}
341
342		/**
392	–	* take blocks interruptibly when empty
393	–	*/
394	–	public void testTakeFromEmptyBlocksInterruptibly()
395	–	throws InterruptedException {
396	–	final BlockingQueue q = new DelayQueue();
397	–	final CountDownLatch threadStarted = new CountDownLatch(1);
398	–	Thread t = newStartedThread(new CheckedRunnable() {
399	–	public void realRun() {
400	–	long t0 = System.nanoTime();
401	–	threadStarted.countDown();
402	–	try {
403	–	q.take();
404	–	shouldThrow();
405	–	} catch (InterruptedException expected) {}
406	–	assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
407	–	}});
408	–	threadStarted.await();
409	–	Thread.sleep(SHORT_DELAY_MS);
410	–	assertTrue(t.isAlive());
411	–	t.interrupt();
412	–	awaitTermination(t, MEDIUM_DELAY_MS);
413	–	assertFalse(t.isAlive());
414	–	}
415	–
416	–	/**
343		* Take removes existing elements until empty, then blocks interruptibly
344		*/
345		public void testBlockingTake() throws InterruptedException {
346		final DelayQueue q = populatedQueue(SIZE);
347	<	Thread t = new Thread(new CheckedRunnable() {
347	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
348	>	Thread t = newStartedThread(new CheckedRunnable() {
349		public void realRun() throws InterruptedException {
350		for (int i = 0; i < SIZE; ++i) {
351		assertEquals(new PDelay(i), ((PDelay)q.take()));
352		}
353	+
354	+	Thread.currentThread().interrupt();
355		try {
356		q.take();
357		shouldThrow();
358		} catch (InterruptedException success) {}
359	+	assertFalse(Thread.interrupted());
360	+
361	+	pleaseInterrupt.countDown();
362	+	try {
363	+	q.take();
364	+	shouldThrow();
365	+	} catch (InterruptedException success) {}
366	+	assertFalse(Thread.interrupted());
367		}});
368
369	<	t.start();
370	<	Thread.sleep(SHORT_DELAY_MS);
369	>	await(pleaseInterrupt);
370	>	assertThreadStaysAlive(t);
371		t.interrupt();
372	<	t.join();
372	>	awaitTermination(t);
373		}
374
438	–
375		/**
376		* poll succeeds unless empty
377		*/
#	Line 464 | Line 400 | public class DelayQueueTest extends JSR1
400		public void testTimedPoll() throws InterruptedException {
401		DelayQueue q = populatedQueue(SIZE);
402		for (int i = 0; i < SIZE; ++i) {
403	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
404	<	}
405	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
403	>	long startTime = System.nanoTime();
404	>	assertEquals(new PDelay(i), ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
405	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
406	>	}
407	>	long startTime = System.nanoTime();
408	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
409	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
410	>	checkEmpty(q);
411		}
412
413		/**
#	Line 474 | Line 415 | public class DelayQueueTest extends JSR1
415		* returning timeout status
416		*/
417		public void testInterruptedTimedPoll() throws InterruptedException {
418	<	Thread t = new Thread(new CheckedRunnable() {
418	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
419	>	Thread t = newStartedThread(new CheckedRunnable() {
420		public void realRun() throws InterruptedException {
421		DelayQueue q = populatedQueue(SIZE);
422		for (int i = 0; i < SIZE; ++i) {
423		assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
424		}
483	–	try {
484	–	q.poll(SMALL_DELAY_MS, MILLISECONDS);
485	–	shouldThrow();
486	–	} catch (InterruptedException success) {}
487	–	}});
488	–
489	–	t.start();
490	–	Thread.sleep(SHORT_DELAY_MS);
491	–	t.interrupt();
492	–	t.join();
493	–	}
494	–
495	–	/**
496	–	* timed poll before a delayed offer fails; after offer succeeds;
497	–	* on interruption throws
498	–	*/
499	–	public void testTimedPollWithOffer() throws InterruptedException {
500	–	final DelayQueue q = new DelayQueue();
501	–	final PDelay pdelay = new PDelay(0);
502	–	final CheckedBarrier barrier = new CheckedBarrier(2);
503	–	Thread t = new Thread(new CheckedRunnable() {
504	–	public void realRun() throws InterruptedException {
505	–	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
506	–
507	–	barrier.await();
508	–	assertSame(pdelay, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
425
426		Thread.currentThread().interrupt();
427		try {
428	<	q.poll(SHORT_DELAY_MS, MILLISECONDS);
428	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
429		shouldThrow();
430		} catch (InterruptedException success) {}
431	+	assertFalse(Thread.interrupted());
432
433	<	barrier.await();
433	>	pleaseInterrupt.countDown();
434		try {
435	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
435	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
436		shouldThrow();
437		} catch (InterruptedException success) {}
438	+	assertFalse(Thread.interrupted());
439		}});
440
441	<	t.start();
442	<	barrier.await();
525	<	assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
526	<	barrier.await();
527	<	sleep(SHORT_DELAY_MS);
441	>	await(pleaseInterrupt);
442	>	assertThreadStaysAlive(t);
443		t.interrupt();
444	<	t.join();
444	>	awaitTermination(t);
445		}
446
532	–
447		/**
448		* peek returns next element, or null if empty
449		*/
#	Line 576 | Line 490 | public class DelayQueueTest extends JSR1
490		}
491
492		/**
579	–	* remove(x) removes x and returns true if present
580	–	*/
581	–	public void testRemoveElement() {
582	–	DelayQueue q = populatedQueue(SIZE);
583	–	for (int i = 1; i < SIZE; i+=2) {
584	–	assertTrue(q.remove(new PDelay(i)));
585	–	}
586	–	for (int i = 0; i < SIZE; i+=2) {
587	–	assertTrue(q.remove(new PDelay(i)));
588	–	assertFalse(q.remove(new PDelay(i+1)));
589	–	}
590	–	assertTrue(q.isEmpty());
591	–	}
592	–
593	–	/**
493		* contains(x) reports true when elements added but not yet removed
494		*/
495		public void testContains() {
#	Line 676 | Line 575 | public class DelayQueueTest extends JSR1
575		Object[] o = q.toArray();
576		Arrays.sort(o);
577		for (int i = 0; i < o.length; i++)
578	<	assertEquals(o[i], q.take());
578	>	assertSame(o[i], q.take());
579		}
580
581		/**
582		* toArray(a) contains all elements
583		*/
584	<	public void testToArray2() throws InterruptedException {
585	<	DelayQueue q = populatedQueue(SIZE);
584	>	public void testToArray2() {
585	>	DelayQueue<PDelay> q = populatedQueue(SIZE);
586		PDelay[] ints = new PDelay[SIZE];
587	<	ints = (PDelay[])q.toArray(ints);
587	>	PDelay[] array = q.toArray(ints);
588	>	assertSame(ints, array);
589		Arrays.sort(ints);
590		for (int i = 0; i < ints.length; i++)
591	<	assertEquals(ints[i], q.take());
591	>	assertSame(ints[i], q.remove());
592		}
593
694	–
594		/**
595	<	* toArray(null) throws NPE
697	<	*/
698	<	public void testToArray_BadArg() {
699	<	DelayQueue q = populatedQueue(SIZE);
700	<	try {
701	<	Object o[] = q.toArray(null);
702	<	shouldThrow();
703	<	} catch (NullPointerException success) {}
704	<	}
705	<
706	<	/**
707	<	* toArray with incompatible array type throws CCE
595	>	* toArray(incompatible array type) throws ArrayStoreException
596		*/
597		public void testToArray1_BadArg() {
598		DelayQueue q = populatedQueue(SIZE);
599		try {
600	<	Object o[] = q.toArray(new String[10]);
600	>	q.toArray(new String[10]);
601		shouldThrow();
602		} catch (ArrayStoreException success) {}
603		}
#	Line 740 | Line 628 | public class DelayQueueTest extends JSR1
628		it.next();
629		it.remove();
630		it = q.iterator();
631	<	assertEquals(it.next(), new PDelay(2));
632	<	assertEquals(it.next(), new PDelay(3));
631	>	assertEquals(new PDelay(2), it.next());
632	>	assertEquals(new PDelay(3), it.next());
633		assertFalse(it.hasNext());
634		}
635
748	–
636		/**
637		* toString contains toStrings of elements
638		*/
639		public void testToString() {
640		DelayQueue q = populatedQueue(SIZE);
641		String s = q.toString();
642	<	for (int i = 0; i < SIZE; ++i) {
643	<	assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
757	<	}
642	>	for (Object e : q)
643	>	assertTrue(s.contains(e.toString()));
644		}
645
646		/**
647	<	* offer transfers elements across Executor tasks
647	>	* timed poll transfers elements across Executor tasks
648		*/
649		public void testPollInExecutor() {
650		final DelayQueue q = new DelayQueue();
651	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
652		ExecutorService executor = Executors.newFixedThreadPool(2);
653		executor.execute(new CheckedRunnable() {
654		public void realRun() throws InterruptedException {
655		assertNull(q.poll());
656	<	assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
657	<	assertTrue(q.isEmpty());
656	>	threadsStarted.await();
657	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
658	>	checkEmpty(q);
659		}});
660
661		executor.execute(new CheckedRunnable() {
662		public void realRun() throws InterruptedException {
663	<	Thread.sleep(SHORT_DELAY_MS);
663	>	threadsStarted.await();
664		q.put(new PDelay(1));
665		}});
666
667		joinPool(executor);
668		}
669
782	–
670		/**
671		* Delayed actions do not occur until their delay elapses
672		*/
#	Line 809 | Line 696 | public class DelayQueueTest extends JSR1
696		assertNotNull(q.peek());
697		}
698
812	–
699		/**
700		* poll of a non-empty queue returns null if no expired elements.
701		*/
#	Line 825 | Line 711 | public class DelayQueueTest extends JSR1
711		public void testTimedPollDelayed() throws InterruptedException {
712		DelayQueue q = new DelayQueue();
713		q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
714	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
829	<	}
830	<
831	<	/**
832	<	* drainTo(null) throws NPE
833	<	*/
834	<	public void testDrainToNull() {
835	<	DelayQueue q = populatedQueue(SIZE);
836	<	try {
837	<	q.drainTo(null);
838	<	shouldThrow();
839	<	} catch (NullPointerException success) {}
840	<	}
841	<
842	<	/**
843	<	* drainTo(this) throws IAE
844	<	*/
845	<	public void testDrainToSelf() {
846	<	DelayQueue q = populatedQueue(SIZE);
847	<	try {
848	<	q.drainTo(q);
849	<	shouldThrow();
850	<	} catch (IllegalArgumentException success) {}
714	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
715		}
716
717		/**
#	Line 862 | Line 726 | public class DelayQueueTest extends JSR1
726		}
727		ArrayList l = new ArrayList();
728		q.drainTo(l);
729	<	assertEquals(q.size(), 0);
729	>	assertEquals(0, q.size());
730		for (int i = 0; i < SIZE; ++i)
731	<	assertEquals(l.get(i), elems[i]);
731	>	assertEquals(elems[i], l.get(i));
732		q.add(elems[0]);
733		q.add(elems[1]);
734		assertFalse(q.isEmpty());
#	Line 872 | Line 736 | public class DelayQueueTest extends JSR1
736		assertTrue(q.contains(elems[1]));
737		l.clear();
738		q.drainTo(l);
739	<	assertEquals(q.size(), 0);
740	<	assertEquals(l.size(), 2);
739	>	assertEquals(0, q.size());
740	>	assertEquals(2, l.size());
741		for (int i = 0; i < 2; ++i)
742	<	assertEquals(l.get(i), elems[i]);
742	>	assertEquals(elems[i], l.get(i));
743		}
744
745		/**
#	Line 897 | Line 761 | public class DelayQueueTest extends JSR1
761		}
762
763		/**
900	–	* drainTo(null, n) throws NPE
901	–	*/
902	–	public void testDrainToNullN() {
903	–	DelayQueue q = populatedQueue(SIZE);
904	–	try {
905	–	q.drainTo(null, 0);
906	–	shouldThrow();
907	–	} catch (NullPointerException success) {}
908	–	}
909	–
910	–	/**
911	–	* drainTo(this, n) throws IAE
912	–	*/
913	–	public void testDrainToSelfN() {
914	–	DelayQueue q = populatedQueue(SIZE);
915	–	try {
916	–	q.drainTo(q, 0);
917	–	shouldThrow();
918	–	} catch (IllegalArgumentException success) {}
919	–	}
920	–
921	–	/**
764		* drainTo(c, n) empties first min(n, size) elements of queue into c
765		*/
766		public void testDrainToN() {
#	Line 927 | Line 769 | public class DelayQueueTest extends JSR1
769		ArrayList l = new ArrayList();
770		q.drainTo(l, i);
771		int k = (i < SIZE) ? i : SIZE;
772	<	assertEquals(q.size(), SIZE-k);
773	<	assertEquals(l.size(), k);
772	>	assertEquals(SIZE-k, q.size());
773	>	assertEquals(k, l.size());
774		}
775		}
776
777	<
777	>	/**
778	>	* remove(null), contains(null) always return false
779	>	*/
780	>	public void testNeverContainsNull() {
781	>	Collection<?> q = populatedQueue(SIZE);
782	>	assertFalse(q.contains(null));
783	>	assertFalse(q.remove(null));
784	>	}
785		}

Diff Legend

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