Re-enable various tests that have been suitably massaged.

7 files changed, 70 insertions, 116 deletions

diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
index a204bc4495..daad2f0feb 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
@@ -81,7 +81,6 @@ public abstract class AbstractRegressionTest extends AbstractCompilerTest implem
 	static final String LIST_RAW_IMPL_JRE8;
 	static final String ITERABLE_IMPL_JRE8;
 	static final String ITERABLE_RAW_IMPL_JRE8;
-	static final String ITERABLE_RAW_WITHOUT_IS_EMPTY_IMPL_JRE8;
 	static final String ITERATOR_IMPL_JRE8;
 	static final String MAP_IMPL_JRE8;
 	static final String MAP_RAW_IMPL_JRE8;
@@ -92,108 +91,64 @@ public abstract class AbstractRegressionTest extends AbstractCompilerTest implem
 		String javaVersion = System.getProperty("java.specification.version");
 		IS_JRE_8 = "1.8".equals(javaVersion);
 		if (IS_JRE_8) { // TODO(stephan) accommodate future versions ...
-			COMPARATOR_IMPL_JRE8 =
-				"	public java.util.Comparator<*> compose(java.util.Comparator<? super *> other) { return null; }\n" +
-				"	public java.util.Comparator<*> reverse() { return null; }\n";
+			COMPARATOR_IMPL_JRE8 = // replace '*' with T, '%' with U
+				"	public java.util.Comparator<*> reverseOrder() { return null;}\n" +
+				"	public java.util.Comparator<*> thenComparing(java.util.Comparator<? super *> other) { return null;}\n" +
+				"	public <% extends java.lang.Comparable<? super %>> java.util.Comparator<*> thenComparing(java.util.function.Function<? super *, ? extends %> keyExtractor) { return null;}\n" +
+				"	public java.util.Comparator<*> thenComparing(java.util.function.IntFunction<? super *> keyExtractor) { return null;}\n" +
+				"	public java.util.Comparator<*> thenComparing(java.util.function.LongFunction<? super *> keyExtractor) { return null;}\n" +
+				"	public java.util.Comparator<*> thenComparing(java.util.function.DoubleFunction<? super *> keyExtractor) { return null;}\n";
 			COMPARATOR_RAW_IMPL_JRE8 =
-				"	public java.util.Comparator compose(java.util.Comparator other) { return null; }\n" +
-				"	public java.util.Comparator reverse() { return null; }\n";
+				"	public java.util.Comparator reverseOrder() { return null;}\n" +
+				"	public java.util.Comparator thenComparing(java.util.Comparator other) { return null;}\n" +
+				"	public java.util.Comparator thenComparing(java.util.function.Function keyExtractor) { return null;}\n" +
+				"	public java.util.Comparator thenComparing(java.util.function.IntFunction keyExtractor) { return null;}\n" +
+				"	public java.util.Comparator thenComparing(java.util.function.LongFunction keyExtractor) { return null;}\n" +
+				"	public java.util.Comparator thenComparing(java.util.function.DoubleFunction keyExtractor) { return null;}\n";
 			COLLECTION_IMPL_JRE8 = 
-				"	public boolean retainAll(java.util.functions.Predicate<? super *> filter) { return false; }\n" +
-				"	public boolean removeAll(java.util.functions.Predicate<? super *> filter) { return false; }\n" +
-				"	public void addAll(Iterable<? extends *> source) { }\n";
+				"	public  boolean removeAll(java.util.function.Predicate<? super *> filter) { return false;}\n" +
+				"	public java.util.stream.Stream<*> stream() { return null;}\n" +
+				"	public java.util.stream.Stream<*> parallelStream() { return null;}\n";
 			COLLECTION_RAW_IMPL_JRE8 = 
-				"	public @SuppressWarnings(\"rawtypes\") boolean retainAll(java.util.functions.Predicate filter) { return false; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") boolean removeAll(java.util.functions.Predicate filter) { return false; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") void addAll(Iterable source) { }\n";
+				"	public @SuppressWarnings(\"rawtypes\") boolean removeAll(java.util.function.Predicate filter) { return false;}\n" +
+				"	public @SuppressWarnings(\"rawtypes\") java.util.stream.Stream stream() { return null;}\n" +
+				"	public @SuppressWarnings(\"rawtypes\") java.util.stream.Stream parallelStream() { return null;}\n";			
 			LIST_IMPL_JRE8 =// replace '*' with your concrete type argument
-				"	public void sort(java.util.Comparator<? super *> comparator) {}\n" +
-				"	public void parallelSort(java.util.Comparator<? super *> comparator) {}\n";	
+                "	public void sort(java.util.Comparator<? super *> comparator) {}\n" +
+				"	public void parallelSort(java.util.Comparator<? super *> comparator) {}\n" +
+				"	public void replaceAll(java.util.function.UnaryOperator<*> operator) {}\n";
 			LIST_RAW_IMPL_JRE8 =
 				"	public @SuppressWarnings(\"rawtypes\") void sort(java.util.Comparator comparator) {}\n" +
-				"	public @SuppressWarnings(\"rawtypes\") void parallelSort(java.util.Comparator comparator) {}\n";	
+				"	public @SuppressWarnings(\"rawtypes\") void parallelSort(java.util.Comparator comparator) {}\n" +
+				"	public @SuppressWarnings(\"rawtypes\") void replaceAll(java.util.function.UnaryOperator operator) {}\n";
 			ITERABLE_IMPL_JRE8 = // replace '*' with your concrete type argument
-				"	public boolean isEmpty() { return false; }\n" +
-				"	public long count() { return 0L; }\n" +
-				"	public * getOnly() { return null; }\n" +
-				"	public * getFirst() { return null; }\n" +
-				"	public * getAny() { return null; }\n" +
-				"	public * reduce(* base, java.util.functions.BinaryOperator<*> reducer) { return null; }\n" +
-				"	public <A extends java.util.Fillable<? super *>> A  into(A target) { return null; }\n" +
-				"	public void forEach(java.util.functions.Block<? super *> block) {}\n" +
-				"	public Iterable<*> sorted(java.util.Comparator<? super *> comparator) { return null; }\n" +
-				"	public boolean anyMatch(java.util.functions.Predicate<? super *> filter) { return false; }\n" +
-				"	public boolean allMatch(java.util.functions.Predicate<? super *> filter) { return false; }\n" +
-				"	public boolean noneMatch(java.util.functions.Predicate<? super *> filter) { return false; }\n" +
-				"	public Iterable<*> cumulate(java.util.functions.BinaryOperator<*> op) { return null; }\n" +
-				"	public <U> MapStream<*,U> mapped(java.util.functions.Mapper<? super *, ? extends U> mapper) { return null; }\n" +
-				"	public Iterable<*> filter(java.util.functions.Predicate<? super *> predicate) { return null; }\n" +
-				"	public <U> Iterable<U> map(java.util.functions.Mapper<? super *, ? extends U> mapper) { return null; }\n" +
-				"	public double mapReduce(java.util.functions.DoubleMapper<? super *> mapper, double base, java.util.functions.DoubleBinaryOperator reducer) { return 0; }\n" +
-				"	public long mapReduce(java.util.functions.LongMapper<? super *> mapper, long base, java.util.functions.LongBinaryOperator reducer) { return 0; }\n" +
-				"	public int mapReduce(java.util.functions.IntMapper<? super *> mapper, int base, java.util.functions.IntBinaryOperator reducer) { return 0; }\n" +
-				"	public <U> U mapReduce(java.util.functions.Mapper<? super *, ? extends U> mapper, U base, java.util.functions.BinaryOperator<U> reducer) { return null; }\n" +
-				"	public <U> Iterable<U> flatMap(java.util.functions.Mapper<? super *, ? extends Iterable<U>> mapper) { return null; }\n" +
-				"	public <U> MapStream<U, Iterable<*>> groupBy(java.util.functions.Mapper<? super *, ? extends U> mapper) { return null; }\n" +
-				"	public <U> MapStream<U, Iterable<*>> groupByMulti(java.util.functions.Mapper<? super *, ? extends Iterable<U>> mapper) { return null; }\n" +
-				"	public Iterable<*> uniqueElements() { return null; }\n";
+				"	public void forEach(java.util.function.Block<? super *> block){}\n";
 			ITERABLE_RAW_IMPL_JRE8 =
-				"	public boolean isEmpty() { return false; }\n" +
-				"	public long count() { return 0L; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Object getOnly() { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Object getFirst() { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Object getAny() { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Object reduce(Object base, java.util.functions.BinaryOperator reducer) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") java.util.Fillable into(java.util.Fillable target) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") void forEach(java.util.functions.Block block) {}\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Iterable sorted(java.util.Comparator comparator) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") boolean anyMatch(java.util.functions.Predicate filter) { return false; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") boolean allMatch(java.util.functions.Predicate filter) { return false; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") boolean noneMatch(java.util.functions.Predicate filter) { return false; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Iterable cumulate(java.util.functions.BinaryOperator op) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") MapStream mapped(java.util.functions.Mapper mapper) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Iterable filter(java.util.functions.Predicate predicate) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Iterable map(java.util.functions.Mapper mapper) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") double mapReduce(java.util.functions.DoubleMapper mapper, double base, java.util.functions.DoubleBinaryOperator reducer) { return 0; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") long mapReduce(java.util.functions.LongMapper mapper, long base, java.util.functions.LongBinaryOperator reducer) { return 0; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") int mapReduce(java.util.functions.IntMapper mapper, int base, java.util.functions.IntBinaryOperator reducer) { return 0; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Object mapReduce(java.util.functions.Mapper mapper, Object base, java.util.functions.BinaryOperator reducer) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Iterable flatMap(java.util.functions.Mapper mapper) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") MapStream groupBy(java.util.functions.Mapper mapper) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") MapStream groupByMulti(java.util.functions.Mapper mapper) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Iterable uniqueElements() { return null; }\n";
-			ITERABLE_RAW_WITHOUT_IS_EMPTY_IMPL_JRE8 =
-				"	public long count() { return 0L; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Object getOnly() { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Object getFirst() { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Object getAny() { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Object reduce(Object base, java.util.functions.BinaryOperator reducer) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") java.util.Fillable into(java.util.Fillable target) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") void forEach(java.util.functions.Block block) {}\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Iterable sorted(java.util.Comparator comparator) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") boolean anyMatch(java.util.functions.Predicate filter) { return false; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") boolean allMatch(java.util.functions.Predicate filter) { return false; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") boolean noneMatch(java.util.functions.Predicate filter) { return false; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Iterable cumulate(java.util.functions.BinaryOperator op) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") MapStream mapped(java.util.functions.Mapper mapper) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Iterable filter(java.util.functions.Predicate predicate) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Iterable map(java.util.functions.Mapper mapper) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") double mapReduce(java.util.functions.DoubleMapper mapper, double base, java.util.functions.DoubleBinaryOperator reducer) { return 0; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") long mapReduce(java.util.functions.LongMapper mapper, long base, java.util.functions.LongBinaryOperator reducer) { return 0; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") int mapReduce(java.util.functions.IntMapper mapper, int base, java.util.functions.IntBinaryOperator reducer) { return 0; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Object mapReduce(java.util.functions.Mapper mapper, Object base, java.util.functions.BinaryOperator reducer) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Iterable flatMap(java.util.functions.Mapper mapper) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") MapStream groupBy(java.util.functions.Mapper mapper) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") MapStream groupByMulti(java.util.functions.Mapper mapper) { return null; }\n" +
-				"	public @SuppressWarnings(\"rawtypes\") Iterable uniqueElements() { return null; }\n";
-			MAP_IMPL_JRE8 = // '!' stands for 'K,V', '*' for 'K'
-				"	public Iterable<BiValue<!>> asIterable() { return null; }\n" +
-				"	public Iterable<*> inputs() { return null; }\n";
+				"	public @SuppressWarnings(\"rawtypes\") void forEach(java.util.function.Block block) {}\n";
 			ITERATOR_IMPL_JRE8 = // replace '*' with your concrete type argument
 				"	public void forEach(java.util.function.Block<? super *> block){}\n";			
