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

Comparing jsr166/src/test/tck/ConcurrentHashMapTest.java (file contents):
Revision 1.43 by jsr166, Fri Feb 27 21:43:18 2015 UTC vs.
Revision 1.49 by jsr166, Sun Jul 17 19:02:07 2016 UTC

# Line 16 | Line 16 | import java.util.Map;
16   import java.util.Random;
17   import java.util.Set;
18   import java.util.concurrent.ConcurrentHashMap;
19 + import java.util.concurrent.ExecutorService;
20 + import java.util.concurrent.Executors;
21  
22   import junit.framework.Test;
23   import junit.framework.TestSuite;
24  
25   public class ConcurrentHashMapTest extends JSR166TestCase {
26      public static void main(String[] args) {
27 <        junit.textui.TestRunner.run(suite());
27 >        main(suite(), args);
28      }
29      public static Test suite() {
30          return new TestSuite(ConcurrentHashMapTest.class);
# Line 45 | Line 47 | public class ConcurrentHashMapTest exten
47      }
48  
49      /** Re-implement Integer.compare for old java versions */
50 <    static int compare(int x, int y) { return x < y ? -1 : x > y ? 1 : 0; }
50 >    static int compare(int x, int y) {
51 >        return (x < y) ? -1 : (x > y) ? 1 : 0;
52 >    }
53  
54      // classes for testing Comparable fallbacks
55      static class BI implements Comparable<BI> {
# Line 533 | Line 537 | public class ConcurrentHashMapTest exten
537      /**
538       * Constructor (initialCapacity, loadFactor) throws
539       * IllegalArgumentException if either argument is negative
540 <      */
540 >     */
541      public void testConstructor2() {
542          try {
543              new ConcurrentHashMap(-1, .75f);
# Line 594 | Line 598 | public class ConcurrentHashMapTest exten
598       * get(null) throws NPE
599       */
600      public void testGet_NullPointerException() {
601 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
602          try {
598 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
603              c.get(null);
604              shouldThrow();
605          } catch (NullPointerException success) {}
# Line 605 | Line 609 | public class ConcurrentHashMapTest exten
609       * containsKey(null) throws NPE
610       */
611      public void testContainsKey_NullPointerException() {
612 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
613          try {
609 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
614              c.containsKey(null);
615              shouldThrow();
616          } catch (NullPointerException success) {}
# Line 616 | Line 620 | public class ConcurrentHashMapTest exten
620       * containsValue(null) throws NPE
621       */
622      public void testContainsValue_NullPointerException() {
623 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
624          try {
620 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
625              c.containsValue(null);
626              shouldThrow();
627          } catch (NullPointerException success) {}
# Line 627 | Line 631 | public class ConcurrentHashMapTest exten
631       * contains(null) throws NPE
632       */
633      public void testContains_NullPointerException() {
634 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
635          try {
631 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
636              c.contains(null);
637              shouldThrow();
638          } catch (NullPointerException success) {}
# Line 638 | Line 642 | public class ConcurrentHashMapTest exten
642       * put(null,x) throws NPE
643       */
644      public void testPut1_NullPointerException() {
645 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
646          try {
642 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
647              c.put(null, "whatever");
648              shouldThrow();
649          } catch (NullPointerException success) {}
# Line 649 | Line 653 | public class ConcurrentHashMapTest exten
653       * put(x, null) throws NPE
654       */
655      public void testPut2_NullPointerException() {
656 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
657          try {
653 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
658              c.put("whatever", null);
659              shouldThrow();
660          } catch (NullPointerException success) {}
# Line 660 | Line 664 | public class ConcurrentHashMapTest exten
664       * putIfAbsent(null, x) throws NPE
665       */
666      public void testPutIfAbsent1_NullPointerException() {
667 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
668          try {
664 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
669              c.putIfAbsent(null, "whatever");
670              shouldThrow();
671          } catch (NullPointerException success) {}
# Line 671 | Line 675 | public class ConcurrentHashMapTest exten
675       * replace(null, x) throws NPE
676       */
677      public void testReplace_NullPointerException() {
678 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
679          try {
675 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
680              c.replace(null, "whatever");
681              shouldThrow();
682          } catch (NullPointerException success) {}
# Line 682 | Line 686 | public class ConcurrentHashMapTest exten
686       * replace(null, x, y) throws NPE
687       */
688      public void testReplaceValue_NullPointerException() {
689 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
690          try {
686 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
691              c.replace(null, one, "whatever");
692              shouldThrow();
693          } catch (NullPointerException success) {}
# Line 693 | Line 697 | public class ConcurrentHashMapTest exten
697       * putIfAbsent(x, null) throws NPE
698       */
699      public void testPutIfAbsent2_NullPointerException() {
700 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
701          try {
697 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
702              c.putIfAbsent("whatever", null);
703              shouldThrow();
704          } catch (NullPointerException success) {}
# Line 704 | Line 708 | public class ConcurrentHashMapTest exten
708       * replace(x, null) throws NPE
709       */
710      public void testReplace2_NullPointerException() {
711 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
712          try {
708 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
713              c.replace("whatever", null);
714              shouldThrow();
715          } catch (NullPointerException success) {}
# Line 715 | Line 719 | public class ConcurrentHashMapTest exten
719       * replace(x, null, y) throws NPE
720       */
721      public void testReplaceValue2_NullPointerException() {
722 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
723          try {
719 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
724              c.replace("whatever", null, "A");
725              shouldThrow();
726          } catch (NullPointerException success) {}
# Line 726 | Line 730 | public class ConcurrentHashMapTest exten
730       * replace(x, y, null) throws NPE
731       */
732      public void testReplaceValue3_NullPointerException() {
733 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
734          try {
730 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
735              c.replace("whatever", one, null);
736              shouldThrow();
737          } catch (NullPointerException success) {}
# Line 737 | Line 741 | public class ConcurrentHashMapTest exten
741       * remove(null) throws NPE
742       */
743      public void testRemove1_NullPointerException() {
744 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
745 +        c.put("sadsdf", "asdads");
746          try {
741 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
742 –            c.put("sadsdf", "asdads");
747              c.remove(null);
748              shouldThrow();
749          } catch (NullPointerException success) {}
# Line 749 | Line 753 | public class ConcurrentHashMapTest exten
753       * remove(null, x) throws NPE
754       */
755      public void testRemove2_NullPointerException() {
756 +        ConcurrentHashMap c = new ConcurrentHashMap(5);
757 +        c.put("sadsdf", "asdads");
758          try {
753 –            ConcurrentHashMap c = new ConcurrentHashMap(5);
754 –            c.put("sadsdf", "asdads");
759              c.remove(null, "whatever");
760              shouldThrow();
761          } catch (NullPointerException success) {}
# Line 801 | Line 805 | public class ConcurrentHashMapTest exten
805          }
806      }
807  
808 +    /**
809 +     * Tests performance of removeAll when the other collection is much smaller.
810 +     * ant -Djsr166.tckTestClass=ConcurrentHashMapTest -Djsr166.methodFilter=testRemoveAll_performance -Djsr166.expensiveTests=true tck
811 +     */
812 +    public void testRemoveAll_performance() {
813 +        final int mapSize = expensiveTests ? 1_000_000 : 100;
814 +        final int iterations = expensiveTests ? 500 : 2;
815 +        final ConcurrentHashMap<Integer, Integer> map = new ConcurrentHashMap<>();
816 +        for (int i = 0; i < mapSize; i++)
817 +            map.put(i, i);
818 +        Set<Integer> keySet = map.keySet();
819 +        Collection<Integer> removeMe = Arrays.asList(new Integer[] { -99, -86 });
820 +        for (int i = 0; i < iterations; i++)
821 +            assertFalse(keySet.removeAll(removeMe));
822 +        assertEquals(mapSize, map.size());
823 +    }
824 +
825 +    /**
826 +     * Tests performance of computeIfAbsent when the element is present.
827 +     * See JDK-8161372
828 +     * ant -Djsr166.tckTestClass=ConcurrentHashMapTest -Djsr166.methodFilter=testcomputeIfAbsent_performance -Djsr166.expensiveTests=true tck
829 +     */
830 +    public void testcomputeIfAbsent_performance() {
831 +        final int mapSize = 20;
832 +        final int iterations = expensiveTests ? (1 << 23) : mapSize * 2;
833 +        final int threads = expensiveTests ? 10 : 2;
834 +        final ConcurrentHashMap<Integer, Integer> map = new ConcurrentHashMap<>();
835 +        for (int i = 0; i < mapSize; i++)
836 +            map.put(i, i);
837 +        final ExecutorService pool = Executors.newFixedThreadPool(2);
838 +        try (PoolCleaner cleaner = cleaner(pool)) {
839 +            Runnable r = new CheckedRunnable() {
840 +                public void realRun() {
841 +                    int result = 0;
842 +                    for (int i = 0; i < iterations; i++)
843 +                        result += map.computeIfAbsent(i % mapSize, (k) -> k + k);
844 +                    if (result == -42) throw new Error();
845 +                }};
846 +            for (int i = 0; i < threads; i++)
847 +                pool.execute(r);
848 +        }
849 +    }
850 +
851   }

Diff Legend

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