801 |
|
} |
802 |
|
|
803 |
|
/** |
804 |
< |
* A deserialized map equals original |
804 |
> |
* A cloned map equals original |
805 |
> |
*/ |
806 |
> |
public void testClone() { |
807 |
> |
ConcurrentSkipListMap x = map5(); |
808 |
> |
ConcurrentSkipListMap y = x.clone(); |
809 |
> |
|
810 |
> |
assertNotSame(x, y); |
811 |
> |
assertEquals(x.size(), y.size()); |
812 |
> |
assertEquals(x.toString(), y.toString()); |
813 |
> |
assertEquals(x, y); |
814 |
> |
assertEquals(y, x); |
815 |
> |
y.clear(); |
816 |
> |
assertTrue(y.isEmpty()); |
817 |
> |
assertFalse(x.equals(y)); |
818 |
> |
} |
819 |
> |
|
820 |
> |
/** |
821 |
> |
* A deserialized/reserialized map equals original |
822 |
|
*/ |
823 |
|
public void testSerialization() throws Exception { |
824 |
|
NavigableMap x = map5(); |
829 |
|
assertEquals(x.toString(), y.toString()); |
830 |
|
assertEquals(x, y); |
831 |
|
assertEquals(y, x); |
832 |
+ |
y.clear(); |
833 |
+ |
assertTrue(y.isEmpty()); |
834 |
+ |
assertFalse(x.equals(y)); |
835 |
|
} |
836 |
|
|
837 |
|
/** |
1017 |
|
|
1018 |
|
static NavigableMap<Integer, Integer> newMap(Class cl) throws Exception { |
1019 |
|
NavigableMap<Integer, Integer> result = |
1020 |
< |
(NavigableMap<Integer, Integer>) cl.newInstance(); |
1020 |
> |
(NavigableMap<Integer, Integer>) cl.getConstructor().newInstance(); |
1021 |
|
assertEquals(0, result.size()); |
1022 |
|
assertFalse(result.keySet().iterator().hasNext()); |
1023 |
|
return result; |
1293 |
|
} |
1294 |
|
|
1295 |
|
static boolean eq(Integer i, int j) { |
1296 |
< |
return i == null ? j == -1 : i == j; |
1296 |
> |
return (i == null) ? j == -1 : i == j; |
1297 |
|
} |
1298 |
|
|
1299 |
|
} |