ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/jtreg/util/Collections/EmptyNavigableMap.java
(Generate patch)

Comparing jsr166/src/test/jtreg/util/Collections/EmptyNavigableMap.java (file contents):
Revision 1.6 by jsr166, Mon May 15 21:39:24 2017 UTC vs.
Revision 1.10 by jsr166, Mon Jan 8 03:12:03 2018 UTC

# Line 27 | Line 27
27   * @summary Unit test for Collections.emptyNavigableMap
28   * @run testng EmptyNavigableMap
29   */
30 +
31 + import org.testng.Assert;
32 + import org.testng.Assert.ThrowingRunnable;
33 + import org.testng.annotations.DataProvider;
34 + import org.testng.annotations.Test;
35 +
36   import java.math.BigInteger;
37   import java.util.Arrays;
38   import java.util.Collection;
# Line 37 | Line 43 | import java.util.NavigableMap;
43   import java.util.SortedMap;
44   import java.util.TreeMap;
45  
40 – import org.testng.Assert;
41 – import org.testng.Assert.ThrowingRunnable;
42 – import org.testng.annotations.Test;
43 – import org.testng.annotations.DataProvider;
44 –
45 – import static org.testng.Assert.assertTrue;
46   import static org.testng.Assert.assertFalse;
47 + import static org.testng.Assert.assertTrue;
48  
49   public class EmptyNavigableMap {
50  
51      public static <T> void assertInstance(T actual, Class<? extends T> expected) {
52 <        assertInstance(expected.isInstance(actual), null);
52 >        assertInstance(actual, expected, null);
53      }
54  
55      public static <T> void assertInstance(T actual, Class<? extends T> expected, String message) {
# Line 124 | Line 125 | public class EmptyNavigableMap {
125       */
126      @Test(dataProvider = "NavigableMap<?,?>", dataProviderClass = EmptyNavigableMap.class)
127      public void testContainsRequiresComparable(String description, NavigableMap<?,?> navigableMap) {
128 <        assertThrowsCCE(() -> {
129 <            navigableMap.containsKey(new Object());
130 <        },
130 <            description + ": Compareable should be required");
128 >        assertThrowsCCE(
129 >            () -> navigableMap.containsKey(new Object()),
130 >            description + ": Comparable should be required");
131      }
132  
133      /**
# Line 252 | Line 252 | public class EmptyNavigableMap {
252          Object last = (BigInteger.ZERO == first) ? BigInteger.TEN : BigInteger.ZERO;
253  
254              assertThrowsIAE(
255 <                () -> {
256 <                    navigableMap.subMap(last, true, first, false);
257 <                },
255 >                () -> navigableMap.subMap(last, true, first, false),
256                  description + ": Must throw IllegalArgumentException when fromElement is not less than toElement.");
257  
258          navigableMap.subMap(first, true, last, false);
# Line 273 | Line 271 | public class EmptyNavigableMap {
271          // slightly smaller
272          NavigableMap ns = subMap.subMap(first, false, last, false);
273          // slight expansion
274 <        assertThrowsIAE(() -> {
275 <            ns.subMap(first, true, last, true);
278 <        },
274 >        assertThrowsIAE(
275 >            () -> ns.subMap(first, true, last, true),
276              description + ": Expansion should not be allowed");
277  
278          // much smaller
# Line 293 | Line 290 | public class EmptyNavigableMap {
290          NavigableMap ns = subMap.headMap(BigInteger.ONE, false);
291  
292          // slight expansion
293 <        assertThrowsIAE(() -> {
294 <            ns.headMap(BigInteger.ONE, true);
298 <        },
293 >        assertThrowsIAE(
294 >            () -> ns.headMap(BigInteger.ONE, true),
295              description + ": Expansion should not be allowed");
296  
297          // much smaller
# Line 313 | Line 309 | public class EmptyNavigableMap {
309          NavigableMap ns = subMap.tailMap(BigInteger.ONE, false);
310  
311          // slight expansion
312 <        assertThrowsIAE(() -> {
313 <            ns.tailMap(BigInteger.ONE, true);
318 <        },
312 >        assertThrowsIAE(
313 >            () -> ns.tailMap(BigInteger.ONE, true),
314              description + ": Expansion should not be allowed");
315  
316          // much smaller
# Line 327 | Line 322 | public class EmptyNavigableMap {
322       */
323      @Test(dataProvider = "NavigableMap<?,?>", dataProviderClass = EmptyNavigableMap.class)
324      public void testTailMap(String description, NavigableMap navigableMap) {
325 <        assertThrowsNPE(() -> {
326 <            navigableMap.tailMap(null);
332 <        },
325 >        assertThrowsNPE(
326 >            () -> navigableMap.tailMap(null),
327              description + ": Must throw NullPointerException for null element");
328  
329 <        assertThrowsCCE(() -> {
330 <            navigableMap.tailMap(new Object());
337 <        },
329 >        assertThrowsCCE(
330 >            () -> navigableMap.tailMap(new Object()),
331              description);
332  
333          NavigableMap ss = navigableMap.tailMap("1", true);

Diff Legend

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