stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8151511: Test case in CollectionAndMapModifyStreamTest for LinkedHashMap overrides that for HashMap

Browse Source 
Reviewed-by: chegar, psandoz
This commit is contained in:
Amy Lu 2016-11-03 09:44:43 +08:00
parent bc127f126e
commit 1bf1087e7f
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/test/java/util/stream/bootlib/java.base/java/util/stream/ThowableHelper.java → jdk/test/java/util/stream/bootlib/java.base/java/util/stream/ThrowableHelper.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -25,7 +25,7 @@ package java.util.stream;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
public final class ThowableHelper {
public final class ThrowableHelper {
public static void checkException(Class<? extends Exception> ce, Runnable r) {
Exception caught = null;

4
jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectAndSummaryStatisticsTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -43,7 +43,7 @@ import java.util.stream.LongStream;
import java.util.stream.OpTestCase;
import static java.util.stream.LambdaTestHelpers.countTo;
import static java.util.stream.ThowableHelper.checkNPE;
import static java.util.stream.ThrowableHelper.checkNPE;
@Test
public class CollectAndSummaryStatisticsTest extends OpTestCase {

4
jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectionAndMapModifyStreamTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -113,7 +113,7 @@ public class CollectionAndMapModifyStreamTest {
Map<String, Supplier<Map<Integer, Integer>>> maps = new HashMap<>();
maps.put(HashMap.class.getName(), () -> new HashMap<>(content));
maps.put(HashMap.class.getName(), () -> new LinkedHashMap<>(content));
maps.put(LinkedHashMap.class.getName(), () -> new LinkedHashMap<>(content));
maps.put(IdentityHashMap.class.getName(), () -> new IdentityHashMap<>(content));
maps.put(WeakHashMap.class.getName(), () -> new WeakHashMap<>(content));

2
jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/FlatMapOpTest.java
View File

@ -49,7 +49,7 @@ import java.util.stream.StreamTestDataProvider;
import java.util.stream.TestData;
import static java.util.stream.LambdaTestHelpers.*;
import static java.util.stream.ThowableHelper.checkNPE;
import static java.util.stream.ThrowableHelper.checkNPE;
@Test
public class FlatMapOpTest extends OpTestCase {

2
jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/IterateTest.java
View File

@ -38,7 +38,7 @@ import java.util.stream.Stream;
import java.util.stream.TestData;
import java.util.stream.TestData.Factory;
import static java.util.stream.ThowableHelper.checkNPE;
import static java.util.stream.ThrowableHelper.checkNPE;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

4
jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamBuilderTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -38,7 +38,7 @@ import java.util.stream.Stream;
import java.util.stream.TestData;
import static java.util.stream.Collectors.toList;
import static java.util.stream.ThowableHelper.checkISE;
import static java.util.stream.ThrowableHelper.checkISE;
@Test
public class StreamBuilderTest extends OpTestCase {

4
jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/StreamCloseTest.java
View File

@ -36,8 +36,8 @@ import java.util.stream.Stream;
import org.testng.annotations.Test;
import static java.util.stream.LambdaTestHelpers.countTo;
import static java.util.stream.ThowableHelper.checkNPE;
import static java.util.stream.ThowableHelper.checkISE;
import static java.util.stream.ThrowableHelper.checkNPE;
import static java.util.stream.ThrowableHelper.checkISE;
@Test(groups = { "serialization-hostile" })
public class StreamCloseTest extends OpTestCase {