+			MAP_IMPL_JRE8 = // '*' for 'K', '%' for 'V'
+				"	public boolean remove(Object key, Object value) { return false;}\n" +
+				"	public void forEach(java.util.function.BiBlock<? super *, ? super %> block) {}\n" +
+				"	public void replaceAll(java.util.function.BiFunction<*, %, %> function) {}\n" +
+				"	public % putIfAbsent(* key, % value) { return null;}\n" +
+				" 	public boolean replace(* key, % oldValue, % newValue) { return false;}\n" +
+				"	public % replace(* key, % value) { return null;}\n" +
+				"	public % computeIfAbsent(* key, java.util.function.Function<? super *, ? extends %> mappingFunction) {  return null;}\n" +
+				"	public % computeIfPresent(* key, java.util.function.BiFunction<? super *, ? super %, ? extends %> remappingFunction) {  return null;}\n" +
+				"	public % compute(* key, java.util.function.BiFunction<? super *, ? super %, ? extends %> remappingFunction) { return null;}\n" +
+				"	public % merge(* key, % value, java.util.function.BiFunction<? super %, ? super %, ? extends %> remappingFunction) { return null;}\n";
 			MAP_RAW_IMPL_JRE8 =
-				"	public Iterable asIterable() { return null; }\n" +
-				"	public Iterable inputs() { return null; }\n";
+				"	public boolean remove(Object key, Object value) { return false;}\n" +
+				"	public @SuppressWarnings(\"rawtypes\") void forEach(java.util.function.BiBlock block) {}\n" +
+				"	public @SuppressWarnings(\"rawtypes\") void replaceAll(java.util.function.BiFunction function) {}\n" +
+				"	public Object putIfAbsent(Object key, Object value) { return null;}\n" +
+				" 	public boolean replace(Object key, Object oldValue, Object newValue) { return false;}\n" +
+				"	public Object replace(Object key, Object value) { return null;}\n" +
+				"	public @SuppressWarnings(\"rawtypes\") Object computeIfAbsent(Object key, java.util.function.Function mappingFunction) {  return null;}\n" +
+				"	public @SuppressWarnings(\"rawtypes\") Object computeIfPresent(Object key, java.util.function.BiFunction remappingFunction) {  return null;}\n" +
+				"	public @SuppressWarnings(\"rawtypes\") Object compute(Object key, java.util.function.BiFunction remappingFunction) { return null;}\n" +
+				"	public @SuppressWarnings(\"rawtypes\") Object merge(Object key, Object value, java.util.function.BiFunction remappingFunction) { return null;}\n";
 			MAP_STREAM_IMPL_JRE8 = // '*' stands for 'K', '%' for 'V'
 				"	public BiValue<*,%> getOnly() { return null; }\n" +
 				"	public <A extends Map<? super *, ? super %>> A  into(A destination) { return null; }\n" +
