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

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.240 by jsr166, Tue Jan 23 22:56:37 2018 UTC vs.
Revision 1.243 by jsr166, Thu Apr 5 03:36:54 2018 UTC

# Line 66 | Line 66 | import java.util.Arrays;
66   import java.util.Collection;
67   import java.util.Collections;
68   import java.util.Date;
69 + import java.util.Deque;
70   import java.util.Enumeration;
71 + import java.util.HashSet;
72   import java.util.Iterator;
73   import java.util.List;
74   import java.util.NoSuchElementException;
75   import java.util.PropertyPermission;
76 + import java.util.Set;
77   import java.util.concurrent.BlockingQueue;
78   import java.util.concurrent.Callable;
79   import java.util.concurrent.CountDownLatch;
# Line 418 | Line 421 | public class JSR166TestCase extends Test
421          for (String testClassName : testClassNames) {
422              try {
423                  Class<?> testClass = Class.forName(testClassName);
424 <                Method m = testClass.getDeclaredMethod("suite",
422 <                                                       new Class<?>[0]);
424 >                Method m = testClass.getDeclaredMethod("suite");
425                  suite.addTest(newTestSuite((Test)m.invoke(null)));
426 <            } catch (Exception e) {
427 <                throw new Error("Missing test class", e);
426 >            } catch (ReflectiveOperationException e) {
427 >                throw new AssertionError("Missing test class", e);
428              }
429          }
430      }
# Line 599 | Line 601 | public class JSR166TestCase extends Test
601              for (String methodName : testMethodNames(testClass))
602                  suite.addTest((Test) c.newInstance(data, methodName));
603              return suite;
604 <        } catch (Exception e) {
605 <            throw new Error(e);
604 >        } catch (ReflectiveOperationException e) {
605 >            throw new AssertionError(e);
606          }
607      }
608  
# Line 616 | Line 618 | public class JSR166TestCase extends Test
618          if (atLeastJava8()) {
619              String name = testClass.getName();
620              String name8 = name.replaceAll("Test$", "8Test");
621 <            if (name.equals(name8)) throw new Error(name);
621 >            if (name.equals(name8)) throw new AssertionError(name);
622              try {
623                  return (Test)
624                      Class.forName(name8)
625 <                    .getMethod("testSuite", new Class[] { dataClass })
625 >                    .getMethod("testSuite", dataClass)
626                      .invoke(null, data);
627 <            } catch (Exception e) {
628 <                throw new Error(e);
627 >            } catch (ReflectiveOperationException e) {
628 >                throw new AssertionError(e);
629              }
630          } else {
631              return new TestSuite();
# Line 1447 | Line 1449 | public class JSR166TestCase extends Test
1449          }
1450      }
1451  
1450 –    public abstract class RunnableShouldThrow implements Runnable {
1451 –        protected abstract void realRun() throws Throwable;
1452 –
1453 –        final Class<?> exceptionClass;
1454 –
1455 –        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1456 –            this.exceptionClass = exceptionClass;
1457 –        }
1458 –
1459 –        public final void run() {
1460 –            try {
1461 –                realRun();
1462 –                threadShouldThrow(exceptionClass.getSimpleName());
1463 –            } catch (Throwable t) {
1464 –                if (! exceptionClass.isInstance(t))
1465 –                    threadUnexpectedException(t);
1466 –            }
1467 –        }
1468 –    }
1469 –
1452      public abstract class ThreadShouldThrow extends Thread {
1453          protected abstract void realRun() throws Throwable;
1454  
# Line 2072 | Line 2054 | public class JSR166TestCase extends Test
2054          assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2055          assertEquals(savedQueueSize, p.getQueue().size());
2056      }
2057 +
2058 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2059 +        assertEquals(x, y);
2060 +        assertEquals(y, x);
2061 +        assertEquals(x.isEmpty(), y.isEmpty());
2062 +        assertEquals(x.size(), y.size());
2063 +        if (x instanceof List) {
2064 +            assertEquals(x.toString(), y.toString());
2065 +        }
2066 +        if (x instanceof List || x instanceof Set) {
2067 +            assertEquals(x.hashCode(), y.hashCode());
2068 +        }
2069 +        if (x instanceof List || x instanceof Deque) {
2070 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2071 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2072 +                                     y.toArray(new Object[0])));
2073 +        }
2074 +    }
2075 +
2076 +    /**
2077 +     * A weaker form of assertCollectionsEquals which does not insist
2078 +     * that the two collections satisfy Object#equals(Object), since
2079 +     * they may use identity semantics as Deques do.
2080 +     */
2081 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2082 +        if (x instanceof List || x instanceof Set)
2083 +            assertCollectionsEquals(x, y);
2084 +        else {
2085 +            assertEquals(x.isEmpty(), y.isEmpty());
2086 +            assertEquals(x.size(), y.size());
2087 +            assertEquals(new HashSet(x), new HashSet(y));
2088 +            if (x instanceof Deque) {
2089 +                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2090 +                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2091 +                                         y.toArray(new Object[0])));
2092 +            }
2093 +        }
2094 +    }
2095   }

Diff Legend

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