--- jsr166/src/test/tck/AbstractQueueTest.java	2015/02/28 18:23:30	1.12
+++ jsr166/src/test/tck/AbstractQueueTest.java	2018/01/10 16:46:21	1.17
@@ -16,7 +16,7 @@ import junit.framework.TestSuite;
 
 public class AbstractQueueTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AbstractQueueTest.class);
@@ -53,7 +53,7 @@ public class AbstractQueueTest extends J
     }
 
     /**
-     * add throws ISE true if offer fails
+     * add throws IllegalStateException if offer fails
      */
     public void testAddF() {
         Fail q = new Fail();
@@ -64,7 +64,7 @@ public class AbstractQueueTest extends J
     }
 
     /**
-     * add throws NPE if offer does
+     * add throws NullPointerException if offer does
      */
     public void testAddNPE() {
         Succeed q = new Succeed();
@@ -79,7 +79,7 @@ public class AbstractQueueTest extends J
      */
     public void testRemoveS() {
         Succeed q = new Succeed();
-        q.remove();
+        assertSame(one, q.remove());
     }
 
     /**
@@ -113,7 +113,7 @@ public class AbstractQueueTest extends J
     }
 
     /**
-     * addAll(null) throws NPE
+     * addAll(null) throws NullPointerException
      */
     public void testAddAll1() {
         Succeed q = new Succeed();
@@ -124,7 +124,7 @@ public class AbstractQueueTest extends J
     }
 
     /**
-     * addAll(this) throws IAE
+     * addAll(this) throws IllegalArgumentException
      */
     public void testAddAllSelf() {
         Succeed q = new Succeed();
@@ -135,7 +135,7 @@ public class AbstractQueueTest extends J
     }
 
     /**
-     * addAll of a collection with null elements throws NPE
+     * addAll of a collection with null elements throws NullPointerException
      */
     public void testAddAll2() {
         Succeed q = new Succeed();
@@ -153,7 +153,7 @@ public class AbstractQueueTest extends J
     public void testAddAll3() {
         Succeed q = new Succeed();
         Integer[] ints = new Integer[SIZE];
-        for (int i = 0; i < SIZE-1; ++i)
+        for (int i = 0; i < SIZE - 1; ++i)
             ints[i] = new Integer(i);
         try {
             q.addAll(Arrays.asList(ints));
@@ -162,7 +162,7 @@ public class AbstractQueueTest extends J
     }
 
     /**
-     * addAll throws ISE if an add fails
+     * addAll throws IllegalStateException if an add fails
      */
     public void testAddAll4() {
         Fail q = new Fail();