@@ -243,7 +198,6 @@ public abstract class AbstractRegressionTest extends AbstractCompilerTest implem
 			LIST_RAW_IMPL_JRE8 = "";
 			ITERABLE_IMPL_JRE8 = "";
 			ITERABLE_RAW_IMPL_JRE8 = "";
-			ITERABLE_RAW_WITHOUT_IS_EMPTY_IMPL_JRE8 = "";
 			ITERATOR_IMPL_JRE8 = "\n";
 			MAP_IMPL_JRE8 = "";
 			MAP_RAW_IMPL_JRE8 = "";
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ForeachStatementTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ForeachStatementTest.java
index c9c8eb1953..27a2499dde 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ForeachStatementTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ForeachStatementTest.java
@@ -1089,7 +1089,7 @@ public void test022() throws Exception {
 /*
  * Type mismatch, using non parameterized collection type (indirectly implementing parameterized type)
  */
-public void _test023() {
+public void test023() {
 	this.runNegativeTest(
 			new String[] {
 				"X.java",
@@ -1595,7 +1595,7 @@ public void test033() {
 		"");
 }
 //https://bugs.eclipse.org/bugs/show_bug.cgi?id=108783 - variation
-public void _test034() throws Exception {
+public void test034() throws Exception {
 	this.runConformTest(
 		new String[] {
 			"X.java",
@@ -1690,7 +1690,7 @@ public void _test034() throws Exception {
 	}
 }
 //https://bugs.eclipse.org/bugs/show_bug.cgi?id=108783 - variation
-public void _test035() throws Exception {
+public void test035() throws Exception {
 	this.runConformTest(
 		new String[] {
 			"X.java",
@@ -1787,7 +1787,7 @@ public void _test035() throws Exception {
 	}
 }
 // https://bugs.eclipse.org/bugs/show_bug.cgi?id=108783
-public void _test036() throws Exception {
+public void test036() throws Exception {
 	this.runConformTest(
 		new String[] {
 			"X.java",
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java
index df4e77086d..e9dcbec410 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java
@@ -4425,7 +4425,7 @@ public class GenericTypeTest extends AbstractComparableTest {
 			"----------\n");
 	}
 	// 59628
-	public void _test0146() {
+	public void test0146() {
 		this.runConformTest(
 			new String[] {
 				"X.java",
@@ -6123,7 +6123,7 @@ public class GenericTypeTest extends AbstractComparableTest {
 			"SUCCESS");
 	}
 	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=62806
-	public void _test0204() {
+	public void test0204() {
 		this.runConformTest(
 			new String[] {
 				"Function.java",
@@ -11369,7 +11369,7 @@ public class GenericTypeTest extends AbstractComparableTest {
 	}
 
 	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=71612
-	public void _test0379() {
+	public void test0379() {
 		this.runConformTest(
 			new String[] {
 				"Test.java",
@@ -27974,7 +27974,7 @@ public void test0867() {
 		"----------\n");
 }
 //https://bugs.eclipse.org/bugs/show_bug.cgi?id=114365
-public void _test0868() {
+public void test0868() {
 	Map options = getCompilerOptions();
 	options.put(CompilerOptions.OPTION_ReportRawTypeReference, CompilerOptions.IGNORE);
 	this.runConformTest(
@@ -28038,7 +28038,7 @@ public void _test0868() {
 			"		\n" +
 			"	}" +
 			COLLECTION_RAW_IMPL_JRE8 +
-			ITERABLE_RAW_WITHOUT_IS_EMPTY_IMPL_JRE8 +
+			ITERABLE_RAW_IMPL_JRE8 +
 			"}",
 		},
 		"",
@@ -34163,7 +34163,7 @@ public void test1029() {
 		true,
 		options);
 }
-public void _test1030() {
+public void test1030() {
 	this.runConformTest(
 		new String[] {
 			"X.java",
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/InnerEmulationTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/InnerEmulationTest.java
index 15b383ed3c..bbb9c35a56 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/InnerEmulationTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/InnerEmulationTest.java
@@ -6844,7 +6844,7 @@ public void test172() throws Exception {
 	);
 }
 //https://bugs.eclipse.org/bugs/show_bug.cgi?id=308245
-public void _test173() throws Exception {
+public void test173() throws Exception {
 	this.runConformTest(
 		new String[] {
 			"X.java",//=======================
@@ -6869,7 +6869,7 @@ public void _test173() throws Exception {
 		"SUCCESS");
 }
 //https://bugs.eclipse.org/bugs/show_bug.cgi?id=308245
-public void _test174() throws Exception {
+public void test174() throws Exception {
 	this.runConformTest(
 		new String[] {
 			"X.java",//=======================
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LookupTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LookupTest.java
index b5f1273232..fd2d7ae5c0 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LookupTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LookupTest.java
@@ -2542,7 +2542,7 @@ public void test074() {
 	}
 }
 //https://bugs.eclipse.org/bugs/show_bug.cgi?id=150758
-public void _test075() {
+public void test075() {
 	this.runConformTest(
 			new String[] {
 				"package1/Test.java",//===================
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java
index ad030e04f8..f0f3d0657a 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MethodVerifyTest.java
@@ -6841,7 +6841,7 @@ X.java:7: name clash: <T#1>foo2(T#1) in X and <T#2>foo2(A) in Y have the same er
 		}
 	}
 	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=148783
-	public void _test091() {
+	public void test091() {
 		this.runNegativeTest(
 			new String[] {
 				"DataSet.java",//===================
@@ -6879,7 +6879,7 @@ X.java:7: name clash: <T#1>foo2(T#1) in X and <T#2>foo2(A) in Y have the same er
 				"	public boolean hasNext() {	return false; }\n" +
 				"	public Object next() {	return null; }\n" +
 				"	public void remove() {}\n" +
-				ITERABLE_RAW_WITHOUT_IS_EMPTY_IMPL_JRE8 +
+				ITERABLE_RAW_IMPL_JRE8 +
 				COLLECTION_RAW_IMPL_JRE8 +
 				LIST_RAW_IMPL_JRE8 + 
 				"}\n", // =================
@@ -6964,7 +6964,7 @@ X.java:7: name clash: <T#1>foo2(T#1) in X and <T#2>foo2(A) in Y have the same er
 	}
 
 	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=148783 - variation
-	public void _test092() {
+	public void test092() {
 		this.runNegativeTest(
 			new String[] {
 				"DataSet.java",//===================
@@ -7002,7 +7002,7 @@ X.java:7: name clash: <T#1>foo2(T#1) in X and <T#2>foo2(A) in Y have the same er
 				"	public boolean hasNext() {	return false; }\n" +
 				"	public Object next() {	return null; }\n" +
 				"	public void remove() {}\n" +
-				ITERABLE_RAW_WITHOUT_IS_EMPTY_IMPL_JRE8 +
+				ITERABLE_RAW_IMPL_JRE8 +
 				COLLECTION_RAW_IMPL_JRE8 +
 				LIST_RAW_IMPL_JRE8 + 
 				"}\n", // =================
@@ -7075,7 +7075,7 @@ X.java:7: name clash: <T#1>foo2(T#1) in X and <T#2>foo2(A) in Y have the same er
 			"----------\n");
 	}
 	//https://bugs.eclipse.org/bugs/show_bug.cgi?id=148783 - variation
-	public void _test093() {
+	public void test093() {
 		this.runNegativeTest(
 			new String[] {
 				"DataSet.java",//===================
@@ -7115,7 +7115,7 @@ X.java:7: name clash: <T#1>foo2(T#1) in X and <T#2>foo2(A) in Y have the same er
 				"	public boolean hasNext() {	return false; }\n" +
 				"	public Object next() {	return null; }\n" +
 				"	public void remove() {}\n" +
-				ITERABLE_RAW_WITHOUT_IS_EMPTY_IMPL_JRE8 +
+				ITERABLE_RAW_IMPL_JRE8 +
 				COLLECTION_RAW_IMPL_JRE8 +
 				LIST_RAW_IMPL_JRE8 + 
 				"}\n", // =================
@@ -11390,7 +11390,7 @@ public void test202() {
 	);
 }
 //https://bugs.eclipse.org/bugs/show_bug.cgi?id=292240
-public void _test203() {
+public void test203() {
 	this.runConformTest(
 		new String[] {
 			"X.java",
@@ -12260,7 +12260,7 @@ public void test330264() {
 		compilerOptions14);
 }
 // https://bugs.eclipse.org/bugs/show_bug.cgi?id=331446
-public void _test331446() {
+public void test331446() {
 	Map compilerOptions15 = getCompilerOptions();
 	compilerOptions15.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, CompilerOptions.VERSION_1_5);
 	compilerOptions15.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_5);
@@ -12331,7 +12331,7 @@ public void _test331446() {
 		null);
 }
 //https://bugs.eclipse.org/bugs/show_bug.cgi?id=331446
-public void _test331446a() {
+public void test331446a() {
 	Map compilerOptions15 = getCompilerOptions();
 	compilerOptions15.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, CompilerOptions.VERSION_1_4);
 	compilerOptions15.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_4);
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/StackMapAttributeTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/StackMapAttributeTest.java
index 3136d5a1bc..188347fe23 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/StackMapAttributeTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/StackMapAttributeTest.java
@@ -1754,7 +1754,7 @@ public class StackMapAttributeTest extends AbstractRegressionTest {
 		}
 	}
 
-	public void _test018() {
+	public void test018() {
 		this.runConformTest(
             new String[] {
             		"X.java",