--- a/jdk/test/java/util/Map/Defaults.java Fri Dec 13 13:35:35 2013 -0800
+++ b/jdk/test/java/util/Map/Defaults.java Fri Dec 13 13:34:55 2013 -0800
@@ -767,7 +767,6 @@
Collection<Object[]> cases = new ArrayList<>();
cases.addAll(makeMergeTestCases());
- cases.addAll(makeMergeNullValueTestCases());
return cases.iterator();
}
@@ -790,32 +789,6 @@
return cases;
}
- static Collection<Object[]> makeMergeNullValueTestCases() {
- Collection<Object[]> cases = new ArrayList<>();
-
- for( Object[] mapParams : makeAllRWMapsWithNulls() ) {
- cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.OLDVALUE, Merging.Value.NULL, Merging.Merger.NULL, Merging.Value.ABSENT, Merging.Value.NULL });
- }
-
- for( Object[] mapParams : makeAllRWMapsWithNulls() ) {
- cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.OLDVALUE, Merging.Value.NULL, Merging.Merger.RESULT, Merging.Value.RESULT, Merging.Value.RESULT });
- }
-
- for( Object[] mapParams : makeAllRWMapsWithNulls() ) {
- cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.ABSENT, Merging.Value.NULL, Merging.Merger.UNUSED, Merging.Value.ABSENT, Merging.Value.NULL });
- }
-
- for( Object[] mapParams : makeAllRWMapsWithNulls() ) {
- cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.NULL, Merging.Value.NULL, Merging.Merger.UNUSED, Merging.Value.ABSENT, Merging.Value.NULL });
- }
-
- for( Object[] mapParams : makeAllRWMapsWithNulls() ) {
- cases.add(new Object[] { mapParams[0], mapParams[1], Merging.Value.NULL, Merging.Value.NEWVALUE, Merging.Merger.UNUSED, Merging.Value.NEWVALUE, Merging.Value.NEWVALUE });
- }
-
- return cases;
- }
-
public interface Thrower<T extends Throwable> {
public void run() throws T;